15 files changed, 22 insertions, 22 deletions
diff --git a/inventory/host_vars/ch-apps/vars.yml b/inventory/host_vars/ch-apps/vars.yml
index 8ea12d8b..22a5578a 100644
--- a/inventory/host_vars/ch-apps/vars.yml
+++ b/inventory/host_vars/ch-apps/vars.yml
@@ -66,7 +66,7 @@ prometheus_exporters_extra:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
 
diff --git a/inventory/host_vars/ch-atlas.yml b/inventory/host_vars/ch-atlas.yml
index 3ee9f7ac..1f4dda2f 100644
--- a/inventory/host_vars/ch-atlas.yml
+++ b/inventory/host_vars/ch-atlas.yml
@@ -74,6 +74,6 @@ prometheus_exporter_node_textfile_collector_scripts:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network.primary.address | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
diff --git a/inventory/host_vars/ch-epimetheus.yml b/inventory/host_vars/ch-epimetheus.yml
index e76d10ae..39ddbc3d 100644
--- a/inventory/host_vars/ch-epimetheus.yml
+++ b/inventory/host_vars/ch-epimetheus.yml
@@ -41,7 +41,7 @@ prometheus_exporter_node_textfile_collector_scripts:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
 
diff --git a/inventory/host_vars/ch-greenbone.yml b/inventory/host_vars/ch-greenbone.yml
index 4372ecd1..e5e4c3fc 100644
--- a/inventory/host_vars/ch-greenbone.yml
+++ b/inventory/host_vars/ch-greenbone.yml
@@ -44,11 +44,11 @@ spreadspace_apt_repo_components:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
   - svc_kind: https
-    svc_name: "greenbone.chaos-at-home.org"
+    svc_instance: "greenbone.chaos-at-home.org"
     target: "https://{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}/robots.txt"
     module: http_tls_2xx
 
diff --git a/inventory/host_vars/ch-gw-lan.yml b/inventory/host_vars/ch-gw-lan.yml
index e621648c..5677359c 100644
--- a/inventory/host_vars/ch-gw-lan.yml
+++ b/inventory/host_vars/ch-gw-lan.yml
@@ -49,7 +49,7 @@ spreadspace_apt_repo_components:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
 
diff --git a/inventory/host_vars/ch-http-proxy.yml b/inventory/host_vars/ch-http-proxy.yml
index a61eb68a..1e998ed0 100644
--- a/inventory/host_vars/ch-http-proxy.yml
+++ b/inventory/host_vars/ch-http-proxy.yml
@@ -50,11 +50,11 @@ prometheus_exporters_extra:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
   - svc_kind: https
-    svc_name: "login.chaos-at-home.org"
+    svc_instance: "login.chaos-at-home.org"
     target: "https://{{ network_services.http.addr }}/login"
     module: "http_tls_2xx"
     hostname: "login.chaos-at-home.org"
diff --git a/inventory/host_vars/ch-imap-proxy.yml b/inventory/host_vars/ch-imap-proxy.yml
index 16c5e047..b54fabcc 100644
--- a/inventory/host_vars/ch-imap-proxy.yml
+++ b/inventory/host_vars/ch-imap-proxy.yml
@@ -43,7 +43,7 @@ spreadspace_apt_repo_components:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
 
diff --git a/inventory/host_vars/ch-iot.yml b/inventory/host_vars/ch-iot.yml
index 53af0fb5..30bee5d8 100644
--- a/inventory/host_vars/ch-iot.yml
+++ b/inventory/host_vars/ch-iot.yml
@@ -93,11 +93,11 @@ prometheus_exporters_extra:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
   - svc_kind: mqtt
-    svc_name: "mqtt.chaos-at-home.org"
+    svc_instance: "mqtt.chaos-at-home.org"
     target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:1883"
     module: "tcp_tls_connect"
     hostname: "mqtt.chaos-at-home.org"
diff --git a/inventory/host_vars/ch-jump.yml b/inventory/host_vars/ch-jump.yml
index 9af98aa1..d0d84bf5 100644
--- a/inventory/host_vars/ch-jump.yml
+++ b/inventory/host_vars/ch-jump.yml
@@ -69,6 +69,6 @@ spreadspace_apt_repo_components:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
diff --git a/inventory/host_vars/ch-mimas.yml b/inventory/host_vars/ch-mimas.yml
index 131d9396..bc09509d 100644
--- a/inventory/host_vars/ch-mimas.yml
+++ b/inventory/host_vars/ch-mimas.yml
@@ -135,11 +135,11 @@ prometheus_exporters_extra:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ external_ip }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
   - svc_kind: https
-    svc_name: "mimas.chaos-at-home.org"
+    svc_instance: "mimas.chaos-at-home.org"
     target: "https://mimas.chaos-at-home.org"
     module: http_tls_2xx
 
diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml
index 0b830a88..c514550e 100644
--- a/inventory/host_vars/ch-mon.yml
+++ b/inventory/host_vars/ch-mon.yml
@@ -175,11 +175,11 @@ prometheus_exporter_smokeping_targets:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
   - svc_kind: https
-    svc_name: "mon.chaos-at-home.org"
+    svc_instance: "mon.chaos-at-home.org"
     target: "https://{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}/healthz"
     module: http_tls_2xx
 
diff --git a/inventory/host_vars/ch-pan.yml b/inventory/host_vars/ch-pan.yml
index 0edb86a1..29ec85ae 100644
--- a/inventory/host_vars/ch-pan.yml
+++ b/inventory/host_vars/ch-pan.yml
@@ -171,11 +171,11 @@ prometheus_exporters_extra:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network.primary.address | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
   - svc_kind: https
-    svc_name: "pan.chaos-at-home.org"
+    svc_instance: "pan.chaos-at-home.org"
     target: "https://pan.chaos-at-home.org"
     module: http_tls_2xx
 
diff --git a/inventory/host_vars/ch-phoebe.yml b/inventory/host_vars/ch-phoebe.yml
index ca787492..0f2ed044 100644
--- a/inventory/host_vars/ch-phoebe.yml
+++ b/inventory/host_vars/ch-phoebe.yml
@@ -70,7 +70,7 @@ prometheus_exporter_ipmi_modules:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
 
diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml
index df6fa39a..b5641464 100644
--- a/inventory/host_vars/ch-prometheus.yml
+++ b/inventory/host_vars/ch-prometheus.yml
@@ -65,7 +65,7 @@ prometheus_exporter_ipmi_modules:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
 
diff --git a/inventory/host_vars/ch-repo.yml b/inventory/host_vars/ch-repo.yml
index c911195b..de952d74 100644
--- a/inventory/host_vars/ch-repo.yml
+++ b/inventory/host_vars/ch-repo.yml
@@ -77,10 +77,10 @@ approx_backends:
 prometheus_job_multitarget_blackbox__probe:
   ch-mon:
   - svc_kind: ssh
-    svc_name: "{{ inventory_hostname }}"
+    svc_instance: "{{ inventory_hostname }}"
     target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
   - svc_kind: http
-    svc_name: "apt.chaos-at-home.org"
+    svc_instance: "apt.chaos-at-home.org"
     target: "http://{{ approx_hostname }}"
     module: "http_2xx"