From a8e8cb2ed3d5e68d89edd8785ed59f0ee45f81bf Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 21 Sep 2021 19:34:25 +0200 Subject: prometheus: simplify job config --- roles/monitoring/prometheus/server/defaults/main/main.yml | 5 ++--- roles/monitoring/prometheus/server/defaults/main/rules_nut-ups.yml | 3 +++ roles/monitoring/prometheus/server/defaults/main/rules_nut.yml | 3 --- 3 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 roles/monitoring/prometheus/server/defaults/main/rules_nut-ups.yml delete mode 100644 roles/monitoring/prometheus/server/defaults/main/rules_nut.yml (limited to 'roles/monitoring/prometheus/server/defaults') diff --git a/roles/monitoring/prometheus/server/defaults/main/main.yml b/roles/monitoring/prometheus/server/defaults/main/main.yml index 95b9da6d..5be3ecd3 100644 --- a/roles/monitoring/prometheus/server/defaults/main/main.yml +++ b/roles/monitoring/prometheus/server/defaults/main/main.yml @@ -5,9 +5,8 @@ prometheus_server_retention: "15d" -prometheus_server_jobs_generic: +prometheus_server_jobs: - node -prometheus_server_jobs_special: [] #prometheus_server_jobs_extra: | # - job_name: ... @@ -15,7 +14,7 @@ prometheus_server_rules: prometheus: "{{ prometheus_server_rules_prometheus + ((prometheus_server_alertmanager is defined) | ternary(prometheus_server_rules_prometheus_alertmanager, [])) + prometheus_server_rules_prometheus_extra }}" node: "{{ prometheus_server_rules_node + prometheus_server_rules_node_extra }}" openwrt: "{{ prometheus_server_rules_openwrt + prometheus_server_rules_node_extra }}" - nut: "{{ prometheus_server_rules_nut + prometheus_server_rules_nut_extra }}" + "nut-ups": "{{ prometheus_server_rules_nut_ups + prometheus_server_rules_nut_ups_extra }}" "blackbox-ping": "{{ prometheus_server_rules_blackbox_ping + prometheus_server_rules_blackbox_ping_extra }}" "blackbox-https": "{{ prometheus_server_rules_blackbox_https + prometheus_server_rules_blackbox_https_extra }}" "blackbox-ssh": "{{ prometheus_server_rules_blackbox_ssh + prometheus_server_rules_blackbox_ssh_extra }}" diff --git a/roles/monitoring/prometheus/server/defaults/main/rules_nut-ups.yml b/roles/monitoring/prometheus/server/defaults/main/rules_nut-ups.yml new file mode 100644 index 00000000..842007b4 --- /dev/null +++ b/roles/monitoring/prometheus/server/defaults/main/rules_nut-ups.yml @@ -0,0 +1,3 @@ +--- +prometheus_server_rules_nut_ups_extra: [] +prometheus_server_rules_nut_ups: [] diff --git a/roles/monitoring/prometheus/server/defaults/main/rules_nut.yml b/roles/monitoring/prometheus/server/defaults/main/rules_nut.yml deleted file mode 100644 index d8d64f64..00000000 --- a/roles/monitoring/prometheus/server/defaults/main/rules_nut.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -prometheus_server_rules_nut_extra: [] -prometheus_server_rules_nut: [] -- cgit v1.2.3