summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2023-02-23 14:35:38 +0100
committerChristian Pointner <equinox@spreadspace.org>2023-02-23 14:35:38 +0100
commit9dfa0b19f598459b92e994000738e0567f09496c (patch)
tree7168ddd10846d5e2b82dd2fdd9b1cc14cba6ad06
parentele-ymir: fix display setup script (diff)
elevate: update prometheus components and add ele-ymir, ele-hyperion
-rw-r--r--dan/ele-hyperion.yml2
-rw-r--r--dan/ele-ymir.yml2
-rw-r--r--inventory/group_vars/promzone-elevate-festival/vars.yml12
-rw-r--r--inventory/host_vars/ele-hyperion.yml4
-rw-r--r--inventory/host_vars/ele-ymir.yml4
-rw-r--r--inventory/hosts.ini2
6 files changed, 20 insertions, 6 deletions
diff --git a/dan/ele-hyperion.yml b/dan/ele-hyperion.yml
index 7b6e73f7..afa44507 100644
--- a/dan/ele-hyperion.yml
+++ b/dan/ele-hyperion.yml
@@ -14,6 +14,8 @@
roles:
- role: apt-repo/obs-studio
- role: apt-repo/spreadspace
+ - role: nginx/base
+ - role: monitoring/prometheus/exporter
- role: ws/base
- role: core/admin-users
- role: streaming/blackmagic/desktopvideo
diff --git a/dan/ele-ymir.yml b/dan/ele-ymir.yml
index 76e55721..f1039109 100644
--- a/dan/ele-ymir.yml
+++ b/dan/ele-ymir.yml
@@ -13,6 +13,8 @@
hosts: ele-ymir
roles:
- role: apt-repo/spreadspace
+ - role: nginx/base
+ - role: monitoring/prometheus/exporter
- role: ws/base
- role: core/admin-users
post_tasks:
diff --git a/inventory/group_vars/promzone-elevate-festival/vars.yml b/inventory/group_vars/promzone-elevate-festival/vars.yml
index 85ce0dc7..9328672e 100644
--- a/inventory/group_vars/promzone-elevate-festival/vars.yml
+++ b/inventory/group_vars/promzone-elevate-festival/vars.yml
@@ -5,14 +5,14 @@ prometheus_exporters_extra: []
prometheus_exporters_default:
- node
-prometheus_exporter_node_version: 1.3.1
+prometheus_exporter_node_version: 1.5.0
prometheus_exporter_ipmi_version: 1.6.1
-prometheus_exporter_ssl_version: 2.4.1
-prometheus_exporter_blackbox_version: 0.21.0
-prometheus_exporter_nut_version: 2.3.5
+prometheus_exporter_ssl_version: 2.4.2
+prometheus_exporter_blackbox_version: 0.23.0
+prometheus_exporter_nut_version: 2.5.2
-prometheus_server_version: 2.36.2
-prometheus_alertmanager_version: 0.24.0
+prometheus_server_version: 2.41.0
+prometheus_alertmanager_version: 0.25.0
prometheus_server: ele-calypso
prometheus_server_jobs:
diff --git a/inventory/host_vars/ele-hyperion.yml b/inventory/host_vars/ele-hyperion.yml
index 17793a14..1f7bbb2b 100644
--- a/inventory/host_vars/ele-hyperion.yml
+++ b/inventory/host_vars/ele-hyperion.yml
@@ -53,6 +53,10 @@ apt_repo_components:
- universe
- multiverse
+spreadspace_apt_repo_components:
+ - main
+ - prometheus
+
base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
admin_users_host:
diff --git a/inventory/host_vars/ele-ymir.yml b/inventory/host_vars/ele-ymir.yml
index b6d05d9e..bbfc4734 100644
--- a/inventory/host_vars/ele-ymir.yml
+++ b/inventory/host_vars/ele-ymir.yml
@@ -53,6 +53,10 @@ apt_repo_components:
- universe
- multiverse
+spreadspace_apt_repo_components:
+ - main
+ - prometheus
+
base_modules_blacklist: "{{ base_modules_blacklist_all_but_sound }}"
admin_users_host:
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 7bd944f6..1a6c28e6 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -460,6 +460,8 @@ ele-router-emc
ele-router-orpheum
ele-thetys
ele-jitsi
+ele-hyperion
+ele-ymir
[promzone-elevate-festival:children]
ele-ap
ele-ups