feat(grafana): DataSources configurable in values.yaml

!2 #1

templates/GrafanaDatasource-AlertManager.yaml

@@ -1,39 +0,0 @@
----
-apiVersion: grafana.integreatly.org/v1beta1
-kind: GrafanaDatasource
-metadata:
-  name: alertmanager
-  namespace: "{{ .Values.nfc_monitoring.grafana.namespace }}"
-  labels:
-    app.kubernetes.io/component: graphing
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: alertmanager
-    app.kubernetes.io/managed-by: {{ $.Release.Service }}
-    app.kubernetes.io/part-of: {{ $.Chart.Name }}
-    app.kubernetes.io/version: {{ $.Chart.Version }}
-spec:
-  #secrets:
-  #  - credentials
-  instanceSelector:
-    matchLabels:
-      app.kubernetes.io/component: graphing
-      app.kubernetes.io/instance: k8s
-      app.kubernetes.io/name: grafana
-  allowCrossNamespaceImport: true
-  datasource:
-    name: alertmanager
-    type: alertmanager
-    access: proxy
-    # basicAuth: true
-    url: "http://alertmanager-main.{{ .Values.nfc_monitoring.alert_manager.namespace }}.svc:9093"
-    isDefault: false
-    # user: admin
-    jsonData:
-      "tlsSkipVerify": true
-      "timeInterval": "5s"
-      "implementation": prometheus
-      "handleGrafanaManagedAlerts": false
-    #  "orgId": 1
-    # secureJsonData:
-    #   "password": admin
-    editable: true

templates/GrafanaDatasource-Prometheus.yaml

@@ -1,38 +0,0 @@
----
-apiVersion: grafana.integreatly.org/v1beta1
-kind: GrafanaDatasource
-metadata:
-  name: prometheus
-  namespace: "{{ .Values.nfc_monitoring.grafana.namespace }}"
-  labels:
-    app.kubernetes.io/component: graphing
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: prometheus
-    app.kubernetes.io/managed-by: {{ $.Release.Service }}
-    app.kubernetes.io/part-of: {{ $.Chart.Name }}
-    app.kubernetes.io/version: {{ $.Chart.Version }}
-spec:
-  #secrets:
-  #  - credentials
-  instanceSelector:
-    matchLabels:
-      app.kubernetes.io/component: graphing
-      app.kubernetes.io/instance: k8s
-      app.kubernetes.io/name: grafana
-  allowCrossNamespaceImport: true
-  datasource:
-    name: prometheus
-    type: prometheus
-    access: proxy
-    # basicAuth: true
-    url: "http://prometheus-k8s.{{ .Values.nfc_monitoring.prometheus.namespace }}.svc:9090"
-    isDefault: true
-    # user: admin
-    jsonData:
-    #  "tlsSkipVerify": true
-      manageAlerts: true
-      "timeInterval": "5s"
-      "orgId": 1
-    # secureJsonData:
-    #   "password": admin
-    editable: true

templates/GrafanaDatasource-loki.yaml

@@ -1,41 +0,0 @@
----
-{{- if .Values.nfc_monitoring.loki.enabled | default false -}}
-
-apiVersion: grafana.integreatly.org/v1beta1
-kind: GrafanaDatasource
-metadata:
-  name: loki
-  namespace: "{{ .Values.nfc_monitoring.grafana.namespace }}"
-  labels:
-    aapp.kubernetes.io/component: graphing
-    app.kubernetes.io/instance: k8s
-    app.kubernetes.io/name: loki
-    app.kubernetes.io/managed-by: {{ $.Release.Service }}
-    app.kubernetes.io/part-of: {{ $.Chart.Name }}
-    app.kubernetes.io/version: {{ $.Chart.Version }}
-spec:
-  #secrets:
-  #  - credentials
-  instanceSelector:
-    matchLabels:
-      app.kubernetes.io/component: graphing
-      app.kubernetes.io/instance: k8s
-      app.kubernetes.io/name: grafana
-  allowCrossNamespaceImport: true
-  datasource:
-    name: loki
-    type: loki
-    access: proxy
-    # basicAuth: true
-    url: "http://{{ .Values.nfc_monitoring.loki.service_name }}.{{ .Values.nfc_monitoring.loki.namespace }}.svc.{{ .Values.nfc_monitoring.kubernetes.cluster_dns_name }}:{{ .Values.nfc_monitoring.loki.service_port }}"
-    isDefault: false
-    # user: admin
-    jsonData:
-    #  "tlsSkipVerify": true
-      "timeInterval": "5s"
-      "orgId": 1
-    # secureJsonData:
-    #   "password": admin
-    editable: true
-
-{{- end -}}

templates/GrafanaDatasources.yaml

@@ -0,0 +1,28 @@
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDatasourceList
+items:
+  {{ range .Values.nfc_monitoring.grafana.DataSources }}
+  - apiVersion: grafana.integreatly.org/v1beta1
+    kind: GrafanaDatasource
+    metadata:
+      name: {{ .name }}
+      namespace: "{{ $.Values.nfc_monitoring.grafana.namespace }}"
+      labels:
+        app.kubernetes.io/component: dashboard
+        app.kubernetes.io/instance: k8s
+        app.kubernetes.io/name: grafana
+        app.kubernetes.io/managed-by: {{ $.Release.Service }}
+        app.kubernetes.io/part-of: {{ $.Chart.Name }}
+        app.kubernetes.io/version: {{ $.Chart.Version }}
+    spec:
+      instanceSelector:
+        matchLabels:
+          app.kubernetes.io/component: graphing
+          app.kubernetes.io/instance: k8s
+          app.kubernetes.io/name: grafana
+      allowCrossNamespaceImport: true
+      datasource:
+        {{ toYaml . | nindent 8 }}
+
+  {{ end }}