Merge pull request #329 from trails-cool/deploy-no-502-and-fix-annotation

Stop caddy-502-rate alert firing on every deploy

.github/workflows/cd-apps.yml

@@ -115,8 +115,16 @@ jobs:
             docker image prune -af
             docker compose ps
 
-            # Annotate deploy in Grafana
+            # Annotate deploy in Grafana. GRAFANA_SERVICE_TOKEN lives
-            GRAFANA_TOKEN=$(grep GRAFANA_SERVICE_TOKEN .env | cut -d= -f2- 2>/dev/null)
+            # in secrets.infra.env (decrypted by cd-infra.yml into the
+            # merged /opt/trails-cool/.env on the server). cd-apps's
+            # own app.env intentionally does NOT carry it — apps don't
+            # need it at runtime. So we read from the merged `.env`
+            # that cd-infra populated. If cd-infra has never run on
+            # this host, .env may not exist; the `2>/dev/null` and
+            # the `if -n` guard make the annotation a silent no-op
+            # rather than a deploy failure in that case.
+            GRAFANA_TOKEN=$(grep GRAFANA_SERVICE_TOKEN .env 2>/dev/null | cut -d= -f2-)
             if [ -n "$GRAFANA_TOKEN" ]; then
               docker compose exec -T grafana curl -sf -X POST \
                 -H "Authorization: Bearer $GRAFANA_TOKEN" \

infrastructure/Caddyfile

@@ -28,7 +28,17 @@
 		output stdout
 		format json
 	}
-	reverse_proxy journal:3000
+	reverse_proxy journal:3000 {
+		# During an `apps` deploy the journal container is briefly down
+		# (~10–30s) while compose swaps containers. Without these,
+		# Caddy returns 502 immediately and the `caddy-502-rate` alert
+		# trips on every deploy. With them, Caddy holds and retries
+		# against the upstream for up to 30s — restart becomes
+		# invisible to clients. A real outage longer than 30s still
+		# 502s and correctly trips the alert.
+		lb_try_duration 30s
+		lb_try_interval 250ms
+	}
 }
 
 www.{$DOMAIN:trails.cool} {
@@ -53,5 +63,9 @@ planner.{$DOMAIN:trails.cool} {
 		output stdout
 		format json
 	}
-	reverse_proxy planner:3001
+	reverse_proxy planner:3001 {
+		# Same rationale as the journal block — see the comment there.
+		lb_try_duration 30s
+		lb_try_interval 250ms
+	}
 }

infrastructure/grafana/provisioning/alerting/alerts.yml

@@ -206,6 +206,12 @@ groups:
         annotations:
           summary: "BRouter host metrics scrape has been failing for 2+ minutes — the dedicated host, vSwitch, or cAdvisor may be down"
 
+      # The threshold here is intentionally `> 0` for 2m — *any*
+      # sustained 502 stream is real. Deploy-time restarts no longer
+      # produce 502s thanks to `lb_try_duration` on Caddy's reverse
+      # proxy (see `infrastructure/Caddyfile`); if 502s appear here
+      # it means the upstream has been unreachable for longer than
+      # Caddy's retry window, which is a genuine outage.
       - uid: caddy-502-rate
         title: Caddy 502 errors detected
         condition: B