prometheus: simplify job config

9 files changed, 21 insertions, 8 deletions

diff --git a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-https.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-https.j2
index 0a6d2dfa..98a64121 100644
--- a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-https.j2
+++ b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-https.j2
@@ -11,4 +11,4 @@
       key_file: /etc/ssl/prometheus/server/scrape-key.pem
     file_sd_configs:
     - files:
-      - "/etc/prometheus/jobs/{{ job }}/*.yml"
+      - "/etc/prometheus/targets/{{ job }}/*.yml"
diff --git a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-ping.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-ping.j2
index 7f4f12df..736ffec1 100644
--- a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-ping.j2
+++ b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-ping.j2
@@ -11,4 +11,4 @@
       key_file: /etc/ssl/prometheus/server/scrape-key.pem
     file_sd_configs:
     - files:
-      - "/etc/prometheus/jobs/{{ job }}/*.yml"
+      - "/etc/prometheus/targets/{{ job }}/*.yml"
diff --git a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-ssh.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-ssh.j2
index 18381e32..166f37ad 100644
--- a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-ssh.j2
+++ b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-ssh.j2
@@ -11,4 +11,4 @@
       key_file: /etc/ssl/prometheus/server/scrape-key.pem
     file_sd_configs:
     - files:
-      - "/etc/prometheus/jobs/{{ job }}/*.yml"
+      - "/etc/prometheus/targets/{{ job }}/*.yml"
diff --git a/roles/monitoring/prometheus/server/templates/job-snippets/generic.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/generic.j2
index 87992eeb..b155c5f7 100644
--- a/roles/monitoring/prometheus/server/templates/job-snippets/generic.j2
+++ b/roles/monitoring/prometheus/server/templates/job-snippets/generic.j2
@@ -10,4 +10,4 @@
       key_file: /etc/ssl/prometheus/server/scrape-key.pem
     file_sd_configs:
     - files:
-      - "/etc/prometheus/jobs/{{ job }}/*.yml"
+      - "/etc/prometheus/targets/{{ job }}/*.yml"
diff --git a/roles/monitoring/prometheus/server/templates/job-snippets/nut-ups.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/nut-ups.j2
new file mode 100644
index 00000000..3a2c5c62
--- /dev/null
+++ b/roles/monitoring/prometheus/server/templates/job-snippets/nut-ups.j2
@@ -0,0 +1,13 @@
+  - job_name: '{{ job }}'
+    metrics_path: /proxy
+    params:
+      module:
+      - nut
+    scheme: https
+    tls_config:
+      ca_file: /etc/ssl/prometheus/ca-crt.pem
+      cert_file: /etc/ssl/prometheus/server/scrape-crt.pem
+      key_file: /etc/ssl/prometheus/server/scrape-key.pem
+    file_sd_configs:
+    - files:
+      - "/etc/prometheus/targets/{{ job }}/*.yml"
diff --git a/roles/monitoring/prometheus/server/templates/job-snippets/openwrt.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/openwrt.j2
index 493a4fdb..e93f8be7 100644
--- a/roles/monitoring/prometheus/server/templates/job-snippets/openwrt.j2
+++ b/roles/monitoring/prometheus/server/templates/job-snippets/openwrt.j2
@@ -2,4 +2,4 @@
     scheme: http
     file_sd_configs:
     - files:
-      - "/etc/prometheus/jobs/{{ job }}/*.yml"
+      - "/etc/prometheus/targets/{{ job }}/*.yml"
diff --git a/roles/monitoring/prometheus/server/templates/prometheus.yml.j2 b/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
index 4cfcc498..3286bb82 100644
--- a/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
@@ -35,7 +35,7 @@ scrape_configs:
     static_configs:
     - targets: ['{{ prometheus_server_alertmanager.url }}']
 {% endif %}
-{% for job in (prometheus_server_jobs_generic + prometheus_server_jobs_special) %}
+{% for job in (prometheus_server_jobs) %}
 
 {%   include 'job-snippets/' + (lookup('first_found', {'paths': ['templates/job-snippets'], 'files': [job + '.j2', 'generic.j2']}) | basename) %}{{ '' }}
 {% endfor %}
diff --git a/roles/monitoring/prometheus/server/templates/targets/generic.yml.j2 b/roles/monitoring/prometheus/server/templates/targets/generic.yml.j2
index e83b6bf4..45af10c0 100644
--- a/roles/monitoring/prometheus/server/templates/targets/generic.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/targets/generic.yml.j2
@@ -1,3 +1,3 @@
-- targets: [ "{{ hostvars[target].prometheus_scrape_endpoint }}" ]
+- targets: [ "{{ hostvars[target.instance].prometheus_scrape_endpoint }}" ]
   labels:
-    instance: "{{ target }}"
+    instance: "{{ target.instance }}"
diff --git a/roles/monitoring/prometheus/server/templates/targets/nut.yml.j2 b/roles/monitoring/prometheus/server/templates/targets/nut-ups.yml.j2
index da3de3d7..da3de3d7 100644
--- a/roles/monitoring/prometheus/server/templates/targets/nut.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/targets/nut-ups.yml.j2