summaryrefslogtreecommitdiff
path: root/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2021-09-26 04:29:02 +0200
committerChristian Pointner <equinox@spreadspace.org>2021-09-26 04:29:02 +0200
commit223297c29d78e4fe95e2ed2338455708e4e0a9c3 (patch)
tree02534f529becf59835dd1ed5dee0f2321966a09b /roles/monitoring/prometheus/server/templates/prometheus.yml.j2
parentswitch to pascal for pressure (diff)
parentfix alert wording (diff)
Merge branch 'topic/prometheus-refactoring'
Diffstat (limited to 'roles/monitoring/prometheus/server/templates/prometheus.yml.j2')
-rw-r--r--roles/monitoring/prometheus/server/templates/prometheus.yml.j29
1 files changed, 6 insertions, 3 deletions
diff --git a/roles/monitoring/prometheus/server/templates/prometheus.yml.j2 b/roles/monitoring/prometheus/server/templates/prometheus.yml.j2
index 4cfcc498..e73ca354 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:
@@ -25,7 +28,7 @@ scrape_configs:
static_configs:
- targets: ['localhost:9090']
labels:
- instance: "{{ inventory_hostname }}"
+ instance: '{{ inventory_hostname }}'
{% if prometheus_server_alertmanager is defined %}
- job_name: 'alertmanager'
@@ -35,9 +38,9 @@ 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) %}{{ '' }}
+{% include lookup('first_found', {'paths': ['templates/jobs'], 'files': [job + '.j2', 'generic.j2']}) | relpath(template_fullpath | dirname) %}{{ '' }}
{% endfor %}
{% if prometheus_server_jobs_extra is defined %}