From 907c9c51c678cfcc9411320fc67d4cbb24db693f Mon Sep 17 00:00:00 2001 From: Dimitar Zafirov Date: Thu, 28 Feb 2019 15:29:11 +0200 Subject: [PATCH] fixing bugs in prometheus deployment --- prometheus/templates/server-configmap.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/prometheus/templates/server-configmap.yaml b/prometheus/templates/server-configmap.yaml index d7cb7b8..104c7f7 100644 --- a/prometheus/templates/server-configmap.yaml +++ b/prometheus/templates/server-configmap.yaml @@ -26,7 +26,7 @@ data: {{ $key | indent 0 }}: | groups: {{- range $path, $bytes := $root.Files.Glob "rules/*.yaml" }} - {{- $root.Files.Get $path | toYaml | trim | trimAll "|" | indent 2 }} + {{- $root.Files.Get $path | trim | trimAll "|" | nindent 4 }} {{ end -}} {{- end -}} {{- end -}} @@ -34,22 +34,22 @@ data: {{- $scrapeConfigsKey := $root.Values.server.externalFiles.scrape_configs.confFile }} {{ $scrapeConfigsKey | indent 2 }}: {{- range $path, $bytes := $root.Files.Glob "scrape_configs/*.yaml" }} - {{- $root.Files.Get $path | toYaml | trim | trimAll "|" | indent 2 }} + {{- $root.Files.Get $path | trim | trimAll "|" | nindent 4 }} {{ end -}} {{- if contains "dev" $root.Values.nynja_env -}} {{- range $path, $bytes := $root.Files.Glob "scrape_configs/dev/*.yaml" }} - {{- $root.Files.Get $path | toYaml | trim | trimAll "|" | indent 2 }} + {{- $root.Files.Get $path | trim | trimAll "|" | nindent 4 }} {{ end -}} {{ end -}} {{- if contains "stg" $root.Values.nynja_env -}} {{- range $path, $bytes := $root.Files.Glob "scrape_configs/stg/*.yaml" }} - {{- $root.Files.Get $path | toYaml | trim | trimAll "|" | indent 2 }} + {{- $root.Files.Get $path | trim | trimAll "|" | nindent 4 }} {{ end -}} {{ end -}} {{- if contains "prd" $root.Values.nynja_env -}} {{- range $path, $bytes := $root.Files.Glob "scrape_configs/prd/*.yaml" }} - {{- $root.Files.Get $path | toYaml | trim | trimAll "|" | indent 2 }} + {{- $root.Files.Get $path | trim | trimAll "|" | nindent 4 }} {{ end -}} {{ end -}} {{- end -}} -- GitLab