elevate: base install for telesto/dione and some prometheus cleanup

9 files changed, 29 insertions, 6 deletions

diff --git a/dan/ele-dione.yml b/dan/ele-dione.yml
index d61d9f5e..eab42550 100644
--- a/dan/ele-dione.yml
+++ b/dan/ele-dione.yml
@@ -16,7 +16,7 @@
   - role: storage/zfs/pools
   - role: apt-repo/spreadspace
   - role: nginx/base
-  #- role: monitoring/prometheus/exporter
+  - role: monitoring/prometheus/exporter
   - role: streaming/blackmagic/desktopvideo
   post_tasks:
   - name: install lm-sensors and i7z
diff --git a/dan/ele-media.yml b/dan/ele-media.yml
index 1c0b186d..cf90b2f6 100644
--- a/dan/ele-media.yml
+++ b/dan/ele-media.yml
@@ -21,4 +21,5 @@
   - role: network/wireguard/gateway
   - role: x509/acmetool/base
   - role: nginx/base
+  - role: monitoring/prometheus/exporter
   - role: elevate/media
diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml
index b58cba5f..ec5e038a 100644
--- a/inventory/group_vars/elevate-festival/vars.yml
+++ b/inventory/group_vars/elevate-festival/vars.yml
@@ -166,7 +166,7 @@ network_zones:
       ele-ups-orpheum0: 213
 
       ### Other
-      ele-tub: 240
+      ele-tub: 239
       datacop: 249
       ch-equinox-t450s: 250
       ele-router-emc: 251
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index 91bcc1cd..47115bc1 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -102,6 +102,7 @@ prometheus_exporters_extra:
 prometheus_exporter_node_textfile_collector_scripts:
   - deleted-libraries
   - chrony
+  - smartmon
 
 prometheus_exporter_blackbox_modules_extra:
   icmp:
diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml
index 2b9d57ce..943b2db0 100644
--- a/inventory/host_vars/ele-dione.yml
+++ b/inventory/host_vars/ele-dione.yml
@@ -67,7 +67,7 @@ zfs_arc_size:
 zfs_pools:
   storage:
     mountpoint: /srv/storage
-    create_vdevs: /dev/disk/by-id/ata-WDC_WD30EFRX-68EUZN0_WD-WCC4N6ZP3KFJ
+    create_vdevs: /dev/disk/by-id/ata-WDC_WD40EFAX-68JH4N1_WD-WX92DA1LZA99
 
 
 blackmagic_desktopvideo_version: 12.2.2a6
@@ -84,7 +84,6 @@ prometheus_exporter_node_textfile_collector_scripts:
   - chrony
 
 prometheus_exporters_extra:
-  - ssl
   - ipmi
 
 prometheus_exporter_ipmi_modules:
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index e3528c5c..403eb376 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -52,7 +52,6 @@ prometheus_exporter_node_textfile_collector_scripts:
   - chrony
 
 prometheus_exporters_extra:
-  - ssl
   - ipmi
 
 prometheus_exporter_ipmi_modules:
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml
index e58dcbeb..7892f7be 100644
--- a/inventory/host_vars/ele-media.yml
+++ b/inventory/host_vars/ele-media.yml
@@ -28,6 +28,29 @@ apt_repo_components:
 
 spreadspace_apt_repo_components:
   - container
+  - prometheus
+
+
+ntp_variant: chrony
+
+ntp_client:
+  servers:
+  - name: "{{ network_zones.lan.gateway }}"
+    options: iburst
+
+
+prometheus_exporter_listen_addr: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}"
+
+prometheus_exporter_node_textfile_collector_scripts:
+  - deleted-libraries
+  - smartmon
+  - chrony
+
+prometheus_job_multitarget_blackbox__probe:
+  ele-calypso:
+  - instance: "ssh-{{ 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
 
 
 docker_pkg_provider: docker-com
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index 0c1e2ac3..fd5cf7c7 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -75,7 +75,6 @@ prometheus_exporter_node_textfile_collector_scripts:
   - chrony
 
 prometheus_exporters_extra:
-  - ssl
   - ipmi
 
 prometheus_exporter_ipmi_modules:
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 97b3ac21..418c9c83 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -446,6 +446,7 @@ promzone-chaos-at-home-server
 [promzone-elevate-festival-server]
 ele-calypso
 [promzone-elevate-festival]
+ele-media
 ele-helene
 ele-dione
 ele-telesto