summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2022-03-23 16:36:48 +0100
committerChristian Pointner <equinox@spreadspace.org>2022-03-23 16:36:48 +0100
commit9a132530bf0d161cec8b8f329a7213f5873ab163 (patch)
treeb3bc7c273f4b01904462c8663a52e67f38a993e3
parentprometheus: upgrade all the packages (diff)
alertmanager config improvements
-rw-r--r--inventory/host_vars/ch-mon.yml4
-rw-r--r--roles/monitoring/prometheus/alertmanager/tasks/main.yml1
2 files changed, 5 insertions, 0 deletions
diff --git a/inventory/host_vars/ch-mon.yml b/inventory/host_vars/ch-mon.yml
index 47ce828e..75f5caab 100644
--- a/inventory/host_vars/ch-mon.yml
+++ b/inventory/host_vars/ch-mon.yml
@@ -161,6 +161,10 @@ prometheus_alertmanager_auth_users:
prometheus_alertmanager_route:
receiver: equinox
+ matchers:
+ - 'alertname != PrometheusAlertmanagerE2eDeadManSwitch'
+ group_by:
+ - instance
prometheus_alertmanager_receivers:
- name: equinox
diff --git a/roles/monitoring/prometheus/alertmanager/tasks/main.yml b/roles/monitoring/prometheus/alertmanager/tasks/main.yml
index fda71151..e4670f74 100644
--- a/roles/monitoring/prometheus/alertmanager/tasks/main.yml
+++ b/roles/monitoring/prometheus/alertmanager/tasks/main.yml
@@ -46,6 +46,7 @@
template:
src: alertmanager.yml.j2
dest: /etc/prometheus/alertmanager.yml
+ validate: "amtool check-config %s"
notify: reload prometheus-alertmanager
- name: generate web configuration file