use / as spereator for jobs formerly known as special

9 files changed, 13 insertions, 10 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 98a64121..98a64121 100644
--- a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-https.j2
+++ b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox/https.j2
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 736ffec1..736ffec1 100644
--- a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-ping.j2
+++ b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox/ping.j2
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 166f37ad..166f37ad 100644
--- a/roles/monitoring/prometheus/server/templates/job-snippets/blackbox-ssh.j2
+++ b/roles/monitoring/prometheus/server/templates/job-snippets/blackbox/ssh.j2
diff --git a/roles/monitoring/prometheus/server/templates/job-snippets/nut-ups.j2 b/roles/monitoring/prometheus/server/templates/job-snippets/nut/ups.j2
index 3a2c5c62..3a2c5c62 100644
--- a/roles/monitoring/prometheus/server/templates/job-snippets/nut-ups.j2
+++ b/roles/monitoring/prometheus/server/templates/job-snippets/nut/ups.j2
diff --git a/roles/monitoring/prometheus/server/templates/prometheus.yml.j2 b/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
index 4a079896..8156341d 100644
--- a/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
@@ -6,6 +6,9 @@ global:
 
 rule_files:
   - /etc/prometheus/rules/*.yml
+{% for subdir in (prometheus_server_jobs | select('match', '.*/.*') | map('dirname') | unique) %}
+  - /etc/prometheus/rules/{{ subdir }}/*.yml
+{% endfor %}
 {% if prometheus_server_alertmanager is defined %}
 
 alerting:
@@ -37,7 +40,7 @@ scrape_configs:
 {% endif %}
 {% for job in (prometheus_server_jobs) %}
 
-{%   include 'job-snippets/' + (lookup('first_found', {'paths': ['templates/job-snippets'], 'files': [job + '.j2', 'generic.j2']}) | basename) %}{{ '' }}
+{%   include lookup('first_found', {'paths': ['templates/job-snippets'], 'files': [job + '.j2', 'generic.j2']}) | relpath(template_fullpath | dirname) %}{{ '' }}
 {% endfor %}
 {% if prometheus_server_jobs_extra is defined %}
 
diff --git a/roles/monitoring/prometheus/server/templates/targets/blackbox-https.yml.j2 b/roles/monitoring/prometheus/server/templates/targets/blackbox/https.yml.j2
index b1a33df3..29c89590 100644
--- a/roles/monitoring/prometheus/server/templates/targets/blackbox-https.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/targets/blackbox/https.yml.j2
@@ -1,4 +1,4 @@
 - targets: [ '{{ hostvars[target.config.exporter_hostname].prometheus_scrape_endpoint }}' ]
   labels:
     instance: '{{ target.instance }}'
-    __param_target: {{ target.config.address }}
+    __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
index b1a33df3..29c89590 100644
--- a/roles/monitoring/prometheus/server/templates/targets/blackbox-ping.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/targets/blackbox/ping.yml.j2
@@ -1,4 +1,4 @@
 - targets: [ '{{ hostvars[target.config.exporter_hostname].prometheus_scrape_endpoint }}' ]
   labels:
     instance: '{{ target.instance }}'
-    __param_target: {{ target.config.address }}
+    __param_target: '{{ target.config.address }}'
diff --git a/roles/monitoring/prometheus/server/templates/targets/blackbox-ssh.yml.j2 b/roles/monitoring/prometheus/server/templates/targets/blackbox/ssh.yml.j2
index b1a33df3..29c89590 100644
--- a/roles/monitoring/prometheus/server/templates/targets/blackbox-ssh.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/targets/blackbox/ssh.yml.j2
@@ -1,4 +1,4 @@
 - targets: [ '{{ hostvars[target.config.exporter_hostname].prometheus_scrape_endpoint }}' ]
   labels:
     instance: '{{ target.instance }}'
-    __param_target: {{ target.config.address }}
+    __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 d63d79a7..6003cd46 100644
--- a/roles/monitoring/prometheus/server/templates/targets/nut-ups.yml.j2
+++ b/roles/monitoring/prometheus/server/templates/targets/nut/ups.yml.j2
@@ -1,17 +1,17 @@
 - targets: [ '{{ hostvars[target.config.exporter_hostname].prometheus_scrape_endpoint }}' ]
   labels:
     instance: '{{ target.instance }}'
-    __param_ups: {{ target.config.ups }}
-    __param_server: {{ target.config.server | default('127.0.0.1') }}
+    __param_ups: '{{ target.config.ups }}'
+    __param_server: '{{ target.config.server | default('127.0.0.1') }}'
 {% if 'username' in target.config %}
-    __param_username: {{ target.config.username }}
+    __param_username: '{{ target.config.username }}'
 {% endif  %}
 {% if 'password' in target.config %}
-    __param_password: {{ target.config.password }}
+    __param_password: '{{ target.config.password }}'
 {% endif  %}
 {% if 'variables' in target.config %}
-    __param_variables: {{ target.config.variables }}
+    __param_variables: '{{ target.config.variables }}'
 {% endif  %}
 {% if 'statuses' in target.config %}
-    __param_statuses: {{ target.config.statuses }}
+    __param_statuses: '{{ target.config.statuses }}'
 {% endif  %}