[main] Merge upstream prometheus/main to 33082be0e26d #1034
Conversation
…n samples outside range The funcResets and funcChanges functions now correctly return no result when all float samples are at or before the range start for anchored selectors, consistent with the behavior of rate/increase functions. Signed-off-by: Julien Pivotto <[email protected]>
Signed-off-by: Charles Korn <[email protected]>
docs: fix heading for `limitk` docs
promql: fix resets/changes to return empty for anchored selectors when samples outside range
…preparation Signed-off-by: Andrew Hall <[email protected]>
* register missing metric prometheus_tsdb_sample_ooo_delta Signed-off-by: yeya24 <[email protected]> * changelog Signed-off-by: yeya24 <[email protected]> --------- Signed-off-by: yeya24 <[email protected]>
PromQL: Allow for promql tests to consider expected fail message during query preparation
…t (#15864) * Add +Inf bucket in MetricFamiliesToWriteRequest if not present Signed-off-by: Clark McCauley <[email protected]>
This metric can be used to create alerting based on how many notifications finish or do not finish within a certain amount of time. Change-Id: afbf3d8ceb3994c7d6220389353cff92 Signed-Off-By: Kevin Hellemun <[email protected]> Co-authored-by: Björn Rabenstein <[email protected]> --------- Signed-off-by: Kevin Hellemun <[email protected]> Co-authored-by: Björn Rabenstein <[email protected]>
|
|
![mimir-vendoring[bot]](https://avatars.githubusercontent.com/u/7195757?s=60&v=4){kind=small}
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.
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
| if err := cmd.checkExpectedFailure(err); err == nil { | ||
| return nil | ||
| } | ||
| } |
There was a problem hiding this comment.
Bug: Generic error hides specific failure cause
When query creation fails and the test expects a failure, if checkExpectedFailure returns a non-nil error (indicating the actual error doesn't match expectations), the code falls through and returns a generic "error creating range query" message instead of the specific mismatch error from checkExpectedFailure. This loses information about why the failure didn't match. The error from checkExpectedFailure should be returned directly, similar to how it's handled at line 1444.
| if err := cmd.checkExpectedFailure(err); err == nil { | ||
| return nil | ||
| } | ||
| } |
There was a problem hiding this comment.
Bug: Generic error masks specific failure reasons.
When query creation fails and the test expects a failure, if checkExpectedFailure returns a non-nil error (indicating the actual error doesn't match expectations), the code falls through and returns a generic "error creating instant query" message instead of the specific mismatch error from checkExpectedFailure. This loses information about why the failure didn't match. The error from checkExpectedFailure should be returned directly, similar to how it's handled at line 1492.
mimir-vendoring
bot
deleted the
bot/main/merge-upstream-main-202511120019
branch
8 participants
Merge from prometheus/prometheus
This PR was automatically created by the merge-upstream-prometheus workflow
Details:
mainmain33082be0e26da431b9f724350bc4d9465561fc46Changes:
This PR merges the latest changes from the upstream prometheus/prometheus
mainbranch.Note
Adds Alertmanager notification latency histogram and metric cleanup, fixes PromQL anchored changes/resets and test harness, ensures +Inf bucket in histogram conversion, corrects TSDB OOO delta metric registration, and tweaks operator docs.
prometheus_notifications_latency_histogram_secondsand keep summary (latency_seconds); observe both and clean up per-Alertmanager metrics on removal.changes()/resets()viapickFirstSampleIndex(now returns found flag).extended_vectors.test.prometheus_tsdb_sample_ooo_delta.+Infbucket; add unit tests.limitk(waslimitk and limit_ratio).Written by Cursor Bugbot for commit d999872. This will update automatically on new commits. Configure here.