Add Grafana

incubator/grafana/templates/dashboards-configmap.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.serverDashboardFiles.specifiedInValues -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -9,4 +10,5 @@ metadata:
     release: "{{ .Release.Name }}"
   name: {{ template "server.fullname" . }}-dashs
 data:
-{{ toYaml .Values.serverDashboardFiles | indent 2 }}
+{{ toYaml .Values.serverDashboardFiles.value | indent 2 }}
+{{- end -}}

incubator/grafana/templates/secret.yaml

@@ -9,9 +9,5 @@ metadata:
   name: {{ template "server.fullname" . }}
 type: Opaque
 data:
-  {{- if .Values.server.adminPassword }}
   grafana-admin-password: {{ .Values.server.adminPassword | b64enc | quote }}
-  {{- else }}
-  grafana-admin-password: {{ randAlphaNum 10 | b64enc | quote }}
-  {{- end }}
   grafana-admin-user: {{ .Values.server.adminUser | b64enc | quote }}

incubator/grafana/values.yaml

@@ -44,7 +44,7 @@ server:
   name: grafana
 
   adminUser: "admin"
-  # adminPassword: "admin"
+  adminPassword: "admin"
 
   ## Global imagePullPolicy
   ## Default: 'Always' if image tag is 'latest', else 'IfNotPresent'
@@ -343,4 +343,6 @@ serverConfigFile:
 ##
 ## and add it below.
 ##
-serverDashboardFiles: {}
+serverDashboardFiles:
+  specifiedInValues: true
+  value: {}