Fix thanos store setup

apps/user-demo.yaml

@@ -11,11 +11,8 @@ spec:
   project: default
   source:
     repoURL: 'https://gitea.training.cluster.acend.ch/<user>/prometheus-training-lab-setup'
-    path: charts/user-monitoring-demo/
+    path: user-demo/
     targetRevision: main
-    helm:
-      values: |
-        user: <user>
   syncPolicy:
     automated:
       prune: true

apps/user-prom-stack.yaml

@@ -13,27 +13,6 @@ spec:
     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

charts/user-monitoring-stack/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/user-monitoring-stack/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: kube-prometheus-stack
+  repository: https://prometheus-community.github.io/helm-charts
+  version: 51.5.3
+digest: sha256:8e25b83cde5acfd903c3e45f30b9ae28201f9dd68daab1aeca709f1185608916
+generated: "2023-10-12T13:25:38.219319684+02:00"

charts/user-monitoring-stack/Chart.yaml

@@ -0,0 +1,29 @@
+apiVersion: v2
+name: user-monitoring-stack
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+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
+
+# 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
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"
+dependencies:
+- name: kube-prometheus-stack
+  condition: promstack.enabled
+  version: "51.5.3"
+  repository: "https://prometheus-community.github.io/helm-charts"

charts/user-monitoring-stack/values.yaml

@@ -0,0 +1,73 @@
+promstack:
+  enabled: true
+
+kube-prometheus-stack:
+  prometheus:
+    enabled: true
+    prometheusSpec:
+      resources:
+        requests:
+          cpu: 100m
+          memory: 400Mi
+      scrapeInterval: 60s
+      serviceMonitorNamespaceSelector:
+        matchLabels:
+          user: <user>
+      serviceMonitorSelector: {}
+      podMonitorNamespaceSelector:
+        matchLabels:
+          user: <user>
+      podMonitorSelector: {}
+      probeNamespaceSelector:
+        matchLabels:
+          user: <user>
+      ruleSelectorNilUsesHelmValues: false
+      serviceMonitorSelectorNilUsesHelmValues: false
+      podMonitorSelectorNilUsesHelmValues: false
+      probeSelectorNilUsesHelmValues: false
+    serviceAccount:
+      create: true
+      name: "prometheus-<user>"
+  grafana:
+    enabled: false
+  alertmanager:
+    enabled: false
+  
+  kubernetesServiceMonitors:
+    enabled: false
+  
+
+
+# not relevant for the lab
+  crds:
+    enabled: false
+  kubeProxy:
+    enabled: false 
+  kubeScheduler:
+    enabled: false
+  kubeControllerManager:
+    enabled: false 
+  kubeEtcd:
+    enabled: false 
+  kubeApiServer:
+    enabled: false
+  kubelet:
+    enabled: false
+  coreDns:
+    enabled: false
+  kubeStateMetrics:
+    enabled: false
+  nodeExporter:
+    enabled: false
+  prometheusOperator:
+    enabled: false
+  kubeletService:
+    enabled: false
+  defaultRules:
+    create: false
+
+
+global:
+  rbac:
+    create: false
+    createAggregateClusterRoles: false

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

@@ -7,7 +7,7 @@ metadata:
     app.kubernetes.io/name: prometheus
   name: prometheus
 spec:
-  scrapeInterval: 10s
+  scrapeInterval: 60s
   serviceAccountName: prometheus-{{ .Values.user }}
   serviceMonitorNamespaceSelector:
     matchLabels:

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

@@ -26,6 +26,7 @@ spec:
         - --endpoint=prometheus-operated.{{ .Values.user }}-monitoring.svc.cluster.local:10901
         - --endpoint=thanos-ruler-operated.{{ .Values.user }}-monitoring.svc.cluster.local:10901
         - --endpoint=prometheus-operated.monitoring.svc.cluster.local:10901
+        - --store=dnssrv+_grpc._tcp.kube-prometheus-stack-thanos-discovery.monitoring.svc.cluster.local
         - --store.unhealthy-timeout=3d
         image: quay.io/thanos/thanos:v0.25.1
         name: thanos-query

charts/user-monitoring/templates/user-basic-auth-secret.yaml

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

charts/user-monitoring/values.yaml

@@ -1,7 +1,11 @@
-user: userX # Replace me
+user: <user> # Replace me
 
-# alertmanager
+# prometheus
-alertmanager:
+prometheus:
+  enabled: false
+
+# thanos-query
+query:
   enabled: false
 
 # grafana
@@ -11,21 +15,18 @@ grafana:
     access: proxy
     editable: false
     type: prometheus
-    url: http://prometheus-operated.user4-monitoring.svc.cluster.local:9090
+    url: http://prometheus-operated.<user>-monitoring.svc.cluster.local:9090
-  enabled: true
-
-# prometheus
-prometheus:
   enabled: false
 
 # pushgateway
 pushgateway:
   enabled: false
 
+# alertmanager
+alertmanager:
+  enabled: false
+
 # thanos-ruler
 ruler:
   enabled: false
   
-# thanos-query
-query:
-  enabled: false

user-demo/README.md

@@ -0,0 +1,3 @@
+# Readme
+
+This is the location for the user demo app.

user-umbrella.yaml

@@ -1,21 +0,0 @@
----
-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