Wirking around the datanommer password special chars for monitor dashboard by puttin it in env-var
This commit is contained in:
parent
81fb6eb6e7
commit
c75d6cd6e4
4 changed files with 18 additions and 2 deletions
|
@ -35,6 +35,12 @@
|
||||||
template: dashboard_config.yml
|
template: dashboard_config.yml
|
||||||
objectname: dashboard_config.yml
|
objectname: dashboard_config.yml
|
||||||
|
|
||||||
|
|
||||||
|
- role: openshift/object
|
||||||
|
app: monitor-dashboard
|
||||||
|
file: secret.yml
|
||||||
|
objectname: secret.yml
|
||||||
|
|
||||||
- role: openshift/object
|
- role: openshift/object
|
||||||
app: monitor-dashboard
|
app: monitor-dashboard
|
||||||
file: service.yml
|
file: service.yml
|
||||||
|
|
6
roles/openshift-apps/monitor-dashboard/files/secret.yml
Normal file
6
roles/openshift-apps/monitor-dashboard/files/secret.yml
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
- apiVersion: v1
|
||||||
|
data:
|
||||||
|
DATANOMER_PWD: {{ datanommer_ro_password }}
|
||||||
|
kind: Secret
|
||||||
|
metadata:
|
||||||
|
name: datanommer-secret
|
|
@ -13,9 +13,10 @@ data:
|
||||||
type: postgres
|
type: postgres
|
||||||
url: db-datanommer01.iad2.fedoraproject.org:5432
|
url: db-datanommer01.iad2.fedoraproject.org:5432
|
||||||
database: datanommer
|
database: datanommer
|
||||||
|
default: true
|
||||||
user: datanommer_ro
|
user: datanommer_ro
|
||||||
secureJsonData:
|
secureJsonData:
|
||||||
password: "{{ datanommer_ro_password }}"
|
password: "$DATANOMER_PWD"
|
||||||
jsonData:
|
jsonData:
|
||||||
sslmode: "disable" # disable/require/verify-ca/verify-full
|
sslmode: "disable" # disable/require/verify-ca/verify-full
|
||||||
maxOpenConns: 0 # Grafana v5.4+
|
maxOpenConns: 0 # Grafana v5.4+
|
||||||
|
|
|
@ -17,7 +17,10 @@ spec:
|
||||||
name: dashboard
|
name: dashboard
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- env:
|
- envFrom:
|
||||||
|
- secretRef:
|
||||||
|
name: datanommer-secret
|
||||||
|
env:
|
||||||
- name: GF_INSTALL_PLUGINS
|
- name: GF_INSTALL_PLUGINS
|
||||||
value: "grafana-clock-panel,simpod-json-datasource,grafana-googlesheets-datasource"
|
value: "grafana-clock-panel,simpod-json-datasource,grafana-googlesheets-datasource"
|
||||||
- name: GF_AUTH_BASIC_ENABLED
|
- name: GF_AUTH_BASIC_ENABLED
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue