From 4e23b06b40ffcd1f0cfe2913cbc2ba01856c09eb Mon Sep 17 00:00:00 2001 From: Will Browne Date: Mon, 21 Feb 2022 16:52:38 +0100 Subject: [PATCH] remove old fields and expose ports (#45626) --- devenv/docker/ha_test/docker-compose.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/devenv/docker/ha_test/docker-compose.yaml b/devenv/docker/ha_test/docker-compose.yaml index a215513c568..b6f3498eaf3 100644 --- a/devenv/docker/ha_test/docker-compose.yaml +++ b/devenv/docker/ha_test/docker-compose.yaml @@ -24,7 +24,7 @@ services: MYSQL_PASSWORD: password command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci, --innodb_monitor_enable=all, --max-connections=1001] ports: - - 3306 + - "3306:3306" healthcheck: test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] timeout: 10s @@ -47,7 +47,7 @@ services: # POSTGRES_USER: grafana # POSTGRES_PASSWORD: password # ports: - # - 5432 + # - "5432:5432" # healthcheck: # test: ["CMD-SHELL", "pg_isready -d grafana -U grafana"] # timeout: 10s @@ -66,13 +66,9 @@ services: - GF_DATABASE_TYPE=mysql - GF_DATABASE_HOST=db:3306 - 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_HOST=db:5432 # - 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_LOG_CONSOLE_FORMAT=json - GF_LOG_FILTERS=alerting.notifier:debug,alerting.notifier.slack:debug,auth:debug