From c02e80c2a648e909933c6af2795297309d5c8acc Mon Sep 17 00:00:00 2001 From: shimoncohen Date: Thu, 17 Sep 2026 15:16:53 +0300 Subject: [PATCH 1/2] fix(helm): enable alloy log scraping for merger pods (MAPCO-11741) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merger pods carried no mapcolonies.io/* labels, so grafana-alloy (which discovers pods by mapcolonies.io/alloy-api-logs=true) never collected their logs into Loki — blocking per-task investigation. - Add gpkg-merger.labels to the pod template metadata.labels; the pod template only had selectorLabels and mclabels.selectorLabels is empty, so mclabels.labels (which emits alloy-api-logs) never reached the pod. Deployment metadata labels do not propagate to pods. - Set mclabels.logScraping: true so the label renders as "true". Verified via helm template: pod now carries mapcolonies.io/alloy-api-logs=true. Chart version is bumped by release-please. Co-Authored-By: Claude Opus 4.8 (1M context) --- helm/templates/deployment.yaml | 1 + helm/values.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml index 54555aa..4aa0e9e 100644 --- a/helm/templates/deployment.yaml +++ b/helm/templates/deployment.yaml @@ -46,6 +46,7 @@ spec: release: {{ $releaseName }} run: {{ $releaseName }}-{{ $chartName }} {{- include "gpkg-merger.selectorLabels" . | nindent 8 }} + {{- include "gpkg-merger.labels" . | nindent 8 }} annotations: {{ include "mclabels.annotations" . | nindent 8 }} {{- if .Values.resetOnConfigChange }} diff --git a/helm/values.yaml b/helm/values.yaml index a1f3806..d060365 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -39,6 +39,7 @@ mclabels: partOf: ingestion owner: raster gisDomain: raster + logScraping: true prometheus: enabled: true port: 8080 From da572136617fd5a9a25805f5d64c53e6856a4b5f Mon Sep 17 00:00:00 2001 From: shimoncohen Date: Thu, 17 Sep 2026 15:31:56 +0300 Subject: [PATCH 2/2] fix(helm): default mclabels.logScraping to false Keep merger log scraping opt-in. The pod now carries the mapcolonies.io/alloy-api-logs label (from the previous commit); enable collection per-environment via a values override rather than on by default. Co-Authored-By: Claude Opus 4.8 (1M context) --- helm/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/values.yaml b/helm/values.yaml index d060365..f2ed98e 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -39,7 +39,7 @@ mclabels: partOf: ingestion owner: raster gisDomain: raster - logScraping: true + logScraping: false prometheus: enabled: true port: 8080