chore(grafana): change database to postgres

Author: duanhongyi

charts/grafana/templates/_helpers.tmpl

@@ -5,6 +5,25 @@ env:
   valueFrom:
     fieldRef:
       fieldPath: metadata.namespace
+- name: GF_DATABASE_TYPE
+  value: postgres
+{{- if (.Values.databaseUrl) }}
+- name: GF_DATABASE_URL
+  value: "{{ .Values.databaseUrl }}"
+{{- else if .Values.database.enabled }}
+- name: GF_DATABASE_USER
+  valueFrom:
+    secretKeyRef:
+      name: database-creds
+      key: user
+- name: GF_DATABASE_PASSWORD
+  valueFrom:
+    secretKeyRef:
+      name: database-creds
+      key: password
+- name: GF_DATABASE_URL
+  value: "postgres://$(GF_DATABASE_USER):$(GF_DATABASE_PASSWORD)@drycc-database.{{.Release.Namespace}}.svc.{{.Values.global.clusterDomain}}:5432/grafana"
+{{- end }}
 {{- if .Values.prometheusUrl }}
 - name: "PROMETHEUS_URL"
   value: "{{ .Values.prometheusUrl }}"

charts/grafana/values.yaml

@@ -56,6 +56,8 @@ persistence:
 # this is usually a non required setting.
 environment:
   ALLOW_SIGN_UP: false
+## databaseUrl and databaseReplicaUrl are will no longer use the built-in database component
+databaseUrl: ""
 # The passportUrl, passportKey and passportSecret are will no longer use the built-in passport component
 passportUrl: ""
 passportKey: ""

rootfs/usr/share/grafana/grafana.ini.tpl

@@ -62,54 +62,12 @@ cert_key = {{ .CERT_KEY }}
 #################################### Database ####################################
 [database]
 # Either "mysql", "postgres" or "sqlite3", it's your choice
-{{ if .DATABASE_TYPE }}
-type = {{ .DATABASE_TYPE }}
+{{ if .GF_DATABASE_TYPE }}
+type = {{ .GF_DATABASE_TYPE }}
 {{ end }}
-{{ if .DATABASE_HOST }}
-host = {{ .DATABASE_HOST }}
+{{ if .GF_DATABASE_URL }}
+url = {{ .GF_DATABASE_URL }}
 {{ end }}
-{{ if .DATABASE_NAME }}
-name = {{ .DATABASE_NAME }}
-{{ end }}
-{{ if .DATABASE_USER }}
-user = {{ .DATABASE_USER }}
-{{ end }}
-{{ if .DATABASE_PASSWORD }}
-password = {{ .DATABASE_PASSWORD }}
-{{ end }}
-
-# For "postgres" only, either "disable", "require" or "verify-full"
-{{ if .DATABASE_SSL_MODE }}
-ssl_mode = {{ .DATABASE_SSL_MODE }}
-{{ end }}
-
-# For "sqlite3" only, path relative to data_path setting
-{{ if .DATABASE_PATH }}
-path = {{ .DATABASE_PATH }}
-{{ end }}
-
-#################################### Session ####################################
-[session]
-# Either "memory", "file", "mysql", "postgres", default is "file"
-provider = {{ default "file" .SESSION_PROVIDER }}
-
-# Provider config options
-# memory: not have any config yet
-# file: session dir path, is relative to grafana data_path
-# mysql: go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name`
-# postgres: user=a password=b host=localhost port=5432 dbname=c sslmode=disable
-{{ if .SESSION_PROVIDER_CONFIG }}
-provider_config = {{ .SESSION_PROVIDER_CONFIG }}
-{{ end }}
-
-# Session cookie name
-cookie_name = {{ default "grafana_sess" .SESSION_COOKIE_NAME }}
-
-# If you use session in https only, default is false
-cookie_secure = {{ default "false" .SESSION_COOKIE_SECURE }}
-
-# Session life time, default is 86400
-session_life_time = {{ default "86400" .SESSION_LIFE_TIME }}
 
 #################################### Analytics ####################################
 [analytics]