Make loki and jaeger datasource configurable for grafana (#9283)

* Make loki and jaeger datasource configurable

 - We should keep additional datasource in for grafana and loki configurable.
   So that we can control them via overrides if on of the component is not present

* fixes

* Remove unused key

resources/monitoring/templates/grafana/configmaps-datasources.yaml

@@ -32,6 +32,12 @@ data:
 {{- end }}
 {{- end }}
 {{- end }}
+{{- if .Values.grafana.dataSources.loki.enabled }}
+{{ toYaml .Values.grafana.dataSources.loki.config | indent 4}}
+{{- end }}
+{{- if .Values.grafana.dataSources.jaeger.enabled }}
+{{ toYaml .Values.grafana.dataSources.jaeger.config | indent 4}}
+{{- end }}
 {{- if .Values.grafana.additionalDataSources }}
 {{ toYaml .Values.grafana.additionalDataSources | indent 4}}
 {{- end }}

resources/monitoring/values.yaml

@@ -515,19 +515,29 @@ grafana:
 
   ## Configure additional grafana datasources
   ## ref: https://grafana.com/docs/grafana/latest/features/datasources/
+
+
+  dataSources:
+    loki:
+      enabled: true
+      config:
+        - name: Loki
+          type: loki
+          access: proxy
+          url: http://logging-loki.kyma-system:3100
+          editable: true
+          jsonData:
+            maxLines: 1000
+    jaeger:
+      enabled: true
+      config:
+        - name: Jaeger
+          type: jaeger
+          access: proxy
+          url: http://tracing-jaeger-query.kyma-system:16686
+          editable: true
+
   additionalDataSources:
-    - name: Loki
-      type: loki
-      access: proxy
-      url: http://logging-loki.kyma-system:3100
-      editable: true
-      jsonData:
-        maxLines: 1000
-    - name: Jaeger
-      type: jaeger
-      access: proxy
-      url: http://tracing-jaeger-query.kyma-system:16686
-      editable: true
   # - name: prometheus-sample
   #   access: proxy
   #   basicAuth: true