AETHER-670 Filter to only use new cluster names
Change-Id: Iba2a45dfbf8c720f4bbdfb593b3edf121a38c392
diff --git a/monitoring/grafana-aether/templates/dashboard-configmap.yaml b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
index 7792ce1..22cf549 100644
--- a/monitoring/grafana-aether/templates/dashboard-configmap.yaml
+++ b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
@@ -8,9 +8,19 @@
labels:
grafana_dashboard: "1"
data:
+{{- if .Values.globalDashboard }}
{{- if and .Values.edgeServerDatasourceURL .Values.googleCloudMonitoring }}
{{ (.Files.Glob "dashboards/global*.json").AsConfig | indent 2 }}
{{- end }}
+{{- end }}
+{{- if .Values.multiSiteDashboard }}
{{- if and .Values.edgeServerDatasourceURL .Values.clusterDatasources }}
{{ (.Files.Glob "dashboards/multi*.json").AsConfig | indent 2 }}
{{- end }}
+{{- end }}
+{{- if .Values.enterpriseDashboard }}
+{{- if and .Values.edgeServerDatasourceURL .Values.clusterDatasources }}
+{{- $path := printf "dashboards/%s*.json" .Values.enterpriseDashboard }}
+{{ (.Files.Glob $path).AsConfig | indent 2 }}
+{{- end }}
+{{- end }}