From 301baebc9d7cd8682ab179a3c35685468cecd84b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorben=20G=C3=BCnther?= <admin@xenrox.net>
Date: Thu, 23 Sep 2021 22:55:48 +0200
Subject: [PATCH] prometheus: Improve instance labelling

Removed ports and changed localhost to xenrox.net for better
readability.
---
 roles/prometheus/templates/prometheus.yml.j2 | 12 ++++++++++--
 roles/prometheus/vars/main.yml               |  1 -
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/roles/prometheus/templates/prometheus.yml.j2 b/roles/prometheus/templates/prometheus.yml.j2
index d779304..e2bf33e 100644
--- a/roles/prometheus/templates/prometheus.yml.j2
+++ b/roles/prometheus/templates/prometheus.yml.j2
@@ -2,8 +2,8 @@
 alerting:
   alertmanagers:
     - static_configs:
-      - targets:
-        - localhost:9093
+        - targets:
+            - localhost:9093
 
 # Load rules once and periodically evaluate them according to the global 'evaluation_interval'.
 rule_files:
@@ -13,5 +13,13 @@ scrape_configs:
   - job_name: "node_exporter"
     static_configs:
       {% for server in prometheus_clients %}
+
       - targets: ["{{ server }}:9100"]
+        labels:
+          instance: "{{ server }}"
+
       {% endfor %}
+
+      - targets: ["localhost:9100"]
+        labels:
+          instance: "xenrox.net"
diff --git a/roles/prometheus/vars/main.yml b/roles/prometheus/vars/main.yml
index 748d45e..56480f6 100644
--- a/roles/prometheus/vars/main.yml
+++ b/roles/prometheus/vars/main.yml
@@ -7,4 +7,3 @@ prometheus_packages:
 
 prometheus_clients:
   - fenrir.xenrox.net
-  - localhost
-- 
2.44.0