fix(obs): make Postgres host configurable and fix PORT_GRAFANA default
All checks were successful
CI / Unit & Component Tests (pull_request) Successful in 3m6s
CI / OCR Service Tests (pull_request) Successful in 19s
CI / Backend Unit Tests (pull_request) Successful in 2m43s
CI / fail2ban Regex (pull_request) Successful in 39s
CI / Compose Bucket Idempotency (pull_request) Successful in 59s
All checks were successful
CI / Unit & Component Tests (pull_request) Successful in 3m6s
CI / OCR Service Tests (pull_request) Successful in 19s
CI / Backend Unit Tests (pull_request) Successful in 2m43s
CI / fail2ban Regex (pull_request) Successful in 39s
CI / Compose Bucket Idempotency (pull_request) Successful in 59s
POSTGRES_HOST variable (default: archive-db) lets the observability stack connect to a different Postgres container — needed when only the staging stack is running (container name: archiv-staging-db-1). PORT_GRAFANA default changed from 3001 to 3003 to avoid collision with the staging frontend which occupies 3001. Closes #601 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -142,7 +142,7 @@ services:
|
|||||||
container_name: obs-grafana
|
container_name: obs-grafana
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- "127.0.0.1:${PORT_GRAFANA:-3001}:3000"
|
- "127.0.0.1:${PORT_GRAFANA:-3003}:3000"
|
||||||
environment:
|
environment:
|
||||||
GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_ADMIN_PASSWORD:-changeme}
|
GF_SECURITY_ADMIN_PASSWORD: ${GRAFANA_ADMIN_PASSWORD:-changeme}
|
||||||
GF_USERS_ALLOW_SIGN_UP: "false"
|
GF_USERS_ALLOW_SIGN_UP: "false"
|
||||||
@@ -193,7 +193,7 @@ services:
|
|||||||
obs-glitchtip-db-init:
|
obs-glitchtip-db-init:
|
||||||
condition: service_completed_successfully
|
condition: service_completed_successfully
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@archive-db:5432/glitchtip
|
DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST:-archive-db}:5432/glitchtip
|
||||||
REDIS_URL: redis://obs-redis:6379/0
|
REDIS_URL: redis://obs-redis:6379/0
|
||||||
SECRET_KEY: ${GLITCHTIP_SECRET_KEY}
|
SECRET_KEY: ${GLITCHTIP_SECRET_KEY}
|
||||||
GLITCHTIP_DOMAIN: ${GLITCHTIP_DOMAIN:-http://localhost:3002}
|
GLITCHTIP_DOMAIN: ${GLITCHTIP_DOMAIN:-http://localhost:3002}
|
||||||
@@ -215,7 +215,7 @@ services:
|
|||||||
obs-redis:
|
obs-redis:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
environment:
|
environment:
|
||||||
DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@archive-db:5432/glitchtip
|
DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST:-archive-db}:5432/glitchtip
|
||||||
REDIS_URL: redis://obs-redis:6379/0
|
REDIS_URL: redis://obs-redis:6379/0
|
||||||
SECRET_KEY: ${GLITCHTIP_SECRET_KEY}
|
SECRET_KEY: ${GLITCHTIP_SECRET_KEY}
|
||||||
networks:
|
networks:
|
||||||
@@ -229,10 +229,10 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
PGPASSWORD: ${POSTGRES_PASSWORD}
|
PGPASSWORD: ${POSTGRES_PASSWORD}
|
||||||
command: >
|
command: >
|
||||||
sh -c "psql -h archive-db -U ${POSTGRES_USER} -tc
|
sh -c "psql -h ${POSTGRES_HOST:-archive-db} -U ${POSTGRES_USER} -tc
|
||||||
\"SELECT 1 FROM pg_database WHERE datname = 'glitchtip'\" |
|
\"SELECT 1 FROM pg_database WHERE datname = 'glitchtip'\" |
|
||||||
grep -q 1 ||
|
grep -q 1 ||
|
||||||
psql -h archive-db -U ${POSTGRES_USER} -c \"CREATE DATABASE glitchtip;\""
|
psql -h ${POSTGRES_HOST:-archive-db} -U ${POSTGRES_USER} -c \"CREATE DATABASE glitchtip;\""
|
||||||
networks:
|
networks:
|
||||||
- archiv-net
|
- archiv-net
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user