Bump Chart version

apps/user-demo.yaml

@@ -0,0 +1,24 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: <user>-demo
+  namespace: argocd
+spec:
+  destination:
+    namespace: <user>
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    repoURL: 'https://gitea.training.cluster.acend.ch/<user>/prometheus-training-lab-setup'
+    path: charts/user-monitoring-demo/
+    targetRevision: main
+    helm:
+      values: |
+        user: <user>
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - Replace=true

apps/user-prom-stack.yaml

@@ -0,0 +1,42 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: <user>-prom-stack
+  namespace: argocd
+spec:
+  destination:
+    namespace: <user>-monitoring
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    repoURL: 'https://gitea.training.cluster.acend.ch/<user>/prometheus-training-lab-setup'
+    path: charts/user-monitoring/
+    targetRevision: main
+    helm:
+      values: |
+        user: <user>
+        # alertmanager
+        alertmanager:
+          enabled: false
+        # grafana
+        grafana:
+          enabled: false
+        # prometheus
+        prometheus:
+          enabled: false
+        # pushgateway
+        pushgateway:
+          enabled: false
+        # thanos-ruler
+        ruler:
+          enabled: false
+        # thanos-query
+        query:
+          enabled: false
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - Replace=true

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.3
+version: 0.2.5
 
 # 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-grafana-datasource-secret.yaml

@@ -18,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-basic-auth-secret.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 data:
   admin: JDEkSzNRZUlsOHAkZVZZb1h2RERNWk40b3RJT2tBc3AwLw== # $(openssl passwd -1 admin)
   {{ .Values.user }}: JDEkSzNRZUlsOHAkZVZZb1h2RERNWk40b3RJT2tBc3AwLw== # $(openssl passwd -1 admin)
+  grafana_user: {{ .Values.user }}
 kind: Secret
 metadata:
   labels:

charts/user-monitoring/values.yaml

@@ -6,7 +6,13 @@ alertmanager:
 
 # grafana
 grafana:
-  enabled: false
+  datasources:
+  - name: prometheus
+    access: proxy
+    editable: false
+    type: prometheus
+    url: http://prometheus-operated.user4-monitoring.svc.cluster.local:9090
+  enabled: true
 
 # prometheus
 prometheus:

user-umbrella.yaml

@@ -0,0 +1,21 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: <user>-umbrella
+  namespace: argocd
+spec:
+  destination:
+    namespace: argocd
+    server: https://kubernetes.default.svc
+  project: default
+  source:
+    repoURL: 'https://gitea.training.cluster.acend.ch/<user>/prometheus-training-lab-setup'
+    path: apps/
+    targetRevision: main
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - Replace=true