4e97d8e5dc
All checks were successful
PR build (required check) / changes (pull_request) Successful in 6s
secrets-guard / encrypted (pull_request) Successful in 5s
PR build (required check) / build-backend (pull_request) Has been skipped
shell-lint / shellcheck (pull_request) Successful in 7s
PR build (required check) / build-frontend (pull_request) Has been skipped
PR build (required check) / validate-observability (pull_request) Successful in 18s
PR build (required check) / gate (pull_request) Successful in 2s
Environments stop being machines. Until now each box WAS an environment --
"beta" named both a deploy target and a host, "the desktop" named both the
operator's computer and the dev server -- so every path could assume one
environment per host and hardcode /opt/thermograph, /etc/thermograph.env and
ports 8137/8080. That assumption ends here:
vps1 75.119.132.91 Forgejo, Grafana/Loki, the portfolio site, and DEV
(own Postgres, mesh-only on 10.10.0.2:8137)
vps2 169.58.46.181 PROD and BETA as two Swarm stacks sharing one
TimescaleDB instance, plus Centralis, Postfix, backups
desktop AI model hosting + flex Swarm capacity, no environment
Nothing live has moved; the ordered cutover is in
infra/deploy/RUNBOOK-vps1-vps2-cutover.md.
deploy/env-topology.sh is the single source of truth: env -> host, checkout,
branch, deploy mode, stack name, env file, LB ports, DB role/database, service
prefix. THERMOGRAPH_ENV is the input, and on vps2 it is the only thing
distinguishing a beta deploy from a prod one -- deploy.sh refuses to run when it
disagrees with the checkout it was invoked from. The host-wide secrets-env and
deploy-mode markers survive only as a fallback for a single-environment box.
Beta gets its own stack file rather than an overlay (a merge cannot REMOVE the
db service, and beta having no database of its own is the point). Its services
are prefixed beta-*: Swarm registers a service's short name as a DNS alias on
every network it joins, so two stacks both calling a service `web` on the shared
data network would let prod's frontend resolve a beta task. Prod's stack, env
and LB config are untouched.
One Postgres, two databases with two roles: deploy/db/provision-env-db.sh
creates thermograph_beta (NOSUPERUSER, owns only its own database, CONNECT
revoked from PUBLIC) plus a <role>_ro for ad-hoc queries, and refuses to run for
the environment that owns the instance -- doing so would demote prod's bootstrap
superuser.
Fixes that co-residency would otherwise have broken silently:
- CI secrets are keyed by host (VPS1_SSH_*, VPS2_SSH_*). SSH_* meant "beta" and
also "the Forgejo box" because those shared a machine; that conflation is what
once had the prod backup dumping beta.
- The nightly backup dumps BOTH application databases to separate off-box
prefixes, and fails loudly on a missing one instead of skipping it.
- Alloy stopped deriving the `host` label from the node -- on vps2 that would
have filed every beta line as prod, feeding prod's alert rules with beta's
traffic. It is now derived per source, with a new `node` label for the machine,
and beta's log volume is mounted via a vps2-only overlay.
- ops/dbq.sh, ops/iceberg.sh and the secrets seed scripts derived their SSH
target and env-file path from the topology instead of hardcoding beta to
75.119.132.91 -- which is vps1's address now.
- Dev's overlay binds DEV_BIND_ADDR (loopback by default, the mesh address on
vps1) instead of 0.0.0.0: correct for a home LAN box, a public exposure of
unreviewed branches on a VPS.
Terraform's hosts variable is keyed by machine with a nested environments map,
and main.tf flattens (host, environment) pairs so two environments on one box
cannot share a checkout. Caddy's single reference config is split per host.
Docs, onboarding and the runbooks are updated throughout, including the security
rationales that co-residency makes false: separate SSH credentials no longer put
a host boundary between beta and prod, and the boundary that remains is the
database and the filesystem.
71 lines
3.5 KiB
YAML
71 lines
3.5 KiB
YAML
# The Alloy log-collector agent. Runs on EACH node (vps1, vps2) — one per node
|
|
# — reading that node's Docker containers, Caddy logs, and the app's JSON logs,
|
|
# and shipping them to the central Loki on vps1 over the mesh.
|
|
#
|
|
# Per-node config comes from the environment (an .env file next to this, or
|
|
# exported before `up`):
|
|
# ALLOY_NODE the MACHINE: vps1 | vps2 | desktop
|
|
# ALLOY_ENV the default ENVIRONMENT label for logs on this node that
|
|
# aren't attributable to a specific stack (Forgejo, Grafana,
|
|
# the portfolio site): vps1 -> dev, vps2 -> prod
|
|
# APPLOGS_VOLUME this node's primary applogs volume
|
|
# LOKI_URL push endpoint. All nodes push over the mesh:
|
|
# http://10.10.0.2:3100/loki/api/v1/push
|
|
#
|
|
# Deploy on vps1 (dev + Forgejo + the monitoring stack itself):
|
|
# ALLOY_NODE=vps1 ALLOY_ENV=dev APPLOGS_VOLUME=thermograph-dev_applogs \
|
|
# LOKI_URL=http://10.10.0.2:3100/loki/api/v1/push \
|
|
# docker compose -f docker-compose.agent.yml up -d
|
|
#
|
|
# Deploy on vps2 (prod + beta) — note the SECOND file, which adds beta's log
|
|
# volume:
|
|
# ALLOY_NODE=vps2 ALLOY_ENV=prod APPLOGS_VOLUME=thermograph_applogs \
|
|
# BETA_APPLOGS_VOLUME=thermograph-beta_applogs \
|
|
# LOKI_URL=http://10.10.0.2:3100/loki/api/v1/push \
|
|
# docker compose -f docker-compose.agent.yml -f docker-compose.agent.beta.yml up -d
|
|
#
|
|
# WHY THE VOLUME NAME IS A VARIABLE NOW, AND WHY BETA IS AN OVERLAY. The name
|
|
# used to be the literal `thermograph_applogs`, with a comment telling you to
|
|
# hand-edit two lines on the dev node. That was survivable while one node ran
|
|
# one environment. vps2 runs two, each with its own applogs volume, and a single
|
|
# hardcoded mount there would ship one environment's structured logs and
|
|
# silently drop the other's.
|
|
#
|
|
# Beta's mount is a separate overlay file rather than a second variable in this
|
|
# one because the second mount is labelled host="beta" unconditionally. Pointing
|
|
# it at dev's volume on vps1 just to satisfy compose would ship every dev log
|
|
# line a second time labelled as beta — inventing an environment's worth of
|
|
# fake data on a box beta does not run on.
|
|
|
|
services:
|
|
alloy:
|
|
image: grafana/alloy:v1.9.1
|
|
command:
|
|
- run
|
|
- /etc/alloy/config.alloy
|
|
- --storage.path=/var/lib/alloy/data
|
|
- --server.http.listen-addr=0.0.0.0:12345
|
|
environment:
|
|
ALLOY_NODE: ${ALLOY_NODE:?set ALLOY_NODE (vps1|vps2|desktop) — the MACHINE}
|
|
ALLOY_ENV: ${ALLOY_ENV:?set ALLOY_ENV (dev|beta|prod) — this node's default environment label}
|
|
LOKI_URL: ${LOKI_URL:?set LOKI_URL}
|
|
volumes:
|
|
- ./config.alloy:/etc/alloy/config.alloy:ro
|
|
# Read-only Docker socket: discover + tail every container's stdout/stderr.
|
|
- /var/run/docker.sock:/var/run/docker.sock:ro
|
|
# Caddy's host access logs (runs on the host, not a container).
|
|
- /var/log/caddy:/var/log/caddy:ro
|
|
# The app's structured JSON logs, straight off its named volume.
|
|
- applogs:/applogs:ro
|
|
- alloy_data:/var/lib/alloy/data
|
|
restart: unless-stopped
|
|
|
|
volumes:
|
|
# The app's existing log volume (created by the app's own stack). external:true
|
|
# means compose references it, never creates or deletes it. The NAME varies by
|
|
# node — see the header — while the mount path stays /applogs, which is what
|
|
# lets one config.alloy serve every node.
|
|
applogs:
|
|
external: true
|
|
name: ${APPLOGS_VOLUME:?set APPLOGS_VOLUME (e.g. thermograph_applogs on vps2, thermograph-dev_applogs on vps1)}
|
|
alloy_data: {}
|