From 689bddae2bb9230100ab264a666ec6422e38ec1d Mon Sep 17 00:00:00 2001 From: lza_menace Date: Wed, 13 Jan 2021 09:35:36 -0800 Subject: [PATCH] extend grafana options/envs --- docker-compose.full.yaml | 7 ++++--- docker-compose.yaml | 7 ++++--- env-example | 4 ++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/docker-compose.full.yaml b/docker-compose.full.yaml index 756fb09..8dfb8f3 100644 --- a/docker-compose.full.yaml +++ b/docker-compose.full.yaml @@ -31,9 +31,10 @@ services: GF_ANALYTICS_CHECK_FOR_UPDATES: "false" GF_USERS_ALLOW_SIGN_UP: "false" GF_USERS_ALLOW_ORG_CREATE: "false" - GF_AUTH_ANONYMOUS_ENABLED: "true" - GF_AUTH_BASIC_ENABLED: "false" - GF_AUTH_DISABLE_LOGIN_FORM: "true" + GF_AUTH_ANONYMOUS_ENABLED: "${GF_AUTH_ANONYMOUS_ENABLED:-true}" + GF_AUTH_BASIC_ENABLED: "${GF_AUTH_BASIC_ENABLED:-false}" + GF_AUTH_DISABLE_LOGIN_FORM: "${GF_AUTH_DISABLE_LOGIN_FORM:-true}" + GF_SECURITY_ADMIN_PASSWORD: "${GF_SECURITY_ADMIN_PASSWORD}" volumes: - ./files/grafana/dashboards.yaml:/etc/grafana/provisioning/dashboards/default.yaml:ro - ./files/grafana/prometheus.yaml:/etc/grafana/provisioning/datasources/prometheus.yaml:ro diff --git a/docker-compose.yaml b/docker-compose.yaml index 8d37cbf..2bab333 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -31,9 +31,10 @@ services: GF_ANALYTICS_CHECK_FOR_UPDATES: "false" GF_USERS_ALLOW_SIGN_UP: "false" GF_USERS_ALLOW_ORG_CREATE: "false" - GF_AUTH_ANONYMOUS_ENABLED: "true" - GF_AUTH_BASIC_ENABLED: "false" - GF_AUTH_DISABLE_LOGIN_FORM: "true" + GF_AUTH_ANONYMOUS_ENABLED: "${GF_AUTH_ANONYMOUS_ENABLED:-true}" + GF_AUTH_BASIC_ENABLED: "${GF_AUTH_BASIC_ENABLED:-false}" + GF_AUTH_DISABLE_LOGIN_FORM: "${GF_AUTH_DISABLE_LOGIN_FORM:-true}" + GF_SECURITY_ADMIN_PASSWORD: "${GF_SECURITY_ADMIN_PASSWORD}" volumes: - ./files/grafana/dashboards.yaml:/etc/grafana/provisioning/dashboards/default.yaml:ro - ./files/grafana/prometheus.yaml:/etc/grafana/provisioning/datasources/prometheus.yaml:ro diff --git a/env-example b/env-example index 04b8b8e..1b3828f 100644 --- a/env-example +++ b/env-example @@ -4,3 +4,7 @@ P2P_PORT=18080 RESTRICTED_PORT=18081 ZMQ_PORT=18082 UNRESTRICTED_PORT=18083 +GF_AUTH_ANONYMOUS_ENABLED=true +GF_AUTH_BASIC_ENABLED=true +GF_AUTH_DISABLE_LOGIN_FORM=true +GF_SECURITY_ADMIN_PASSWORD=xxxxxx