Skip to content

Commit ff1eb52

Browse files
committed
Add postgres support for grafana
1 parent 00b6a66 commit ff1eb52

File tree

2 files changed

+15
-43
lines changed

2 files changed

+15
-43
lines changed

charts/client/Chart.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,8 @@ dependencies:
3131
condition: clickhouse.enabled
3232
version: 1.0.2
3333
repository: https://intelops.github.io/kubviz/
34-
- name: postgresql
35-
condition: postgresql.enabled
36-
version: 1.0.0
37-
repository: https://kube-tarian.github.io/helmrepo-supporting-tools/
3834
- name: grafana
3935
condition: grafana.enabled
40-
version: 1.0.3
36+
version: 1.0.4
4137
repository: https://kube-tarian.github.io/helmrepo-supporting-tools/
4238

charts/client/values.yaml

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -98,30 +98,6 @@ clickhouse:
9898
clickhouse:
9999
replicas: "1"
100100

101-
postgresql:
102-
enabled: false
103-
auth:
104-
## @param auth.enablePostgresUser Assign a password to the "postgres" admin user. Otherwise, remote access will be blocked for this user
105-
##
106-
enablePostgresUser: true
107-
## @param auth.postgresPassword Password for the "postgres" admin user. Ignored if `auth.existingSecret` is provided
108-
##
109-
postgresPassword: ""
110-
## @param auth.username Name for a custom user to create
111-
##
112-
username: ""
113-
## @param auth.password Password for the custom user to create. Ignored if `auth.existingSecret` is provided
114-
##
115-
password: ""
116-
## @param auth.database Name for a custom database to create
117-
##
118-
database: ""
119-
## @param auth.existingSecret Name of existing secret to use for PostgreSQL credentials. `auth.postgresPassword`, `auth.password`, and `auth.replicationPassword` will be ignored and picked up from this secret. The secret might also contains the key `ldap-password` if LDAP is enabled. `ldap.bind_password` will be ignored and picked from this secret in this case.
120-
##
121-
existingSecret: ""
122-
metrics:
123-
enabled: false
124-
125101
grafana:
126102
enabled: false
127103
plugins:
@@ -132,20 +108,20 @@ grafana:
132108
dashboards:
133109
provider:
134110
allowUiUpdates: true
135-
# grafana.ini:
136-
# database:
137-
# enabled: true
138-
# type: postgres
139-
# host: kubviz-client-postgresql:5432
140-
# name: postgres
141-
# ssl_mode: disable
142-
# user: postgres
143-
# password: $__file{/etc/secrets/postgresql/postgres-password}
144-
# extraSecretMounts:
145-
# - name: my-postgresql-mount
146-
# mountPath: /etc/secrets/postgresql
147-
# secretName: kubviz-client-postgresql
148-
# readOnly: true
111+
postgresql:
112+
enabled: false
113+
database:
114+
type: postgres
115+
host: kubviz-client-postgresql:5432
116+
name: postgres
117+
ssl_mode: disable
118+
user: postgres
119+
password: $__file{/etc/secrets/postgresql/postgres-password}
120+
secretMount:
121+
name: postgresql-mount
122+
mountPath: /etc/secrets/postgresql
123+
secretName: kubviz-client-postgresql
124+
readOnly: true
149125

150126
dashboards:
151127
enabled: true

0 commit comments

Comments
 (0)