AETHER-896 More updates for Rancher Monitoring v2

Change-Id: Ie388f392e2af90ecf9fa439f8e863b1bdfdc9e7b
diff --git a/monitoring/grafana-aether/templates/datasource-configmap.yaml b/monitoring/grafana-aether/templates/datasource-configmap.yaml
index 0de48da..0ba28ac 100644
--- a/monitoring/grafana-aether/templates/datasource-configmap.yaml
+++ b/monitoring/grafana-aether/templates/datasource-configmap.yaml
@@ -5,9 +5,6 @@
 kind: ConfigMap
 metadata:
   name: {{ .Release.Name }}-datasource
-{{- if .Values.datasourceNamespace }}
-  namespace: {{ .Values.datasourceNamespace }}
-{{- end }}
   labels:
      grafana_datasource: "1"
 data:
@@ -21,7 +18,7 @@
       access: proxy
       basicAuth: false
       editable: false
-      isDefault: true
+      isDefault: false
       url: {{ .Values.edgeServerDatasourceURL }}
 {{- end }}
 {{- range .Values.clusterDatasources }}
@@ -54,4 +51,4 @@
       secureJsonData:
         privateKey: |
 {{ .Values.googleCloudMonitoring.key | indent 10 }}
-{{- end }}
\ No newline at end of file
+{{- end }}