diff --git a/apps/user-prom-stack.yaml b/apps/user-prom-stack.yaml index 7bbc4d8..359ceae 100644 --- a/apps/user-prom-stack.yaml +++ b/apps/user-prom-stack.yaml @@ -16,24 +16,6 @@ spec: helm: values: | 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 diff --git a/charts/user-monitoring/values.yaml b/charts/user-monitoring/values.yaml index f86eced..24fd53b 100644 --- a/charts/user-monitoring/values.yaml +++ b/charts/user-monitoring/values.yaml @@ -1,7 +1,11 @@ -user: userX # Replace me +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.-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 \ No newline at end of file + \ No newline at end of file diff --git a/user-demo/README.md b/user-demo/README.md new file mode 100644 index 0000000..e48464c --- /dev/null +++ b/user-demo/README.md @@ -0,0 +1 @@ +This is the location for the user demo app \ No newline at end of file diff --git a/user-umbrella.yaml b/user-umbrella.yaml deleted file mode 100644 index 26951d3..0000000 --- a/user-umbrella.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: -app-of-apps - namespace: argocd -spec: - destination: - namespace: argocd - server: https://kubernetes.default.svc - project: default - source: - repoURL: 'https://gitea.training.cluster.acend.ch//prometheus-training-lab-setup' - path: apps/ - targetRevision: main - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - Replace=true \ No newline at end of file