From 61edc3587f65995b8236d2f71e4e7a098e2a9a18 Mon Sep 17 00:00:00 2001 From: June Date: Wed, 2 Oct 2024 03:43:22 +0200 Subject: [PATCH 1/2] alertmanager: give Alertmanager a persistent storage directory --- playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2 b/playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2 index 212a9f9..3e994dc 100644 --- a/playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2 +++ b/playbooks/templates/chaosknoten/configs/grafana/compose.yaml.j2 @@ -25,6 +25,7 @@ services: volumes: - ./configs/alertmanager.yaml:/etc/alertmanager/alertmanager.yaml - ./configs/alertmanager_alert_templates.tmpl:/etc/alertmanager/templates/alert_templates.tmpl + - alertmanager_data:/alertmanager grafana: image: grafana/grafana @@ -57,3 +58,4 @@ services: volumes: graf_data: {} prom_data: {} + alertmanager_data: {} From 2e29b78f6ac3a782becbff80c8621f7b2bea50e0 Mon Sep 17 00:00:00 2001 From: June Date: Wed, 2 Oct 2024 03:45:56 +0200 Subject: [PATCH 2/2] prometheus: move Jitsis node exporter target to hosts job --- .../chaosknoten/configs/grafana/docker_compose/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml b/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml index bdb9a20..b50b0df 100644 --- a/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml +++ b/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml @@ -57,7 +57,6 @@ scrape_configs: scheme: http static_configs: - targets: - - jitsi.hamburg.ccc.de:9100 # Node Exporter - jitsi.hamburg.ccc.de:9888 # Jitsi Video Bridge - job_name: chaosknoten honor_timestamps: true @@ -101,3 +100,4 @@ scrape_configs: - mjolnir-intern.hamburg.ccc.de:9100 - woodpecker-intern.hamburg.ccc.de:9100 - penpot-intern.hamburg.ccc.de:9100 + - jitsi.hamburg.ccc.de:9100