grafana: support DATABASE_SSL_MODE (#3498)

teslamate-org · Feb 9, 2024 · 512abe5 · 512abe5
1 parent 2d51501
commit 512abe5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
@@ -12,7 +12,8 @@ ENV GF_ANALYTICS_REPORTING_ENABLED=false \
     GF_SECURITY_DISABLE_GRAVATAR=true \
     GF_SECURITY_ANGULAR_SUPPORT_ENABLED=false \
     GF_USERS_ALLOW_SIGN_UP=false \
-    DATABASE_PORT=5432
+    DATABASE_PORT=5432 \
+    DATABASE_SSL_MODE=disable
 
 USER grafana
 

diff --git a/grafana/datasource.yml b/grafana/datasource.yml
@@ -6,15 +6,14 @@ datasources:
   url: $DATABASE_HOST:$DATABASE_PORT
   user: $DATABASE_USER
   database: $DATABASE_NAME
-  password: ""
   access: proxy
   basicAuth: false
   withCredentials: false
   isDefault: true
   secureJsonData:
     password: $DATABASE_PASS
   jsonData:
-    postgresVersion: 1000
-    sslmode: disable
+    postgresVersion: 1500
+    sslmode: $DATABASE_SSL_MODE
   version: 1
   editable: true