p3 variables first pass

This commit is contained in:
admin 2026-01-31 15:45:57 -07:00
parent fa781b5982
commit 9f070ee036
3 changed files with 19 additions and 33 deletions

View file

@ -11,21 +11,7 @@ services:
- /var/lib/docker:/var/lib/docker:ro
command:
- --docker_only
- --store_container_labels=true
- --store_container_labels=${CADVISOR_STORE_LABELS}
environment:
- TZ=America/Edmonton
restart: unless-stopped
grafana:
image: grafana/grafana:latest
container_name: grafana
ports:
- "2999:3000"
volumes:
- /docker/monitoring/grafana:/etc/grafana
- /docker/monitoring/grafana-db:/var/lib/grafana
environment:
- GF_SECURITY_ADMIN_USER=admin
- GF_SECURITY_ADMIN_PASSWORD=changeme
user: "1000:1000"
restart: unless-stopped

View file

@ -5,22 +5,22 @@ services:
user: "1000:1000"
restart: always
environment:
- GF_SECURITY_ADMIN_USER=admin
- GF_SECURITY_ADMIN_PASSWORD=changeme
- GF_DATABASE_TYPE=mysql
- GF_DATABASE_HOST=172.16.201.208
- GF_DATABASE_PORT=3306
- GF_DATABASE_NAME=grafana
- GF_DATABASE_USER=grafana_user
- GF_DATABASE_PASSWORD=apts22$$$$
- GF_DATABASE_MAX_IDLE_CONN=3
- GF_DATABASE_CONN_MAX_LIFETIME=14400
- GF_EXTERNAL_IMAGE_STORAGE_PROVIDER=s3
- GF_EXTERNAL_IMAGE_STORAGE_S3_BUCKET=grafana
- GF_EXTERNAL_IMAGE_STORAGE_S3_REGION=us-east-1
- GF_EXTERNAL_IMAGE_STORAGE_S3_ENDPOINT=http://172.16.201.208:9000
- GF_EXTERNAL_IMAGE_STORAGE_S3_ACCESS_KEY=admin
- GF_EXTERNAL_IMAGE_STORAGE_S3_SECRET_KEY=Pizzajam11
- GF_SECURITY_ADMIN_USER=${GF_USER_NAME}
- GF_SECURITY_ADMIN_PASSWORD=${GF_USER_PASS}
- GF_DATABASE_TYPE=${GF_DB_TYPE}
- GF_DATABASE_HOST=${GF_DB_HOST}
- GF_DATABASE_PORT=${GF_DB_PORT}
- GF_DATABASE_NAME=${GF_DB_NAME}
- GF_DATABASE_USER=${GF_DB_USER}
- GF_DATABASE_PASSWORD=${GF_DB_PASS}
- GF_DATABASE_MAX_IDLE_CONN=${GF_DB_IDLE}
- GF_DATABASE_CONN_MAX_LIFETIME=${GF_DB_CONN}
- GF_EXTERNAL_IMAGE_STORAGE_PROVIDER=${GF_STOR_PROVIDER}
- GF_EXTERNAL_IMAGE_STORAGE_S3_BUCKET=${GF_S3_BUCKET}
- GF_EXTERNAL_IMAGE_STORAGE_S3_REGION=${GF_S3_REGION}
- GF_EXTERNAL_IMAGE_STORAGE_S3_ENDPOINT=${GF_S3_ENDPOINT}
- GF_EXTERNAL_IMAGE_STORAGE_S3_ACCESS_KEY=${S3_KEY}
- GF_EXTERNAL_IMAGE_STORAGE_S3_SECRET_KEY=${S3_SECRET}
volumes:
- ./grafana:/etc/grafana
- ./grafana-db:/var/lib/grafana

View file

@ -21,11 +21,11 @@ services:
container_name: thanos-sidecar
user: "1000:1000"
environment:
- OBJSTORE_CONFIG={"type":"S3","config":{"bucket":"prometheus","endpoint":"172.16.201.208:9000","access_key":"your_key","secret_key":"your_secret","insecure":true}}
- OBJSTORE_CONFIG={"type":"${THANOS_STOR_TYPE}","config":{"bucket":"THANOS_S3_BUCKET","endpoint":"$THANOS_S3_ENDPOINT","access_key":"${S3_KEY}","secret_key":"${S3_SECRET}","insecure":${THANOS_S3_INSECURE}}}
command:
- 'sidecar'
- '--tsdb.path=/prometheus'
- '--prometheus.url=http://prometheus:9090'
- '--prometheus.url=$PROMETHEUS_URL'
- '--objstore.config=$$(OBJSTORE_CONFIG)'
volumes:
- /docker/monitoring/prometheus/data:/prometheus