Skip to content

fix(helm): avoid double zonal ingester scrapping by not scrapping headless svc - #19000

Merged
JStickler merged 2 commits into
grafana:mainfrom
antonincms:fix-zonal-ingester-metrics-double-scrapping
Sep 3, 2025
Merged

fix(helm): avoid double zonal ingester scrapping by not scrapping headless svc#19000
JStickler merged 2 commits into
grafana:mainfrom
antonincms:fix-zonal-ingester-metrics-double-scrapping

Conversation

@antonincms

@antonincms antonincms commented Aug 25, 2025

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:

Fix zonal ingester being scrapped twice when using ServiceMonitor.

Which issue(s) this PR fixes:
Fixes #18996

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR
@antonincms
antonincms requested a review from a team as a code owner August 25, 2025 12:55
@CLAassistant

CLAassistant commented Aug 25, 2025

Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@antonincms
antonincms force-pushed the fix-zonal-ingester-metrics-double-scrapping branch 2 times, most recently from 3dd36b4 to c7f406c Compare August 25, 2025 12:57
@JStickler JStickler changed the title fix: avoid double zonal ingester scrapping by not scrapping headless svc Aug 25, 2025
@antonincms

Copy link
Copy Markdown
Contributor Author

Thanks for running the CI @JStickler. I have the impression that "Claude Code Review" job fails for a reason unrelated to this PR: it fails pulling the token, probably because this PR come from a fork.

@JStickler

Copy link
Copy Markdown
Contributor

@antonincms yes, that's exactly why the Claude check is failing; forks don't have access to our secrets in Vault. The Claude check was introduced last week, and still needs to be adjusted. You don't need to worry about it, it's not part of the failCheck (that is, it's not a blocker).

@TheRealNoob

Copy link
Copy Markdown
Contributor

LGTM. Thank you very much!

@antonincms
antonincms force-pushed the fix-zonal-ingester-metrics-double-scrapping branch from c7f406c to fcf0b57 Compare August 28, 2025 09:27
@antonincms
antonincms force-pushed the fix-zonal-ingester-metrics-double-scrapping branch from fcf0b57 to 90070dd Compare August 28, 2025 09:28
@antonincms

Copy link
Copy Markdown
Contributor Author

Just rebased my PR onto main, I think it should be ok now.

Signed-off-by: Jay Clifford <45856600+Jayclifford345@users.noreply.github.com>

@Jayclifford345 Jayclifford345 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@JStickler
JStickler merged commit 350d46c into grafana:main Sep 3, 2025
80 checks passed
felix0102 pushed a commit to felix0102/loki that referenced this pull request Aug 2, 2026
…dless svc (grafana#19000)

Signed-off-by: Jay Clifford <45856600+Jayclifford345@users.noreply.github.com>
Co-authored-by: Jay Clifford <45856600+Jayclifford345@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

5 participants