From 2ecfe81c08853e6b2607b9677be7eabec196f584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ullrich=20Sch=C3=A4fer?= Date: Fri, 27 Mar 2026 13:53:56 +0100 Subject: [PATCH 1/2] Pass Grafana env vars to Caddy container, fix Loki compactor config - Add DOMAIN, GRAFANA_USER, GRAFANA_PASSWORD_HASH as environment vars on the Caddy container so Caddyfile can reference them - Fix Loki compactor: add delete_request_store required when retention is enabled Co-Authored-By: Claude Opus 4.6 (1M context) --- infrastructure/docker-compose.yml | 4 ++++ infrastructure/loki/loki-config.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/infrastructure/docker-compose.yml b/infrastructure/docker-compose.yml index e58658c..e32352d 100644 --- a/infrastructure/docker-compose.yml +++ b/infrastructure/docker-compose.yml @@ -6,6 +6,10 @@ services: - "80:80" - "443:443" - "443:443/udp" + environment: + DOMAIN: ${DOMAIN:-trails.cool} + GRAFANA_USER: ${GRAFANA_USER:-admin} + GRAFANA_PASSWORD_HASH: ${GRAFANA_PASSWORD_HASH:-} volumes: - ./Caddyfile:/etc/caddy/Caddyfile:ro - caddy_data:/data diff --git a/infrastructure/loki/loki-config.yml b/infrastructure/loki/loki-config.yml index 44810c0..988ca32 100644 --- a/infrastructure/loki/loki-config.yml +++ b/infrastructure/loki/loki-config.yml @@ -30,3 +30,4 @@ limits_config: compactor: working_directory: /loki/compactor retention_enabled: true + delete_request_store: filesystem From ed33fcf9aef8e3f606ff716909b728769c75818a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ullrich=20Sch=C3=A4fer?= Date: Fri, 27 Mar 2026 13:55:09 +0100 Subject: [PATCH 2/2] Deploy monitoring configs (Prometheus, Loki, Grafana) via CD Add prometheus.yml, loki-config.yml, and grafana provisioning/dashboards to the SCP step so they're copied to the server on each deploy. Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 680ae3e..89b8a91 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -79,7 +79,7 @@ jobs: host: ${{ secrets.DEPLOY_HOST }} username: root key: ${{ secrets.DEPLOY_SSH_KEY }} - source: "infrastructure/docker-compose.yml,infrastructure/Caddyfile" + source: "infrastructure/docker-compose.yml,infrastructure/Caddyfile,infrastructure/prometheus/prometheus.yml,infrastructure/loki/loki-config.yml,infrastructure/grafana/provisioning,infrastructure/grafana/dashboards" target: /opt/trails-cool strip_components: 1