Merge

2023-08-10 10:24:32 +02:00
parent 94d348dca0
commit 9665fbc8a4
2 changed files with 15 additions and 2 deletions
--- 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)