Added option to select sslmode when connecting to DB in Grafana

teslamate-org · Aug 12, 2022 · 24e324f · 24e324f
1 parent 44a6fd8
commit 24e324f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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}