From f75e2a8d5ffc5eda4e268248a977f0df7da852d0 Mon Sep 17 00:00:00 2001 From: "Rasmus \"Pez\" Wejlgaard" Date: Fri, 3 Apr 2026 02:49:37 +0100 Subject: [PATCH] remove alertmanager caddyfile entry and clean up references (#42) alerting is handled by grafana, not alertmanager. removed the stale reverse proxy block from caddyfile template and updated caddy + prometheus docs to reflect grafana-only alerting. --- ansible/services/caddy/Caddyfile.template | 6 ------ ansible/services/caddy/README.md | 3 +-- ansible/services/prometheus/README.md | 3 +-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/ansible/services/caddy/Caddyfile.template b/ansible/services/caddy/Caddyfile.template index 7fe093b..dfd6a49 100644 --- a/ansible/services/caddy/Caddyfile.template +++ b/ansible/services/caddy/Caddyfile.template @@ -42,12 +42,6 @@ prometheus.{{DOMAIN_ALT}}, prometheus.{{DOMAIN_PRIMARY}} { reverse_proxy {{LONDON_A_IP}}:9090 } -# Alertmanager -alertmanager.{{DOMAIN_ALT}}, alertmanager.{{DOMAIN_PRIMARY}} { - import authelia - reverse_proxy {{LONDON_A_IP}}:9093 -} - ## LONDON-B SERVICES ## # Jellyfin (no auth — has its own login) diff --git a/ansible/services/caddy/README.md b/ansible/services/caddy/README.md index 770e48c..29770ee 100644 --- a/ansible/services/caddy/README.md +++ b/ansible/services/caddy/README.md @@ -77,7 +77,7 @@ forward_auth localhost:9091 { | Service | Auth | Reason | |---------|------|--------| -| Grafana, Prometheus, Alertmanager | Authelia | Admin dashboards | +| Grafana, Prometheus | Authelia | Admin dashboards | | Radarr, Sonarr, Lidarr, Readarr | Authelia | Media management | | Prowlarr, Transmission (download) | Authelia | Download tools | | slskd (Soulseek) | Authelia | P2P client | @@ -124,6 +124,5 @@ The `Caddyfile.template` replaces hardcoded values with placeholders: - The live Caddyfile on helsinki-a is at `/etc/caddy/Caddyfile` - Caddy auto-provisions TLS certificates for all listed domains -- The Alertmanager proxy currently points to port 3000 (same as Grafana) — this may be intentional (Grafana's built-in alerting UI) or a copy-paste issue worth checking - Commented-out WebDAV block was replaced by the Nextcloud AIO reverse proxy - Static sites (`pez.sh`, `pez.solutions`, etc.) are served from `/srv/` on helsinki-a diff --git a/ansible/services/prometheus/README.md b/ansible/services/prometheus/README.md index 77ca1bb..9e10971 100644 --- a/ansible/services/prometheus/README.md +++ b/ansible/services/prometheus/README.md @@ -34,11 +34,10 @@ Runs on **london-a** (FreeBSD, 100.122.219.41). ### `rules/node-exporter.rules` -Sourced from pez-ansible. Currently all rules are **commented out** — only a placeholder `ServerRunningBtrfs` alert exists (disabled). No active alerting rules or Alertmanager configured. +Sourced from pez-ansible. Currently all rules are **commented out** — only a placeholder `ServerRunningBtrfs` alert exists (disabled). No active alerting rules loaded by Prometheus. Alerting is handled exclusively by **Grafana** (not Alertmanager). ## What's Not Configured -- **Alertmanager** — target is commented out; no alerting pipeline active - **Rule files** — referenced lines in `prometheus.yml` are commented out (rules exist in `rules/` but aren't loaded) - **Recording rules** — none