add support for chrony_exporter (replaces textfile collector)

11 files changed, 21 insertions, 8 deletions

diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml
index 9d616568..b9268168 100644
--- a/inventory/group_vars/promzone-chaos-at-home/vars.yml
+++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml
@@ -12,6 +12,7 @@ prometheus_exporter_blackbox_version: 0.24.0
 prometheus_exporter_nut_version: 3.0.0
 prometheus_exporter_smokeping_version: 0.7.1
 prometheus_exporter_bind_version: 0.6.1
+prometheus_exporter_chrony_version: 0.6.0
 
 prometheus_server_version: 2.45.0
 prometheus_alertmanager_version: 0.25.0
@@ -20,6 +21,7 @@ prometheus_server: ch-mon
 prometheus_server_jobs:
   - node
   - openwrt
+  - chrony
   - nut
 #  - nut/ups
   - blackbox
diff --git a/inventory/group_vars/promzone-elevate-festival/vars.yml b/inventory/group_vars/promzone-elevate-festival/vars.yml
index 5de3aa99..3ddc849c 100644
--- a/inventory/group_vars/promzone-elevate-festival/vars.yml
+++ b/inventory/group_vars/promzone-elevate-festival/vars.yml
@@ -10,6 +10,7 @@ prometheus_exporter_ipmi_version: 1.6.1
 prometheus_exporter_ssl_version: 2.4.2
 prometheus_exporter_blackbox_version: 0.24.0
 prometheus_exporter_nut_version: 3.0.0
+prometheus_exporter_chrony_version: 0.6.0
 
 prometheus_server_version: 2.45.0
 prometheus_alertmanager_version: 0.25.0
@@ -18,6 +19,7 @@ prometheus_server: ele-calypso
 prometheus_server_jobs:
   - node
   - openwrt
+  - chrony
   - nut
   - nut/ups
   - blackbox
diff --git a/inventory/host_vars/ch-iot.yml b/inventory/host_vars/ch-iot.yml
index cbdff09c..85d3d3ec 100644
--- a/inventory/host_vars/ch-iot.yml
+++ b/inventory/host_vars/ch-iot.yml
@@ -47,3 +47,11 @@ ntp_client:
 ntp_server:
   allow:
   - "{{ network_zones.iot.prefix }}"
+
+
+spreadspace_apt_repo_components:
+  - prometheus
+
+
+prometheus_exporters_extra:
+  - chrony
diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml
index d8ebc266..96065226 100644
--- a/inventory/host_vars/ch-mon.yml
+++ b/inventory/host_vars/ch-mon.yml
@@ -206,7 +206,7 @@ grafana_dashboards:
    datasource: "Prometheus"
  - file: openwrt
    datasource: "Prometheus"
- - file: chronyd
+ - file: chrony
    datasource: "Prometheus"
  - file: environment-sensors
    datasource: "Prometheus"
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index 256200cc..fc9e7f61 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -102,13 +102,13 @@ prometheus_server_web_external_url: "http://{{ network.primary.address | ansible
 
 
 prometheus_exporters_extra:
+  - chrony
   - blackbox
   - nut
   - standalone-kubelet
 
 prometheus_exporter_node_textfile_collector_scripts:
   - deleted-libraries
-  - chrony
   - smartmon
 
 prometheus_exporter_blackbox_modules_extra:
@@ -172,7 +172,7 @@ grafana_dashboards:
    datasource: "Prometheus"
  - file: openwrt
    datasource: "Prometheus"
- - file: chronyd
+ - file: chrony
    datasource: "Prometheus"
  - file: blackbox
    datasource: "Prometheus"
diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml
index a4e07984..84998a39 100644
--- a/inventory/host_vars/ele-dione.yml
+++ b/inventory/host_vars/ele-dione.yml
@@ -83,9 +83,9 @@ kubernetes_node_labels:
 prometheus_exporter_node_textfile_collector_scripts:
   - deleted-libraries
   - smartmon
-  - chrony
 
 prometheus_exporters_extra:
+  - chrony
   - ipmi
 
 prometheus_exporter_ipmi_modules:
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index cb8d1490..fd57c031 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -49,9 +49,9 @@ installer_storage:
 prometheus_exporter_node_textfile_collector_scripts:
   - deleted-libraries
   - smartmon
-  - chrony
 
 prometheus_exporters_extra:
+  - chrony
   - ipmi
   - standalone-kubelet
 
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml
index ea5333f7..e17947ff 100644
--- a/inventory/host_vars/ele-media.yml
+++ b/inventory/host_vars/ele-media.yml
@@ -40,6 +40,7 @@ ntp_client:
 
 
 prometheus_exporters_extra:
+  - chrony
   - standalone-kubelet
 
 prometheus_exporter_listen_addr: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}"
@@ -47,7 +48,6 @@ prometheus_exporter_listen_addr: "{{ network_zones.lan.prefix | ansible.utils.ip
 prometheus_exporter_node_textfile_collector_scripts:
   - deleted-libraries
   - smartmon
-  - chrony
 
 prometheus_job_multitarget_blackbox__probe:
   ele-calypso:
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index 25f2a35e..10549576 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -64,9 +64,9 @@ kubernetes_node_labels:
 prometheus_exporter_node_textfile_collector_scripts:
   - deleted-libraries
   - smartmon
-  - chrony
 
 prometheus_exporters_extra:
+  - chrony
   - ipmi
 
 prometheus_exporter_ipmi_modules:
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index e36f0f03..c450138b 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -49,9 +49,9 @@ ntp_client:
 prometheus_exporter_node_textfile_collector_scripts:
   - deleted-libraries
   - smartmon
-  - chrony
 
 prometheus_exporters_extra:
+  - chrony
   - standalone-kubelet
 
 prometheus_job_multitarget_blackbox__probe:
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 19c180cf..809acceb 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -472,6 +472,7 @@ ch-apps
 ch-atlas
 ch-pan
 ch-mimas
+ch-iot
 [promzone-chaos-at-home:children]
 chaos-at-home-ap
 chaos-at-home-ups