[main] Merge upstream prometheus/main to 7bb95d548cf7 #1043
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
…7590) Signed-off-by: bwplotka <[email protected]>
Signed-off-by: ADITYA TIWARI <[email protected]>
…lete [BUGFIX] UI: Fixed codemirror-promql incorrectly showing label completion suggestions
Signed-off-by: Faustas Butkus <[email protected]>
The original implementation in #9705 for native histograms included a technical dept #15177 where samples were committed ordered by type not by their append order. This was fixed in #17071, but this docstring was not updated. I've also took the liberty to mention that we do not order by timestamp either, thus it is possible to append out of order samples. Signed-off-by: György Krajcsovits <[email protected]>
…le and re-enable it (#17490) Improve test stability by waiting for the relevant metrics to appear on /metrics before the first check on the desired shard count. Increase the scrape interval to avoid timeouts, as 100 ms may be insufficient for Prometheus to scrape itself in some environments (e.g., CI). Have Prometheus scrape itself multiple times to increase the volume of data sent and help fill the queue more quickly. Signed-off-by: machine424 <[email protected]>
…n a gauge histogram. (#17608) Signed-off-by: Andrew Hall <[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-202511270643
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 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:
mainmain7bb95d548cf7f0aa6fa5b76facfc8155f2ac5a4bChanges:
This PR merges the latest changes from the upstream prometheus/prometheus
mainbranch.Note
Normalizes histogramRate to always return Gauge-type histograms (with tests), stops label completions after closing matcher in the editor, re-enables/improves remote-write resharding test, and aligns schema label handling with common model constants.
histogramRate(...)to setCounterResetHinttoGaugeTypebefore returning inpromql/functions.go.promql/functions_internal_test.go).web/ui/module/.../hybrid.ts, avoid label suggestions when cursor is outsideLabelMatchers(e.g., just after}); add corresponding test case inhybrid.test.ts.TestRemoteWrite_ReshardingWithoutDeadlockincmd/prometheus/main_test.go(tweaked scrape interval, queue config, debug logging, helper to fetch metrics, and explicit checks for initial and scaled desired shards).github.com/prometheus/common/modellabel constants (MetricNameLabel,MetricTypeLabel,MetricUnitLabel) acrossschema/labels.goand its tests; clarify deprecation comment inmodel/labels/labels_common.go.promql/engine.go,storage/interface.go).Written by Cursor Bugbot for commit 0a3069d. This will update automatically on new commits. Configure here.