summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-08-10 23:43:35 +0200
committerChristian Pointner <equinox@spreadspace.org>2022-08-10 23:43:35 +0200
commitba3f1c6e13c83fb5ea98f68de76a4f297535f2ae (patch)
treef50338944dd18880360fc3ddb9f3d5d9b82e014d
parentele-helene: create zfs pool for recording disk (diff)
prometheus/chaos-at-home: upgrade prometeus and exporter
-rw-r--r--inventory/group_vars/promzone-chaos-at-home/vars.yml10
-rw-r--r--inventory/host_vars/ch-mon.yml17
-rw-r--r--inventory/host_vars/ele-calypso.yml1
3 files changed, 16 insertions, 12 deletions
diff --git a/inventory/group_vars/promzone-chaos-at-home/vars.yml b/inventory/group_vars/promzone-chaos-at-home/vars.yml
index bec3f4a0..eb76930a 100644
--- a/inventory/group_vars/promzone-chaos-at-home/vars.yml
+++ b/inventory/group_vars/promzone-chaos-at-home/vars.yml
@@ -6,13 +6,13 @@ prometheus_exporters_default:
- node
prometheus_exporter_node_version: 1.3.1
-prometheus_exporter_ipmi_version: 1.5.1
-prometheus_exporter_ssl_version: 2.4.0
-prometheus_exporter_blackbox_version: 0.20.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_server_version: 2.32.1
-prometheus_alertmanager_version: 0.23.0
+prometheus_server_version: 2.36.2
+prometheus_alertmanager_version: 0.24.0
prometheus_server: ch-mon
prometheus_server_jobs:
diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml
index ae3b823a..27f56f5d 100644
--- a/inventory/host_vars/ch-mon.yml
+++ b/inventory/host_vars/ch-mon.yml
@@ -141,17 +141,20 @@ prometheus_alertmanager_auth_users:
admin: "{{ vault_prometheus_alertmanager_auth_user_passwords['admin'] }}"
prometheus_alertmanager_route:
- receiver: equinox
- matchers:
- - 'alertname != PrometheusAlertmanagerE2eDeadManSwitch'
- group_by:
- - instance
+ receiver: empty
+ routes:
+ - receiver: equinox-mail
+ matchers:
+ - 'alertname != PrometheusAlertmanagerE2eDeadManSwitch'
+ group_by:
+ - instance
prometheus_alertmanager_receivers:
- - name: equinox
+ - name: empty
+ - name: equinox-mail
email_configs:
- to: equinox@chaos-at-home.org
- send_resolved: true
+ send_resolved: yes
grafana_secret_key: "{{ vault_grafana_secret_key }}"
diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml
index f5498ea9..eff3d767 100644
--- a/inventory/host_vars/ele-calypso.yml
+++ b/inventory/host_vars/ele-calypso.yml
@@ -142,6 +142,7 @@ prometheus_alertmanager_receivers:
- name: equinox-mail
email_configs:
- to: equinox@spreadspace.org
+ send_resolved: yes
- name: equinox-sms
webhook_configs:
- url: "http://127.0.0.1:9876/alert"