From f661eb5b67ccb276a0cfcfc518b7e7c277dcdf26 Mon Sep 17 00:00:00 2001
From: Tamal Saha <tamal@appscode.com>
Date: Thu, 14 Dec 2023 10:28:33 -0800
Subject: [PATCH] fix

Signed-off-by: Tamal Saha <tamal@appscode.com>
---
 .../templates/configmap.yaml                      |  4 ++--
 .../templates/dashboard.yaml                      | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/charts/kubedb-grafana-dashboards/templates/configmap.yaml b/charts/kubedb-grafana-dashboards/templates/configmap.yaml
index 312cda48d..c604c8014 100644
--- a/charts/kubedb-grafana-dashboards/templates/configmap.yaml
+++ b/charts/kubedb-grafana-dashboards/templates/configmap.yaml
@@ -19,10 +19,10 @@ data:
   {{- range $k, $v := $.Values.dashboard.replacements }}
     {{- $dashtpl = $dashtpl | replace $k $v }}
   {{- end }}
-  {{- $dasboard := omit (tpl $dashtpl $ | mustFromJson) "id" "uid" -}}
+  {{- $dashboard := omit (tpl $dashtpl $ | mustFromJson) "id" "uid" -}}
   {{ $path | replace "/" "-" | nindent 2 }}: |
     {{- dict
-      "dashboard" $dasboard
+      "dashboard" $dashboard
       "folderId" $.Values.dashboard.folderID
       "overwrite" $.Values.dashboard.overwrite | toJson | nindent 4 -}}
 {{- end }}
diff --git a/charts/kubedb-grafana-dashboards/templates/dashboard.yaml b/charts/kubedb-grafana-dashboards/templates/dashboard.yaml
index 4262092eb..a6e5bda43 100644
--- a/charts/kubedb-grafana-dashboards/templates/dashboard.yaml
+++ b/charts/kubedb-grafana-dashboards/templates/dashboard.yaml
@@ -4,10 +4,17 @@
 {{- $gkr := .Files.Get "data/resources.yaml" | fromYaml -}}
 {{ range $r := .Values.resources }}
 {{ range $path, $_ :=  $.Files.Glob (printf "dashboards/%s/**.json" $r) }}
+
+{{- $dashtpl := $.Files.Get $path }}
+{{- range $k, $v := $.Values.dashboard.replacements }}
+  {{- $dashtpl = $dashtpl | replace $k $v }}
+{{- end }}
+{{- $dashboard := omit (tpl $dashtpl $ | mustFromJson) "id" "uid" -}}
+
 apiVersion: openviz.dev/v1alpha1
 kind: GrafanaDashboard
 metadata:
-  name: {{ prepend ((get ($.Files.Get $path | mustFromJson) "title") | lower | nospace | splitList "/" ) $.Values.grafana.name | compact | join "-" | trunc 63 | trimSuffix "-" }}
+  name: {{ prepend ((get $dashboard "title") | lower | nospace | splitList "/" ) $.Values.grafana.name | compact | join "-" | trunc 63 | trimSuffix "-" }}
   namespace: {{ $.Release.Namespace }}
   labels:
     k8s.io/group: kubedb.com
@@ -24,12 +31,8 @@ spec:
     namespace: {{ . }}
   {{- end }}
 {{- end }}
-  {{- $dashtpl := $.Files.Get $path }}
-  {{- range $k, $v := $.Values.dashboard.replacements }}
-    {{- $dashtpl = $dashtpl | replace $k $v }}
-  {{- end }}
   model:
-    {{- omit (tpl $dashtpl $ | mustFromJson) "id" "uid" | toYaml | nindent 4 }}
+    {{- $dashboard | toYaml | nindent 4 }}
 {{- with $.Values.dashboard.folderID }}
   folderID: {{ . }}
 {{- end }}