[main] Merge upstream prometheus/main to b0649e08c439 #1044
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
- No duration unit suggestions shown if a valid unit follows the digit (e.g. , ) - Adds related test cases Signed-off-by: ADITYA TIWARI <[email protected]>
Refactor duration regex to match complete durations with units. Signed-off-by: ADITYA TIWARI <[email protected]>
Added tests for durationWithUnitRegexp to validate matching of complete durations with units and ensure non-matching cases are correctly identified. Signed-off-by: ADITYA TIWARI <[email protected]>
Signed-off-by: ADITYA TIWARI <[email protected]>
…d compound duration test cases Signed-off-by: ADITYA TIWARI <[email protected]>
Signed-off-by: ADITYA TIWARI <[email protected]>
Removed polyfill for RegExp.escape and updated duration regex. Signed-off-by: ADITYA TIWARI <[email protected]>
…maries (#17374) This adds the following native histograms (with a few classic buckets for backwards compatibility), while keeping the corresponding summaries (same name, just without `_histogram`): - `prometheus_sd_refresh_duration_histogram_seconds` - `prometheus_rule_evaluation_duration_histogram_seconds` - `prometheus_rule_group_duration_histogram_seconds` - `prometheus_target_sync_length_histogram_seconds` - `prometheus_target_interval_length_histogram_seconds` - `prometheus_engine_query_duration_histogram_seconds` Signed-off-by: Harsh <[email protected]> Signed-off-by: harsh kumar <[email protected]> Co-authored-by: Björn Rabenstein <[email protected]>
This is ignored as of go 1.17, see e.g., for reference https://go.dev/blog/go116-module-changes Signed-off-by: Solomon Jacobs <[email protected]>
[BUGFIX] UI :Suppress duration unit autocomplete when unit already present in query selector
…sets (#17620) Signed-off-by: Nikos Angelopoulos <[email protected]>
|
|
![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-202512010249
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 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:
mainmainb0649e08c4391c68009266779154adc72085d8ccChanges:
This PR merges the latest changes from the upstream prometheus/prometheus
mainbranch.Note
Adds native histogram metrics for key durations across engine/rules/SD/scrape, improves PromQL editor duration autocomplete, introduces explicit duplicate labelset errors, and tweaks README build instructions.
*_histogram_secondsfor durations:promqlengine:query_duration_histogram_secondsfor queue/prepare/inner_eval/result_sort; observe in code paths.rule_evaluation_duration_histogram_seconds,rule_group_duration_histogram_seconds; observe on eval/iteration.prometheus_sd_refresh_duration_histogram_seconds; observe on refresh.prometheus_target_sync_length_histogram_seconds,prometheus_target_interval_length_histogram_seconds; register/unregister and observe.durationWithUnitRegexp; extend tests.ErrDuplicateAlertLabelSetandErrDuplicateRecordingLabelSet; update tests to userequire.ErrorIs.discovery.RefreshMetricsand observe on each refresh.go installcommand (removeGO111MODULE=on).Written by Cursor Bugbot for commit 4337971. This will update automatically on new commits. Configure here.