From 7b422b92b0b99a0a994eeb9633691316a023281f Mon Sep 17 00:00:00 2001 From: lhy Date: Fri, 12 Aug 2022 09:10:02 +0900 Subject: [PATCH] Added option to select sslmode when connecting to DB in Grafana --- grafana/Dockerfile | 3 ++- grafana/datasource.yml | 2 +- website/docs/guides/apache.md | 1 + website/docs/guides/traefik.md | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/grafana/Dockerfile b/grafana/Dockerfile index 6b02967c07..8748ebd731 100644 --- a/grafana/Dockerfile +++ b/grafana/Dockerfile @@ -11,7 +11,8 @@ ENV GF_ANALYTICS_REPORTING_ENABLED=FALSE \ GF_SECURITY_DISABLE_GRAVATAR=true \ GF_USERS_ALLOW_SIGN_UP=false \ GF_ANALYTICS_REPORTING_ENABLED=FALSE \ - DATABASE_PORT=5432 + DATABASE_PORT=5432 \ + DATABASE_SSLMODE=disable USER root diff --git a/grafana/datasource.yml b/grafana/datasource.yml index 670340e11d..e02a3db95c 100644 --- a/grafana/datasource.yml +++ b/grafana/datasource.yml @@ -15,6 +15,6 @@ datasources: password: $DATABASE_PASS jsonData: postgresVersion: 1000 - sslmode: disable + sslmode: $DATABASE_SSLMODE version: 1 editable: true diff --git a/website/docs/guides/apache.md b/website/docs/guides/apache.md index e07bedfec1..fe7dfd8a64 100644 --- a/website/docs/guides/apache.md +++ b/website/docs/guides/apache.md @@ -69,6 +69,7 @@ services: - DATABASE_PASS=${TM_DB_PASS} - DATABASE_NAME=${TM_DB_NAME} - DATABASE_HOST=database + - DATABASE_SSLMODE=disable - GRAFANA_PASSWD=${GRAFANA_PW} - GF_SECURITY_ADMIN_USER=${GRAFANA_USER} - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PW} diff --git a/website/docs/guides/traefik.md b/website/docs/guides/traefik.md index 253b549301..8e29612596 100644 --- a/website/docs/guides/traefik.md +++ b/website/docs/guides/traefik.md @@ -79,6 +79,7 @@ services: - DATABASE_PASS=${TM_DB_PASS} - DATABASE_NAME=${TM_DB_NAME} - DATABASE_HOST=database + - DATABASE_SSLMODE=disable - GRAFANA_PASSWD=${GRAFANA_PW} - GF_SECURITY_ADMIN_USER=${GRAFANA_USER} - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PW}