IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove old fields and expose ports (#45626)

Browse Source
This commit is contained in:
Will Browne 2022-02-21 16:52:38 +01:00 committed by GitHub
parent b6682cdcb9
commit 4e23b06b40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devenv/docker/ha_test/docker-compose.yaml
View File

@ -24,7 +24,7 @@ services:
MYSQL_PASSWORD: password MYSQL_PASSWORD: password
command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb_monitor_enable=all, --max-connections=1001] command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb_monitor_enable=all, --max-connections=1001]
ports: ports:
- 3306 - "3306:3306"
healthcheck: healthcheck:
test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
timeout: 10s timeout: 10s
@ -47,7 +47,7 @@ services:
# POSTGRES_USER: grafana # POSTGRES_USER: grafana
# POSTGRES_PASSWORD: password # POSTGRES_PASSWORD: password
# ports: # ports:
# - 5432 # - "5432:5432"
# healthcheck: # healthcheck:
# test: ["CMD-SHELL", "pg_isready -d grafana -U grafana"] # test: ["CMD-SHELL", "pg_isready -d grafana -U grafana"]
# timeout: 10s # timeout: 10s
@ -66,13 +66,9 @@ services:
- GF_DATABASE_TYPE=mysql - GF_DATABASE_TYPE=mysql
- GF_DATABASE_HOST=db:3306 - GF_DATABASE_HOST=db:3306
- GF_DATABASE_MAX_OPEN_CONN=300 - GF_DATABASE_MAX_OPEN_CONN=300
- GF_SESSION_PROVIDER=mysql
- GF_SESSION_PROVIDER_CONFIG=grafana:password@tcp(db:3306)/grafana?allowNativePasswords=true
# - GF_DATABASE_TYPE=postgres # - GF_DATABASE_TYPE=postgres
# - GF_DATABASE_HOST=db:5432 # - GF_DATABASE_HOST=db:5432
# - GF_DATABASE_SSL_MODE=disable # - GF_DATABASE_SSL_MODE=disable
# - GF_SESSION_PROVIDER=postgres
# - GF_SESSION_PROVIDER_CONFIG=user=grafana password=password host=db port=5432 dbname=grafana sslmode=disable
- GF_SERVER_ROUTER_LOGGING=true - GF_SERVER_ROUTER_LOGGING=true
- GF_LOG_CONSOLE_FORMAT=json - GF_LOG_CONSOLE_FORMAT=json
- GF_LOG_FILTERS=alerting.notifier:debug,alerting.notifier.slack:debug,auth:debug - GF_LOG_FILTERS=alerting.notifier:debug,alerting.notifier.slack:debug,auth:debug