fix: annotation scraping - scrape_port_named_metrics and metrics.grafana.com/port #50
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adamhackl
changed the title
tim-shane
requested review from
erikbaranowski,
mattdurham and
bentonam
as code owners
mattdurham
reviewed
Dec 5, 2024
| regex = "^(?:;*)?(true)(;|true)*$" | ||
| replacement = "$1" | ||
| // set to false if any of the endpoint or service annotations are scrape: false | ||
| regex = "^.*(?i)(false).*$" |
There was a problem hiding this comment.
Will defer to @bentonam for this change.
|
I think this PR needs some more work after testing with it. The |
adamhackl
force-pushed
the
fix-annotation-scraping
branch
from
bd6811f to
a384ca1
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
2 fixes in modules/kubernetes/annotations/metrics.alloy
__tmp_scrapeis default set tofalse, but the next step watches formetrics.grafana.com/scrapeto be blank ortrueand then makes the value of__tmp_scrape=true. So__tmp_scrapewould never be blank. But the step that runs if the attributescrape_port_named_metrics=trueonly runs if__tmp_scrapeis true or blank. The point of that attribute is to scrape any port that contains the wordmetricsin its name, regardless of themetrics.grafana.com/scrapeattribute, but it was not working that way since it could never be blank. We only want that step to not run ifmetrics.grafana.com/scrape=false, which it is now only set to__tmp_scrapeif the attribute is set to false, not just by default.metrics.grafana.com/portto be set to override the__address__port had an additional source label added to it when it was copied from grafana-agent-modules, but the regex was not adjusted to account for the additional label, so the step would never work.