From 9665fbc8a4d6807ebb0d5e498aa81a08e1dfca50 Mon Sep 17 00:00:00 2001 From: Raffael H Date: Thu, 10 Aug 2023 10:24:32 +0200 Subject: [PATCH] Merge --- charts/user-monitoring/Chart.yaml | 2 +- .../templates/user-prometheus.yaml | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/charts/user-monitoring/Chart.yaml b/charts/user-monitoring/Chart.yaml index 6af603b..f4f6fda 100644 --- a/charts/user-monitoring/Chart.yaml +++ b/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.1.1 +version: 0.1.2 # 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 diff --git a/charts/user-monitoring/templates/user-prometheus.yaml b/charts/user-monitoring/templates/user-prometheus.yaml index 49ef040..aead9f1 100644 --- a/charts/user-monitoring/templates/user-prometheus.yaml +++ b/charts/user-monitoring/templates/user-prometheus.yaml @@ -3,14 +3,27 @@ kind: Prometheus metadata: name: prometheus spec: + scrapeInterval: 10s serviceAccountName: prometheus-{{ .Values.user }} serviceMonitorNamespaceSelector: matchLabels: user: {{ .Values.user }} - serviceMonitorSelector: + serviceMonitorSelector: {} + podMonitorNamespaceSelector: matchLabels: user: {{ .Values.user }} + podMonitorSelector: {} + probeNamespaceSelector: + matchLabels: + user: {{ .Values.user }} + probeSelector: {} resources: requests: memory: 400Mi +<<<<<<< HEAD enableAdminAPI: false +======= + enableAdminAPI: true + externalLabels: + monitoring: {{ .Values.user }} +>>>>>>> 2acef0e (Update prometheus config)