From a3c5a8dbcf908382af87d257691d6baabdf9ac3b Mon Sep 17 00:00:00 2001
From: Mayne0213 <bluemayne0213@icloud.com>
Date: Fri, 9 Jan 2026 23:39:30 +0900
Subject: [PATCH] CHORE(prometheus): disable direct scraping

- Disable ServiceMonitor/PodMonitor scraping in Prometheus
- OTel Collector now handles all metrics collection
- Prevents out-of-order sample errors from duplicate scraping
---
 prometheus/helm-values.yaml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/prometheus/helm-values.yaml b/prometheus/helm-values.yaml
index 144dedb..a3ec233 100644
--- a/prometheus/helm-values.yaml
+++ b/prometheus/helm-values.yaml
@@ -84,11 +84,16 @@ prometheus:
       limits:
         memory: 768Mi
     
-    # ServiceMonitor selector - scrape all ServiceMonitors
+    # ServiceMonitor selector - disable direct scraping (OTel handles it)
+    # Set to non-existent label to effectively disable
     serviceMonitorSelectorNilUsesHelmValues: false
-    serviceMonitorSelector: {}
+    serviceMonitorSelector:
+      matchLabels:
+        prometheus-scrape: "direct"  # No ServiceMonitors have this label
     podMonitorSelectorNilUsesHelmValues: false
-    podMonitorSelector: {}
+    podMonitorSelector:
+      matchLabels:
+        prometheus-scrape: "direct"  # No PodMonitors have this label
     probeSelectorNilUsesHelmValues: false
     ruleSelector: {}