Merge branch 'topic/prometheus-refactoring'

5 files changed, 34 insertions, 31 deletions

diff --git a/inventory/group_vars/chaos-at-home-ups/vars.yml b/inventory/group_vars/chaos-at-home-ups/vars.yml
index 5ff68452..7b60e893 100644
--- a/inventory/group_vars/chaos-at-home-ups/vars.yml
+++ b/inventory/group_vars/chaos-at-home-ups/vars.yml
@@ -11,8 +11,8 @@ prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_z
 prometheus_exporters_default:
   - openwrt
 
-prometheus_special_job_nut:
-  - exporter_hostname: ch-mon
-    instance: "ups-{{ ups_name }}"
+prometheus_job_multitarget_nut__ups:
+  ch-mon:
+  - instance: "ups-{{ ups_name }}"
     ups: "{{ ups_name }}"
     server: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}"
diff --git a/inventory/group_vars/ele-ups/vars.yml b/inventory/group_vars/ele-ups/vars.yml
index cbee3ee8..28a5eaff 100644
--- a/inventory/group_vars/ele-ups/vars.yml
+++ b/inventory/group_vars/ele-ups/vars.yml
@@ -14,8 +14,8 @@ prometheus_scrape_endpoint: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_z
 prometheus_exporters_default:
   - openwrt
 
-prometheus_special_job_nut:
-  exporter_hostname: ele-mon
-  instance: "ups-{{ ups_name }}"
-  ups: "{{ ups_name }}"
-  server: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}"
+prometheus_job_multitarget_nut__ups:
+  ele-mon:
+  - instance: "ups-{{ ups_name }}"
+    ups: "{{ ups_name }}"
+    server: "{{ network_mgmt_zone.prefix | ipaddr(network_mgmt_zone.offsets[inventory_hostname]) | ipaddr('address') }}"
diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml
index fcb04716..529bf3e7 100644
--- a/inventory/group_vars/promzone-chaos-at-home/vars.yml
+++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml
@@ -6,14 +6,13 @@ prometheus_exporters_default:
   - node
 
 prometheus_server: ch-mon
-prometheus_server_jobs_generic:
+prometheus_server_jobs:
   - node
   - openwrt
-prometheus_server_jobs_special:
   - nut
-  - blackbox-ping
-  - blackbox-https
-  - blackbox-ssh
+  - nut/ups
+  - blackbox
+  - blackbox/probe
 
 prometheus_zone_name: chaos@home
 prometheus_zone_targets: "{{ groups['promzone-chaos-at-home'] }}"
diff --git a/inventory/group_vars/promzone-elevate-festival/vars.yml b/inventory/group_vars/promzone-elevate-festival/vars.yml
index e94943d7..b3321614 100644
--- a/inventory/group_vars/promzone-elevate-festival/vars.yml
+++ b/inventory/group_vars/promzone-elevate-festival/vars.yml
@@ -6,9 +6,11 @@ prometheus_exporters_default:
   - node
 
 prometheus_server: ele-mon
-prometheus_server_jobs_generic:
+prometheus_server_jobs:
   - node
   - openwrt
+  - nut
+  - nut/ups
 
 prometheus_zone_name: Elevate Festival
 prometheus_zone_targets: "{{ groups['promzone-elevate-festival'] }}"
diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml
index 7d8e334b..b2402d0c 100644
--- a/inventory/host_vars/ch-mon.yml
+++ b/inventory/host_vars/ch-mon.yml
@@ -76,23 +76,25 @@ prometheus_exporter_blackbox_modules_extra:
   icmp:
     prober: icmp
 
-prometheus_special_job_blackbox_ping:
-  - exporter_hostname: ch-mon
-    instance: "ping-magentagw"
-    address: 62.99.185.129
-  - exporter_hostname: ch-mon
-    instance: "ping-quad9"
-    address: 9.9.9.9
-
-prometheus_special_job_blackbox_https:
-  - exporter_hostname: ch-mon
-    instance: "https-web.chaos-at-home.org"
-    address: web.chaos-at-home.org
-
-prometheus_special_job_blackbox_ssh:
-  - exporter_hostname: ch-mon
-    instance: "ssh-{{ inventory_hostname }}"
-    address: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}"
+prometheus_job_multitarget_blackbox__probe:
+  ch-mon:
+  - instance: "ping-magentagw"
+    target: 62.99.185.129
+    module: icmp
+  - instance: "ping-quad9"
+    target: 9.9.9.9
+    module: icmp
+
+  - instance: "https-pan.chaos-at-home.org"
+    target: "https://pan.chaos-at-home.org"
+    module: http_tls_2xx
+  - instance: "https-mimas.chaos-at-home.org"
+    target: "https://mimas.chaos-at-home.org"
+    module: http_tls_2xx
+
+  - instance: "ssh-{{ inventory_hostname }}"
+    target: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}"
+    module: ssh_banner
 
 
 promethues_alertmanager_smtp: