[main] Merge upstream prometheus/main to d0d2699dc5f4 #1038
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
Signed-off-by: beorn7 <[email protected]>
Signed-off-by: Laurent Dufresne <[email protected]>
…timestamp) (#17411) Relates to prometheus/prometheus#16944 (comment) Signed-off-by: bwplotka <[email protected]>
…label feature is on (#17546) * drop extra label from receiver Signed-off-by: pipiland2612 <[email protected]> * used constant Signed-off-by: pipiland2612 <[email protected]> --------- Signed-off-by: pipiland2612 <[email protected]>
Improve the repo sync logging output and add some additional logging. This should help debugging some failed updates. Signed-off-by: SuperQ <[email protected]>
… downstream projects (#17516) Methods added: - `SampleOffset(metric *labels.Labels) float64` to calculate the sample offset for a given label set. - `AddRatioSampleWithOffset(ratioLimit, sampleOffset float64) bool` to find out whether a given sample offset falls within a given ratio limit. The already existing method `AddRatioSample(ratioLimit float64, sample *Sample) bool` is now implemented as a simple combination of the two other methods. Exposing these methods helps downstream projects to re-use the implementations including easier testing. Signed-off-by: Andrew Hall <[email protected]>
…gging Improve repo sync script logging
cmd: Make feature flag `native-histograms` a no-op.
Signed-off-by: Gregoire Verdier <[email protected]>
Currently, iterating over histogram buckets can panic if the spans are not consistent with the buckets. We aim for validating histograms upon ingestion, but there might still be data corruptions on disk that could trigger the panic. While data corruption on disk is really bad and will lead to all kind of weirdness, we should still avoid panic'ing. Note, though, that chunks are secured by checksums, so the corruptions won't realistically happen because of disk faults, but more likely because a chunk was generated in a faulty way in the first place, by a software bug or even maliciously. This commit prevents panics in the situation where there are fewer buckets than described by the spans. Note that the missing buckets will simply not be iterated over. There is no signalling of this problem. We might still consider this separately, but for now, I would say that this kind of corruption is exceedingly rare and doesn't deserve special treatment (which will add a whole lot of complexity to the code). Signed-off-by: beorn7 <[email protected]>
…nd style check (#17557) Also improve find fallback to use -prune for better performance. Signed-off-by: Julien Pivotto <[email protected]>
model/histogram: Make histogram bucket iterators more robust
To reduce main UI clutter, I added a new settings submenu above the chart
itself for the new setting. So far it only has the one new axis setting, but it
could accommodate further settings in the future.
For now I'm only adding a boolean on/off setting to the UI to set the Y axis to
0 or not. However, the underlying stored URL field is already named
y_axis_min={number} and would support other Y axis minima, in case we want to
support custom values in the UI in the future - but then we'd probably also
want to add an axis maximum and possibly other settings.
Fixes prometheus/prometheus#520
Signed-off-by: Julius Volz <[email protected]>
Reduce the number of dependabot PRs for related udpdates. Signed-off-by: SuperQ <[email protected]>
…n (#17561) ReduceResolution is currently called before validation during ingestion. This will cause a panic if there are not enough buckets in the histogram. If there are too many buckets, the spurious buckets are ignored, and therefore the error in the input histogram is masked. Furthermore, invalid negative offsets might cause problems, too. Therefore, we need to do some minimal validation in reduceResolution. Fortunately, it is easy and shouldn't slow things down. Sadly, it requires to return errors, which triggers a bunch of code changes. Even here is a bright side, we can get rud of a few panics. (Remember: Don't panic!) In different news, we haven't done a full validation of histograms read via remote-read. This is not so much a security concern (as you can throw off Prometheus easily by feeding it bogus data via remote-read) but more that remote-read sources might be makeshift and could accidentally create invalid histograms. We really don't want to panic in that case. So this commit does not only add a check of the spans and buckets as needed for resolution reduction but also a full validation during remote-read. Signed-off-by: beorn7 <[email protected]>
* Add a nav title to fix docs website generator. * Make it more clear that "Prometheus Agent" is a mode, not a seaparate service. * Add to index. * Cleanup some wording. * Add a downsides section. Signed-off-by: SuperQ <[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-202511240238
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 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:
mainmaind0d2699dc5f454ebca53e56247281447f8dd8c5aChanges:
This PR merges the latest changes from the upstream prometheus/prometheus
mainbranch.Note
Adopts Remote Write v2 start_timestamp (removing series created_timestamp), hardens histogram handling to return errors (no panics) with callers updated, tweaks feature flags/docs, and adds a UI graph option to start Y‑axis at 0.
Sample.start_timestampandHistogram.start_timestamp; removeTimeSeries.created_timestamp(field reserved). Regenerated code, marshal/unmarshal, and size logic updated.start_timestampwhen ingesting ST-zero samples; handle OOO ST as before.__type__/__unit__duplicates when adding type/unit labels from metadata (tests added).ReduceResolutionnow returnserror; newmustReduceResolutionhelper; callers updated across scrape, remote appender, tsdb chunk decoders, WAL decoder, etc.--enable-feature=native-histogramsbecomes a no-op and removed from valid options; docs and migration notes updated accordingly.y_axis_min) and chart scales.github.com/aws/*andgithub.com/Azure/*Go modules.git ls-files(avoidvendor).Written by Cursor Bugbot for commit e7e27ae. This will update automatically on new commits. Configure here.