AETHER-1069 Dashboard improvements, simplify chart
Change-Id: I697aab784398f08adb8b16e976920d22fc3cdaf9
diff --git a/monitoring/grafana-aether/templates/datasource-configmap.yaml b/monitoring/grafana-aether/templates/datasource-configmap.yaml
index 6bd40e0..80e3f2e 100644
--- a/monitoring/grafana-aether/templates/datasource-configmap.yaml
+++ b/monitoring/grafana-aether/templates/datasource-configmap.yaml
@@ -12,32 +12,14 @@
apiVersion: 1
datasources:
-{{- if .Values.edgeServerDatasourceURL }}
- - name: RANCHER_MONITORING_GLOBAL
+{{- range .Values.prometheusDatasources }}
+ - name: {{ .name }}
type: prometheus
access: proxy
basicAuth: false
editable: false
isDefault: false
- url: {{ .Values.edgeServerDatasourceURL }}
-{{- end }}
-{{- range .Values.clusterDatasources }}
- - name: {{ .cluster }}
- type: prometheus
- access: proxy
- basicAuth: false
- editable: false
- isDefault: false
- url: {{ .prometheusURL }}
-{{- end }}
-{{- if .Values.sdCoreDatasourceURL }}
- - name: RANCHER_MONITORING_SDCORE
- type: prometheus
- access: proxy
- basicAuth: false
- editable: false
- isDefault: false
- url: {{ .Values.sdCoreDatasourceURL }}
+ url: {{ .endpoint }}
{{- end }}
{{- if .Values.googleCloudMonitoring }}
- name: Google Cloud Monitoring