[stable/grafana] fix dashboard loading regression #12400 (#12512)

Fixing multiline indicator usage that was broken by PR #11997
that prevented custom prebuilt dashboards to be loaded from file on helm install.

Signed-off-by: Jannis Oeltjen <oss@jcoeltjen.de>
This commit is contained in:
Jannis Oeltjen
2019-03-25 13:12:17 -07:00
committed by Kubernetes Prow Robot
parent 12dfbf4d61
commit f517c94d94
2 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: grafana
version: 2.3.4
version: 2.3.5
appVersion: 6.0.2
kubeVersion: "^1.8.0-0"
description: The leading tool for querying and visualizing time series and metrics.
@@ -15,9 +15,10 @@ metadata:
data:
{{- range $key, $value := $dashboards }}
{{- if (or (hasKey $value "json") (hasKey $value "file")) }}
{{ print $key | indent 2 }}.json: |-
{{ print $key | indent 2 }}.json:
{{- if hasKey $value "json" }}
{{ $value.json | indent 4 }}
|-
{{ $value.json | indent 6 }}
{{- end }}
{{- if hasKey $value "file" }}
{{ toYaml ( $files.Get $value.file ) | indent 4}}