Fixes Argo App Setup

apps/user-prom-stack.yaml

@@ -16,24 +16,6 @@ spec:
     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/values.yaml

@@ -1,7 +1,11 @@
-user: userX # Replace me
+user: <user> # Replace me
 
-# alertmanager
-alertmanager:
+# prometheus
+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
-  enabled: true
-
-# prometheus
-prometheus:
+    url: http://prometheus-operated.<user>-monitoring.svc.cluster.local:9090
   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 @@
+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>-app-of-apps
-  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