update prometheus exporter ssl and chrony

5 files changed, 30 insertions, 4 deletions

diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml
index 76037d09..67a33f15 100644
--- a/inventory/group_vars/promzone-chaos-at-home/vars.yml
+++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml
@@ -7,12 +7,12 @@ prometheus_exporters_default:
 
 prometheus_exporter_node_version: 1.8.0
 prometheus_exporter_ipmi_version: 1.8.0
-prometheus_exporter_ssl_version: 2.4.2
+prometheus_exporter_ssl_version: 2.4.3
 prometheus_exporter_blackbox_version: 0.25.0
 prometheus_exporter_nut_version: 3.1.1
 prometheus_exporter_smokeping_version: 0.8.1
 prometheus_exporter_bind_version: 0.7.0
-prometheus_exporter_chrony_version: 0.9.2
+prometheus_exporter_chrony_version: 0.10.0
 prometheus_exporter_chrony_disable_dns_lookups: yes
 prometheus_exporter_mosquitto_version: 0.7.2
 
diff --git a/inventory/group_vars/promzone-elevate-festival/vars.yml b/inventory/group_vars/promzone-elevate-festival/vars.yml
index 63e87a15..ba4756ae 100644
--- a/inventory/group_vars/promzone-elevate-festival/vars.yml
+++ b/inventory/group_vars/promzone-elevate-festival/vars.yml
@@ -7,10 +7,10 @@ prometheus_exporters_default:
 
 prometheus_exporter_node_version: 1.8.0
 prometheus_exporter_ipmi_version: 1.8.0
-prometheus_exporter_ssl_version: 2.4.2
+prometheus_exporter_ssl_version: 2.4.3
 prometheus_exporter_blackbox_version: 0.25.0
 prometheus_exporter_nut_version: 3.1.1
-prometheus_exporter_chrony_version: 0.9.2
+prometheus_exporter_chrony_version: 0.10.0
 prometheus_exporter_chrony_disable_dns_lookups: yes
 
 prometheus_server_version: 2.51.2
diff --git a/inventory/host_vars/ch-imap-proxy.yml b/inventory/host_vars/ch-imap-proxy.yml
index ba7810dc..76a62757 100644
--- a/inventory/host_vars/ch-imap-proxy.yml
+++ b/inventory/host_vars/ch-imap-proxy.yml
@@ -33,6 +33,20 @@ network:
   - *_network_primary_
 
 
+ntp_variant: systemd-timesyncd
+
+
+spreadspace_apt_repo_components:
+  - main
+  - prometheus
+
+prometheus_job_multitarget_blackbox__probe:
+  ch-mon:
+  - instance: "ssh-{{ 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
+
+
 acme_directory_server: "{{ acme_directory_server_le_live_v2 }}"
 
 acmetool_reload_services:
diff --git a/inventory/host_vars/ch-jump.yml b/inventory/host_vars/ch-jump.yml
index 8873864b..92adb5cf 100644
--- a/inventory/host_vars/ch-jump.yml
+++ b/inventory/host_vars/ch-jump.yml
@@ -61,3 +61,13 @@ nftables_base_rules:
         # skuid c3voc ip6 daddr != {  } reject with icmpv6 type admin-prohibited
       }
     }
+
+
+spreadspace_apt_repo_components:
+  - prometheus
+
+prometheus_job_multitarget_blackbox__probe:
+  ch-mon:
+  - instance: "ssh-{{ 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/hosts.ini b/inventory/hosts.ini
index de125e83..208278ac 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -451,6 +451,7 @@ vmhost-ele-helene-guests
 ch-mon
 [promzone-chaos-at-home]
 ch-router
+ch-jump
 ch-gw-lan
 ch-gw-c3voc
 ch-phoebe
@@ -462,6 +463,7 @@ ch-pan
 ch-mimas
 ch-iot
 ch-http-proxy
+ch-imap-proxy
 ch-greenbone
 [promzone-chaos-at-home:children]
 chaos-at-home-ap