From 2e2087393521703bbe1394afc6c0dcc4943e2b35 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 23 Sep 2021 17:03:06 +0200
Subject: rename prometheus job-snippets to jobs

---
 .../server/templates/job-snippets/blackbox/https.j2        | 14 --------------
 .../server/templates/job-snippets/blackbox/ping.j2         | 14 --------------
 .../server/templates/job-snippets/blackbox/ssh.j2          | 14 --------------
 .../prometheus/server/templates/job-snippets/generic.j2    | 13 -------------
 .../prometheus/server/templates/job-snippets/nut/ups.j2    | 13 -------------
 .../prometheus/server/templates/job-snippets/openwrt.j2    |  5 -----
 .../prometheus/server/templates/jobs/blackbox/https.j2     | 14 ++++++++++++++
 .../prometheus/server/templates/jobs/blackbox/ping.j2      | 14 ++++++++++++++
 .../prometheus/server/templates/jobs/blackbox/ssh.j2       | 14 ++++++++++++++
 .../monitoring/prometheus/server/templates/jobs/generic.j2 | 13 +++++++++++++
 .../monitoring/prometheus/server/templates/jobs/nut/ups.j2 | 13 +++++++++++++
 .../monitoring/prometheus/server/templates/jobs/openwrt.j2 |  5 +++++
 .../prometheus/server/templates/prometheus.yml.j2          |  2 +-
 13 files changed, 74 insertions(+), 74 deletions(-)
 delete mode 100644 roles/monitoring/prometheus/server/templates/job-snippets/blackbox/https.j2
 delete mode 100644 roles/monitoring/prometheus/server/templates/job-snippets/blackbox/ping.j2
 delete mode 100644 roles/monitoring/prometheus/server/templates/job-snippets/blackbox/ssh.j2
 delete mode 100644 roles/monitoring/prometheus/server/templates/job-snippets/generic.j2
 delete mode 100644 roles/monitoring/prometheus/server/templates/job-snippets/nut/ups.j2
 delete mode 100644 roles/monitoring/prometheus/server/templates/job-snippets/openwrt.j2
 create mode 100644 roles/monitoring/prometheus/server/templates/jobs/blackbox/https.j2
 create mode 100644 roles/monitoring/prometheus/server/templates/jobs/blackbox/ping.j2
 create mode 100644 roles/monitoring/prometheus/server/templates/jobs/blackbox/ssh.j2
 create mode 100644 roles/monitoring/prometheus/server/templates/jobs/generic.j2
 create mode 100644 roles/monitoring/prometheus/server/templates/jobs/nut/ups.j2
 create mode 100644 roles/monitoring/prometheus/server/templates/jobs/openwrt.j2

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

diff --git a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox/https.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox/https.j2
deleted file mode 100644
index 98a64121..00000000
--- a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox/https.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-  - job_name: '{{ job }}'
-    metrics_path: /proxy
-    params:
-      module:
-      - blackbox
-      - http_tls_2xx
-    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/blackbox/ping.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox/ping.j2
deleted file mode 100644
index 736ffec1..00000000
--- a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox/ping.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-  - job_name: '{{ job }}'
-    metrics_path: /proxy
-    params:
-      module:
-      - blackbox
-      - icmp
-    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/blackbox/ssh.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox/ssh.j2
deleted file mode 100644
index 166f37ad..00000000
--- a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox/ssh.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-  - job_name: '{{ job }}'
-    metrics_path: /proxy
-    params:
-      module:
-      - blackbox
-      - ssh_banner
-    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/generic.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/generic.j2
deleted file mode 100644
index b155c5f7..00000000
--- a/roles/monitoring/prometheus/server/templates/job-snippets/generic.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-  - job_name: '{{ job }}'
-    metrics_path: /proxy
-    params:
-      module:
-      - {{ job }}
-    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/nut/ups.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/nut/ups.j2
deleted file mode 100644
index 3a2c5c62..00000000
--- a/roles/monitoring/prometheus/server/templates/job-snippets/nut/ups.j2
+++ /dev/null
@@ -1,13 +0,0 @@
-  - 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
deleted file mode 100644
index e93f8be7..00000000
--- a/roles/monitoring/prometheus/server/templates/job-snippets/openwrt.j2
+++ /dev/null
@@ -1,5 +0,0 @@
-  - job_name: '{{ job }}'
-    scheme: http
-    file_sd_configs:
-    - files:
-      - "/etc/prometheus/targets/{{ job }}/*.yml"
diff --git a/roles/monitoring/prometheus/server/templates/jobs/blackbox/https.j2 b/roles/monitoring/prometheus/server/templates/jobs/blackbox/https.j2
new file mode 100644
index 00000000..98a64121
--- /dev/null
+++ b/roles/monitoring/prometheus/server/templates/jobs/blackbox/https.j2
@@ -0,0 +1,14 @@
+  - job_name: '{{ job }}'
+    metrics_path: /proxy
+    params:
+      module:
+      - blackbox
+      - http_tls_2xx
+    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/jobs/blackbox/ping.j2 b/roles/monitoring/prometheus/server/templates/jobs/blackbox/ping.j2
new file mode 100644
index 00000000..736ffec1
--- /dev/null
+++ b/roles/monitoring/prometheus/server/templates/jobs/blackbox/ping.j2
@@ -0,0 +1,14 @@
+  - job_name: '{{ job }}'
+    metrics_path: /proxy
+    params:
+      module:
+      - blackbox
+      - icmp
+    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/jobs/blackbox/ssh.j2 b/roles/monitoring/prometheus/server/templates/jobs/blackbox/ssh.j2
new file mode 100644
index 00000000..166f37ad
--- /dev/null
+++ b/roles/monitoring/prometheus/server/templates/jobs/blackbox/ssh.j2
@@ -0,0 +1,14 @@
+  - job_name: '{{ job }}'
+    metrics_path: /proxy
+    params:
+      module:
+      - blackbox
+      - ssh_banner
+    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/jobs/generic.j2 b/roles/monitoring/prometheus/server/templates/jobs/generic.j2
new file mode 100644
index 00000000..b155c5f7
--- /dev/null
+++ b/roles/monitoring/prometheus/server/templates/jobs/generic.j2
@@ -0,0 +1,13 @@
+  - job_name: '{{ job }}'
+    metrics_path: /proxy
+    params:
+      module:
+      - {{ job }}
+    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/jobs/nut/ups.j2 b/roles/monitoring/prometheus/server/templates/jobs/nut/ups.j2
new file mode 100644
index 00000000..3a2c5c62
--- /dev/null
+++ b/roles/monitoring/prometheus/server/templates/jobs/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/jobs/openwrt.j2 b/roles/monitoring/prometheus/server/templates/jobs/openwrt.j2
new file mode 100644
index 00000000..e93f8be7
--- /dev/null
+++ b/roles/monitoring/prometheus/server/templates/jobs/openwrt.j2
@@ -0,0 +1,5 @@
+  - job_name: '{{ job }}'
+    scheme: http
+    file_sd_configs:
+    - files:
+      - "/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 8156341d..e73ca354 100644
--- a/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
@@ -40,7 +40,7 @@ scrape_configs:
 {% endif %}
 {% for job in (prometheus_server_jobs) %}
 
-{%   include lookup('first_found', {'paths': ['templates/job-snippets'], 'files': [job + '.j2', 'generic.j2']}) | relpath(template_fullpath | dirname) %}{{ '' }}
+{%   include lookup('first_found', {'paths': ['templates/jobs'], 'files': [job + '.j2', 'generic.j2']}) | relpath(template_fullpath | dirname) %}{{ '' }}
 {% endfor %}
 {% if prometheus_server_jobs_extra is defined %}
 
-- 
cgit v1.2.3