fix: Double scraping with servicemonitor due to headless service (#2967)

* fix: Double scraping with servicemonitor due to headless service * fix: Always add match expression in servicemonitor Co-authored-by: Anton Kolesnikov <anton.e.kolesnikov@gmail.com> --------- Co-authored-by: Anton Kolesnikov <anton.e.kolesnikov@gmail.com>
grafana · Jan 26, 2024 · ba9d6e7 · ba9d6e7
1 parent bf110f5
commit ba9d6e7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/operations/pyroscope/helm/pyroscope/templates/servicemonitor.yaml b/operations/pyroscope/helm/pyroscope/templates/servicemonitor.yaml
@@ -29,8 +29,12 @@ spec:
     matchLabels:
       {{- include "pyroscope.selectorLabels" . | nindent 6 }}
       app.kubernetes.io/component: {{ $component | quote }}
-    {{- with $serviceMonitor.matchExpressions }}
     matchExpressions:
+      - key: prometheus.io/service-monitor
+        operator: NotIn
+        values:
+          - "false"
+    {{- with $serviceMonitor.matchExpressions }}
       {{- toYaml . | nindent 6 }}
     {{- end }}
   endpoints:

diff --git a/operations/pyroscope/helm/pyroscope/templates/services.yaml b/operations/pyroscope/helm/pyroscope/templates/services.yaml
@@ -34,6 +34,9 @@ metadata:
   labels:
     {{- include "pyroscope.labels" . | nindent 4 }}
     app.kubernetes.io/component: {{ $component | quote }}
+    {{- if .Values.serviceMonitor.enabled }}
+    prometheus.io/service-monitor: "false"
+    {{- end }}
 spec:
   type: ClusterIP
   clusterIP: None