diff --git a/helm/monitoring/templates/grafana.yaml b/helm/monitoring/templates/grafana.yaml index 3167e28..bf7ae1e 100644 --- a/helm/monitoring/templates/grafana.yaml +++ b/helm/monitoring/templates/grafana.yaml @@ -76,12 +76,12 @@ spec: - name: GF_SECURITY_ADMIN_USER valueFrom: secretKeyRef: - name: grafana-creds + name: {{ .Values.grafana.existingSecret }} key: username - name: GF_SECURITY_ADMIN_PASSWORD valueFrom: secretKeyRef: - name: grafana-creds + name: {{ .Values.grafana.existingSecret }} key: password - name: GF_SERVER_ROOT_URL # used to serve through ingress-nginx value: "%(protocol)s://%(domain)s:%(http_port)s/grafana/" diff --git a/helm/monitoring/values.yaml b/helm/monitoring/values.yaml index 854dbeb..8919ddc 100644 --- a/helm/monitoring/values.yaml +++ b/helm/monitoring/values.yaml @@ -54,8 +54,7 @@ fluentd: memory: 200Mi grafana: - username: nemesis - # password: "" + existingSecret: grafana-creds prometheusUrl: http://prometheus-service.default.svc:9090 image: repository: grafana/grafana