[main] Merge upstream prometheus/main to 0093e2159e47 #1030
Conversation
This file contains hidden or 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
This adds: * A `ScrapePoolConfig()` method to the scrape manager that allows getting the scrape config for a given pool. * An API endpoint at `/api/v1/targets/relabel_steps` that takes a pool name and a label set of a target and returns a detailed list of applied relabeling rules and their output for each step. * A "show relabeling" link/button for each target on the discovery page that shows the detailed flow of all relabeling rules (based on the API response) for that target. Note that this changes the JSON encoding of the relabeling rule config struct to output the original snake_case (instead of camelCase) field names, and before merging, we need to be sure that's ok :) See my comment about that at prometheus/prometheus#15383 (comment) Fixes prometheus/prometheus#17283 Signed-off-by: Julius Volz <[email protected]>
…r to prioritize type-and-unit-labels feature (#17387) * fix Signed-off-by: pipiland2612 <[email protected]> * fix nits & update docs Signed-off-by: pipiland2612 <[email protected]> * fix docs Signed-off-by: pipiland2612 <[email protected]> --------- Signed-off-by: pipiland2612 <[email protected]>
* add feature flag for remote write v2 Signed-off-by: pipiland2612 <[email protected]> * change from number to protobuf_message Signed-off-by: pipiland2612 <[email protected]> * fix test Signed-off-by: pipiland2612 <[email protected]> * fix name Signed-off-by: pipiland2612 <[email protected]> * run make cli-documentation Signed-off-by: pipiland2612 <[email protected]> * fix help Signed-off-by: pipiland2612 <[email protected]> * run make cli-documentation Signed-off-by: pipiland2612 <[email protected]> --------- Signed-off-by: pipiland2612 <[email protected]>
ui: Allow viewing detailed relabeling steps for each discovered target
|
|
![mimir-vendoring[bot]](https://avatars.githubusercontent.com/u/7195757?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
I'm approving this upstream merge PR.
This PR merges changes from prometheus/prometheus upstream repository.
Related GitHub action is defined here.
mimir-vendoring
bot
deleted the
bot/main/merge-upstream-main-202511030236
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Merge from prometheus/prometheus
This PR was automatically created by the merge-upstream-prometheus workflow
Details:
mainmain0093e2159e47568b9ce00df5d0041cfa4e70b35bChanges:
This PR merges the latest changes from the upstream prometheus/prometheus
mainbranch.