ele-(telesto|dione): base install

8 files changed, 60 insertions, 5 deletions

diff --git a/dan/ele-dione.yml b/dan/ele-dione.yml
index ca1516b5..a6baf4c5 100644
--- a/dan/ele-dione.yml
+++ b/dan/ele-dione.yml
@@ -10,6 +10,7 @@
   - role: core/ntp
   - role: core/admin-users
   - role: apt-repo/spreadspace
+  - role: nginx/base
   - role: monitoring/prometheus/exporter
   - role: streaming/blackmagic/desktopvideo
   post_tasks:
diff --git a/dan/ele-telesto.yml b/dan/ele-telesto.yml
index 2370fdc2..d9a6cb7a 100644
--- a/dan/ele-telesto.yml
+++ b/dan/ele-telesto.yml
@@ -10,6 +10,7 @@
   - role: core/ntp
   - role: core/admin-users
   - role: apt-repo/spreadspace
+  - role: nginx/base
   - role: monitoring/prometheus/exporter
   - role: streaming/blackmagic/desktopvideo
 #  post_tasks:
diff --git a/inventory/group_vars/k8s-emc/vars.yml b/inventory/group_vars/k8s-emc/vars.yml
index 14b5cd84..1a69b0bb 100644
--- a/inventory/group_vars/k8s-emc/vars.yml
+++ b/inventory/group_vars/k8s-emc/vars.yml
@@ -1,5 +1,5 @@
 ---
-kubernetes_version: 1.24.0
+kubernetes_version: 1.24.2
 kubernetes_container_runtime: containerd
 kubernetes_network_plugin: kubeguard
 
@@ -43,7 +43,7 @@ kubeguard:
     encoder:
       transfer_net: 172.18.191.0/24
       node_interface:
-        ele-telesto: eno2
+        ele-telesto: enp36s0
         ele-dione: eno2
 
 kubernetes_overlay_node_ip: "{{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubeguard.node_index[inventory_hostname]) | ipaddr(1) | ipaddr('address') }}"
diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml
index 643682e0..4ccb4a6c 100644
--- a/inventory/host_vars/ele-dione.yml
+++ b/inventory/host_vars/ele-dione.yml
@@ -61,3 +61,27 @@ ntp_hwtimestamp_interfaces:
 
 blackmagic_desktopvideo_version: 12.2.2a6
 blackmagic_desktopvideo_include_gui: yes
+
+
+prometheus_exporter_node_textfile_collector_scripts:
+  - deleted-libraries
+  - smartmon
+  - chrony
+
+prometheus_exporters_extra:
+  - ssl
+  - ipmi
+
+prometheus_exporter_ipmi_modules:
+  default:
+    collectors:
+    - bmc
+    - ipmi
+    - chassis
+    - sel
+
+prometheus_job_multitarget_blackbox__probe:
+  ele-mon:
+  - instance: "ssh-{{ inventory_hostname }}"
+    target: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}"
+    module: ssh_banner
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index 01d8993e..b33a488d 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -51,6 +51,7 @@ installer_storage:
 prometheus_exporter_node_textfile_collector_scripts:
   - deleted-libraries
   - smartmon
+  - chrony
 
 prometheus_exporters_extra:
   - ssl
diff --git a/inventory/host_vars/ele-mon.yml b/inventory/host_vars/ele-mon.yml
index 2dc941ea..f4bbadf4 100644
--- a/inventory/host_vars/ele-mon.yml
+++ b/inventory/host_vars/ele-mon.yml
@@ -68,6 +68,10 @@ prometheus_exporters_extra:
   - blackbox
   - nut
 
+prometheus_exporter_node_textfile_collector_scripts:
+  - deleted-libraries
+  - chrony
+
 prometheus_exporter_blackbox_modules_extra:
   icmp:
     prober: icmp
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index fa4675c7..fa3c0a9b 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -9,7 +9,7 @@ network:
   nameservers: "{{ network_zones.cc_hmtsaal.dns }}"
   domain: "{{ host_domain }}"
   primary: &_network_primary_
-    name: eno1
+    name: enp35s0
     address: "{{ network_zones.cc_hmtsaal.prefix | ipaddr(network_zones.cc_hmtsaal.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
     gateway: "{{ network_zones.cc_hmtsaal.gateway }}"
   interfaces:
@@ -63,3 +63,27 @@ ntp_server:
 
 blackmagic_desktopvideo_version: 12.2.2a6
 blackmagic_desktopvideo_include_gui: yes
+
+
+prometheus_exporter_node_textfile_collector_scripts:
+  - deleted-libraries
+  - smartmon
+  - chrony
+
+prometheus_exporters_extra:
+  - ssl
+  - ipmi
+
+prometheus_exporter_ipmi_modules:
+  default:
+    collectors:
+    - bmc
+    - ipmi
+    - chassis
+    - sel
+
+prometheus_job_multitarget_blackbox__probe:
+  ele-mon:
+  - instance: "ssh-{{ inventory_hostname }}"
+    target: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}"
+    module: ssh_banner
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index cc5d6188..dc727b22 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -432,8 +432,8 @@ promzone-chaos-at-home-server
 ele-mon
 [promzone-elevate-festival]
 ele-helene
-#ele-dione
-#ele-telesto
+ele-dione
+ele-telesto
 ele-router-hmtsaal
 ele-ap-hmtsaal[0:3]
 ele-ups-hmtsaal[0:2]