diff --git a/monitoring/grafana-aether/templates/dashboard-configmap.yaml b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
index 04ff167..7792ce1 100644
--- a/monitoring/grafana-aether/templates/dashboard-configmap.yaml
+++ b/monitoring/grafana-aether/templates/dashboard-configmap.yaml
@@ -8,6 +8,9 @@
   labels:
      grafana_dashboard: "1"
 data:
-{{ if .Values.globalStatusMonitorNamespace }}
+{{- if and .Values.edgeServerDatasourceURL .Values.googleCloudMonitoring }}
 {{ (.Files.Glob "dashboards/global*.json").AsConfig | indent 2 }}
-{{ end }}
+{{- end }}
+{{- if and .Values.edgeServerDatasourceURL .Values.clusterDatasources }}
+{{ (.Files.Glob "dashboards/multi*.json").AsConfig | indent 2 }}
+{{- end }}
diff --git a/monitoring/grafana-aether/templates/datasource-configmap.yaml b/monitoring/grafana-aether/templates/datasource-configmap.yaml
index da039de..6d83c65 100644
--- a/monitoring/grafana-aether/templates/datasource-configmap.yaml
+++ b/monitoring/grafana-aether/templates/datasource-configmap.yaml
@@ -12,12 +12,34 @@
     apiVersion: 1
 
     datasources:
-{{ if .Values.globalStatusMonitorNamespace }}
+{{- if .Values.edgeServerDatasourceURL }}
     - name: RANCHER_MONITORING_GLOBAL
       type: prometheus
       access: proxy
       basicAuth: false
       editable: false
       isDefault: true
-      url: http://access-prometheus.{{.Values.globalStatusMonitorNamespace}}:80
-{{ end }}
+      url: {{ .Values.edgeServerDatasourceURL }}
+{{- end }}
+{{- range .Values.clusterDatasources }}
+    - name: {{ .cluster }}
+      type: prometheus
+      access: proxy
+      basicAuth: false
+      editable: false
+      isDefault: false
+      url: {{ .prometheusURL }}
+{{- end }}
+{{- if .Values.googleCloudMonitoring }}
+    - name: Google Cloud Monitoring
+      type: stackdriver
+      access: proxy
+      jsonData:
+        tokenUri: https://oauth2.googleapis.com/token
+        clientEmail: {{ .Values.googleCloudMonitoring.clientEmail }}
+        authenticationType: jwt
+        defaultProject: {{ .Values.googleCloudMonitoring.defaultProject }}
+      secureJsonData:
+        privateKey: |
+{{ .Values.googleCloudMonitoring.key | indent 10 }}
+{{- end }}
\ No newline at end of file