Resolve conflict

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.0
+version: 0.1.3
 
 # 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

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

@@ -3,20 +3,23 @@ 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
-  enableAdminAPI: false
-  storage:
-    volumeClaimTemplate:
-      spec:
-        resources:
-          requests:
-            storage: 2Gi
+  enableAdminAPI: true
+  externalLabels:
+    monitoring: {{ .Values.user }}