From 29d2d2926f187f7b90b932b576c299e0c24aba51 Mon Sep 17 00:00:00 2001 From: June Date: Tue, 1 Oct 2024 01:59:33 +0200 Subject: [PATCH 1/2] prometheus: don't duplicate scrape interval and timeout --- .../chaosknoten/configs/grafana/docker_compose/prometheus.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml b/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml index c7905b9..69d734c 100644 --- a/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml +++ b/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml @@ -12,8 +12,6 @@ alerting: scrape_configs: - job_name: prometheus honor_timestamps: true - scrape_interval: 15s - scrape_timeout: 10s metrics_path: /metrics scheme: http static_configs: From 803b19de0a24bd4cd8c209b51cbb25fb772bb0ce Mon Sep 17 00:00:00 2001 From: June Date: Tue, 1 Oct 2024 20:09:42 +0200 Subject: [PATCH 2/2] prometheus: add job for node exporter (for the NixOS VMs for now) --- .../grafana/docker_compose/prometheus.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml b/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml index 69d734c..8a5faa7 100644 --- a/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml +++ b/playbooks/files/chaosknoten/configs/grafana/docker_compose/prometheus.yml @@ -79,3 +79,20 @@ scrape_configs: target_label: instance - target_label: __address__ replacement: pve-exporter:9221 +- job_name: hosts + static_configs: + - labels: + site: wieske + type: virtual_machine + hypervisor: chaosknoten + targets: + - netbox-intern.hamburg.ccc.de:9100 + - matrix-intern.hamburg.ccc.de:9100 + - public-web-static-intern.hamburg.ccc.de:9100 + - git-intern.hamburg.ccc.de:9100 + - forgejo-actions-runner-intern.hamburg.ccc.de:9100 + - eh22-wiki-intern.hamburg.ccc.de:9100 + - nix-box-june-intern.hamburg.ccc.de:9100 + - mjolnir-intern.hamburg.ccc.de:9100 + - woodpecker-intern.hamburg.ccc.de:9100 + - penpot-intern.hamburg.ccc.de:9100