Reconcile upstream into CT116 production state #1

Merged
abiba-bot merged 9 commits from sync/ct116-reconcile-20260912-095913 into main 2026-09-12 10:23:05 +00:00
2 changed files with 12 additions and 17 deletions
Showing only changes of commit 8afe94a7a9 - Show all commits
+9 -8
View File
@@ -25,7 +25,7 @@ services:
environment:
- POSTGRES_DB=litellm
- POSTGRES_USER=litellm
- POSTGRES_PASSWORD=d9fc143e3dc1a7a8e672c359fea95c5e
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
volumes:
- pgdata:/var/lib/postgresql/data
healthcheck:
@@ -47,19 +47,19 @@ services:
environment:
- PROMETHEUS_EXPORTER=true
- ENFORCE_PRISMA_MIGRATION_CHECK=true
- LITELLM_MASTER_KEY=sk-litellm-7f96080dd99b15c36bd4b333b58a6796
- DATABASE_URL=postgresql://litellm:d9fc143e3dc1a7a8e672c359fea95c5e@postgres:5432/litellm
- LITELLM_MASTER_KEY=${LITELLM_MASTER_KEY}
- DATABASE_URL=postgresql://litellm:${POSTGRES_PASSWORD}@postgres:5432/litellm
- STORE_MODEL_IN_DB=True
- LITELLM_UI_USERNAME=admin
- LITELLM_UI_PASSWORD=syslog-admin-2026
- LITELLM_UI_PASSWORD=${LITELLM_UI_PASSWORD}
- UI_USERNAME=admin
- UI_PASSWORD=syslog-admin-2026
- OPENAI_API_KEY=not-used
- UI_PASSWORD=${UI_PASSWORD}
- OPENAI_API_KEY=${OPENAI_API_KEY}
- PROXY_BASE_URL=https://litellm.sysloggh.net
- DOCS_URL=/docs
- ANTHROPIC_API_KEY=not-used
- ANTHROPIC_API_KEY=${ANTHROPIC_API_KEY}
- GENERIC_CLIENT_ID=FHd7bs9dP5gHad2Ki23iUL5kQvFa0GRaj3nlLnNU
- GENERIC_CLIENT_SECRET=aDkXQx82duqpxc98xxqp0quzzUf1mawsnOTqj7sx1acaS7rWSt02N5ksBCi92n8ZilRavigoYME6fLakP20Ixc9H2pxnSZFiOqQLb7BPi8UtsvfxmzXklD0HJIdbKFxe
- GENERIC_CLIENT_SECRET=${GENERIC_CLIENT_SECRET}
- GENERIC_AUTHORIZATION_ENDPOINT=https://auth.sysloggh.net/application/o/authorize/
- GENERIC_TOKEN_ENDPOINT=http://harness-nginx/application/o/token/
- GENERIC_USERINFO_ENDPOINT=http://harness-nginx/application/o/userinfo/
@@ -76,6 +76,7 @@ services:
interval: 15s
timeout: 5s
retries: 3
start_period: 120s
depends_on:
postgres:
condition: service_healthy
+3 -9
View File
@@ -142,19 +142,13 @@ proxy_read_timeout 600s;
proxy_set_header Host $host;
}
# ── Router paths — deprecated, redirect to equivalents ──
location /router/ {
return 301 /litellm/;
}
# ---- Legacy /health/unified alias (harness-router decommissioned) ----
# Retained intentionally: 5+ live GPU monitor contracts poll
# this path every 15s and follow the 301 to /gpu/gpu-data.
location /health/unified {
return 301 /gpu/gpu-data;
}
location /metrics/circuit-breaker {
return 410;
}
# ── Health: no-auth LiteLLM liveliness ──
location /health {
proxy_pass $litellm_backend_url/health/liveliness;