Update grafana datasource to be dynamically added

charts/user-monitoring-demo/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/user-monitoring-demo/demo-role.yaml

@@ -1,20 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: prometheus-{{ .Values.user }}
-rules:
-- apiGroups: [""]
-  resources:
-  - services
-  - endpoints
-  - pods
-  verbs: ["get", "list", "watch"]
-- apiGroups: [""]
-  resources:
-  - configmaps
-  verbs: ["get"]
-- apiGroups:
-  - networking.k8s.io
-  resources:
-  - ingresses
-  verbs: ["get", "list", "watch"]

charts/user-monitoring-demo/values.yaml

@@ -1 +1 @@
-user: user1
+user: userX # Replace me

charts/user-monitoring/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.0-U+1F992
+version: 0.2.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/user-monitoring/templates/_user-am.yaml

@@ -1,5 +1,5 @@
 {{- define "alertmanager.alertmanager" }}
-
+---
 apiVersion: monitoring.coreos.com/v1
 kind: Alertmanager
 metadata:

charts/user-monitoring/templates/_user-blackboxexporter-cm.yaml

@@ -1,4 +1,5 @@
 {{- define  "blackboxexporter.cm" }}
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:

charts/user-monitoring/templates/_user-blackboxexporter-deploy.yaml

@@ -1,4 +1,5 @@
 {{- define  "blackboxexporter.deploy" }}
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:

charts/user-monitoring/templates/_user-grafana-cm.yaml

@@ -1,4 +1,5 @@
 {{- define "grafana.dashboardprovider" }}
+---
 kind: ConfigMap
 apiVersion: v1
 metadata:

charts/user-monitoring/templates/_user-grafana-datasource-secret.yaml

@@ -1,4 +1,5 @@
 {{- define "grafana.datasource" }}
+---
 apiVersion: v1
 kind: Secret
 type: Opaque
@@ -17,4 +18,7 @@ stringData:
         type: prometheus
         url: http://thanos-query.{{ .Values.user }}-monitoring.svc.cluster.local:10902
         version: 1
+      {{- if .Values.grafana.datasources }}
+      {{- toYaml .Values.grafana.datasources | nindent 6 }} 
+      {{- end }}
 {{- end }}

charts/user-monitoring/templates/_user-grafana-deploy.yaml

@@ -1,4 +1,5 @@
 {{- define "grafana.deploy" }}
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:

charts/user-monitoring/templates/_user-grafana-ingress.yaml

@@ -1,4 +1,5 @@
 {{- define "grafana.ingress" }}
+---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

charts/user-monitoring/templates/_user-grafana-rolebinding.yaml

@@ -1,4 +1,5 @@
 {{- define "grafana.rolebinding" }}
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:

charts/user-monitoring/templates/_user-grafana-sa.yaml

@@ -1,4 +1,5 @@
 {{- define "grafana.sa" }}
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:

charts/user-monitoring/templates/_user-grafana-svc.yaml

@@ -1,4 +1,5 @@
 {{- define "grafana.svc" }}
+---
 apiVersion: v1
 kind: Service
 metadata:

charts/user-monitoring/templates/_user-prom-ingress.yaml

@@ -1,4 +1,5 @@
 {{- define "prometheus.ingress" }}
+---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

charts/user-monitoring/templates/_user-prom-role.yaml

@@ -1,4 +1,5 @@
 {{- define "prometheus.role" }}
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:

charts/user-monitoring/templates/_user-prom-rolebinding.yaml

@@ -1,4 +1,5 @@
 {{- define "prometheus.rolebinding" }}
+---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:

charts/user-monitoring/templates/_user-prom-sa.yaml

@@ -1,4 +1,5 @@
 {{- define "prometheus.sa" }}
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:

charts/user-monitoring/templates/_user-prometheus.yaml

@@ -1,4 +1,5 @@
 {{- define "prometheus.prometheus" }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
 metadata:

charts/user-monitoring/templates/_user-pushgateway-deploy.yaml

@@ -1,4 +1,5 @@
 {{- define "pushgateway.deploy" }}
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:

charts/user-monitoring/templates/_user-pushgateway-servicemonitor.yaml

@@ -1,4 +1,5 @@
 {{- define "pushgateway.servicemonitor" }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/user-monitoring/templates/_user-pushgateway-svc.yaml

@@ -1,4 +1,5 @@
 {{- define "pushgateway.svc" }}
+---
 apiVersion: v1
 kind: Service
 metadata:

charts/user-monitoring/templates/_user-thanos-query-deploy.yaml

@@ -1,4 +1,5 @@
 {{- define "query.deploy" }}
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:

charts/user-monitoring/templates/_user-thanos-query-ingress.yaml

@@ -1,4 +1,5 @@
 {{- define "query.ingress" }}
+---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

charts/user-monitoring/templates/_user-thanos-query-svc.yaml

@@ -1,4 +1,5 @@
 {{- define "query.svc" }}
+---
 apiVersion: v1
 kind: Service
 metadata:

charts/user-monitoring/templates/_user-thanosruler-ingress.yaml

@@ -1,4 +1,5 @@
 {{- define "ruler.ingress" }}
+---
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:

charts/user-monitoring/templates/_user-thanosruler.yaml

@@ -1,4 +1,5 @@
 {{- define "ruler.ruler" }}
+---
 apiVersion: monitoring.coreos.com/v1
 kind: ThanosRuler
 metadata:

charts/user-monitoring/values.yaml

@@ -1,25 +1,31 @@
-user: user1
+user: userX # Replace me
 
 # alertmanager
 alertmanager:
-  enabled: true
+  enabled: false
 
 # grafana
 grafana:
+  datasources:
+  - name: prometheus
+    access: proxy
+    editable: false
+    type: prometheus
+    url: http://prometheus-operated.user4-monitoring.svc.cluster.local:9090
   enabled: true
 
 # prometheus
 prometheus:
-  enabled: true
+  enabled: false
 
-# pushgeitwey
+# pushgateway
 pushgateway:
-  enabled: true
+  enabled: false
 
 # thanos-ruler
 ruler:
-  enabled: true
+  enabled: false
 
 # thanos-query
 query:
-  enabled: true
+  enabled: false