From cc89d6d4211aa5aec8e5bef8c854d4929c337887 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 26 Sep 2021 03:32:47 +0200
Subject: improved promethues multitarget support

---
 .../prometheus/server/templates/targets/blackbox/https.yml.j2        | 4 ----
 .../prometheus/server/templates/targets/blackbox/ping.yml.j2         | 4 ----
 .../prometheus/server/templates/targets/blackbox/probe.yml.j2        | 5 +++++
 .../prometheus/server/templates/targets/blackbox/ssh.yml.j2          | 4 ----
 roles/monitoring/prometheus/server/templates/targets/nut/ups.yml.j2  | 2 +-
 5 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 roles/monitoring/prometheus/server/templates/targets/blackbox/https.yml.j2
 delete mode 100644 roles/monitoring/prometheus/server/templates/targets/blackbox/ping.yml.j2
 create mode 100644 roles/monitoring/prometheus/server/templates/targets/blackbox/probe.yml.j2
 delete mode 100644 roles/monitoring/prometheus/server/templates/targets/blackbox/ssh.yml.j2

(limited to 'roles/monitoring/prometheus/server/templates/targets')

diff --git a/roles/monitoring/prometheus/server/templates/targets/blackbox/https.yml.j2 b/roles/monitoring/prometheus/server/templates/targets/blackbox/https.yml.j2
deleted file mode 100644
index 29c89590..00000000
--- a/roles/monitoring/prometheus/server/templates/targets/blackbox/https.yml.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-- targets: [ '{{ hostvars[target.config.exporter_hostname].prometheus_scrape_endpoint }}' ]
-  labels:
-    instance: '{{ target.instance }}'
-    __param_target: '{{ target.config.address }}'
diff --git a/roles/monitoring/prometheus/server/templates/targets/blackbox/ping.yml.j2 b/roles/monitoring/prometheus/server/templates/targets/blackbox/ping.yml.j2
deleted file mode 100644
index 29c89590..00000000
--- a/roles/monitoring/prometheus/server/templates/targets/blackbox/ping.yml.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-- targets: [ '{{ hostvars[target.config.exporter_hostname].prometheus_scrape_endpoint }}' ]
-  labels:
-    instance: '{{ target.instance }}'
-    __param_target: '{{ target.config.address }}'
diff --git a/roles/monitoring/prometheus/server/templates/targets/blackbox/probe.yml.j2 b/roles/monitoring/prometheus/server/templates/targets/blackbox/probe.yml.j2
new file mode 100644
index 00000000..4e336873
--- /dev/null
+++ b/roles/monitoring/prometheus/server/templates/targets/blackbox/probe.yml.j2
@@ -0,0 +1,5 @@
+- targets: [ '{{ hostvars[target.exporter_hostname].prometheus_scrape_endpoint }}' ]
+  labels:
+    instance: '{{ target.instance }}'
+    __param_target: '{{ target.config.target }}'
+    __param_module: '{{ target.config.module }}'
diff --git a/roles/monitoring/prometheus/server/templates/targets/blackbox/ssh.yml.j2 b/roles/monitoring/prometheus/server/templates/targets/blackbox/ssh.yml.j2
deleted file mode 100644
index 29c89590..00000000
--- a/roles/monitoring/prometheus/server/templates/targets/blackbox/ssh.yml.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-- targets: [ '{{ hostvars[target.config.exporter_hostname].prometheus_scrape_endpoint }}' ]
-  labels:
-    instance: '{{ target.instance }}'
-    __param_target: '{{ target.config.address }}'
diff --git a/roles/monitoring/prometheus/server/templates/targets/nut/ups.yml.j2 b/roles/monitoring/prometheus/server/templates/targets/nut/ups.yml.j2
index 6003cd46..c60077c7 100644
--- a/roles/monitoring/prometheus/server/templates/targets/nut/ups.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/targets/nut/ups.yml.j2
@@ -1,4 +1,4 @@
-- targets: [ '{{ hostvars[target.config.exporter_hostname].prometheus_scrape_endpoint }}' ]
+- targets: [ '{{ hostvars[target.exporter_hostname].prometheus_scrape_endpoint }}' ]
   labels:
     instance: '{{ target.instance }}'
     __param_ups: '{{ target.config.ups }}'
-- 
cgit v1.2.3