From 3b45a9b0059869293ca038422498e3490ae9ae55 Mon Sep 17 00:00:00 2001
From: Lars Gierth <larsg@systemli.org>
Date: Wed, 21 Oct 2015 16:08:21 +0200
Subject: [PATCH] metrics: include hostname in metrics labels

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
---
 solarnet/metrics.yml                          |  1 +
 .../roles/metrics/templates/prometheus.yml.j2 | 28 +++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/solarnet/metrics.yml b/solarnet/metrics.yml
index f57e246..9bf40a5 100644
--- a/solarnet/metrics.yml
+++ b/solarnet/metrics.yml
@@ -12,6 +12,7 @@
     node_targets: "{{ cjdns_identities.keys() }}"
     gateway_targets: "{{ groups.gateway }}"
     storage_targets: "{{ groups.storage }}"
+    metrics_targets: "{{ metrics.storage }}"
   pre_tasks:
     - include_vars: secrets_plaintext/secrets.yml
   handlers:
diff --git a/solarnet/roles/metrics/templates/prometheus.yml.j2 b/solarnet/roles/metrics/templates/prometheus.yml.j2
index 1da1203..da045a0 100644
--- a/solarnet/roles/metrics/templates/prometheus.yml.j2
+++ b/solarnet/roles/metrics/templates/prometheus.yml.j2
@@ -8,23 +8,39 @@ scrape_configs:
   - job_name: 'gateway'
     metrics_path: '/debug/metrics/prometheus'
     target_groups:
-      - targets:
 {% for hostname in gateway_targets %}
-        - '[{{ cjdns_identities[hostname].ipv6 }}]:5001'
+      - targets:
+          - '[{{ cjdns_identities[hostname].ipv6 }}]:5001'
+        labels:
+          host: '{{ hostname }}'
 {% endfor %}
 
   - job_name: 'storage'
     metrics_path: '/debug/metrics/prometheus'
     target_groups:
-      - targets:
 {% for hostname in storage_targets %}
-        - '[{{ cjdns_identities[hostname].ipv6 }}]:5001'
+      - targets:
+          - '[{{ cjdns_identities[hostname].ipv6 }}]:5001'
+        labels:
+          host: '{{ hostname }}'
 {% endfor %}
 
   - job_name: 'host'
     metrics_path: '/metrics'
     target_groups:
-      - targets:
 {% for hostname in node_targets %}
-        - '[{{ cjdns_identities[hostname].ipv6 }}]:9100'
+      - targets:
+          - '[{{ cjdns_identities[hostname].ipv6 }}]:9100'
+        labels:
+          host: '{{ hostname }}'
+{% endfor %}
+
+  - job_name: 'prometheus'
+    metrics_path: '/prometheus/metrics'
+    target_groups:
+{% for hostname in metrics_targets %}
+      - targets:
+          - '[{{ cjdns_identities[hostname].ipv6 }}]:80'
+        labels:
+          host: '{{ hostname }}'
 {% endfor %}