Cherry-pick three fixes from upstream #705
Merged
Conversation
This file contains 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
…-division promql: correctly handle unary negation of native histograms and add tests for multiplication and division of native histograms by negative scalars Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
* Make rate possible non-counter annotation consistent
Previously a PossibleNonCounterInfo annotation would be left in cases
where a range-vector selects 1 float data point, even if no more points
are selected in order to calculate a rate.
This change ensures an output float exists before emitting such an
annotation.
This fixes an inconsistency where a series with mixed data (ie, a float
and a native histogram) would emit an annotation without any points.
For example,
```
load 1m
series{label="a"} 1 {{schema:1 sum:10 count:5 buckets:[1 2 3]}}
eval instant at 1m rate(series[1m1s])
```
Would have a PossibleNonCounterInfo annotation.
Wheras
```
load 1m
series{label="a"} {{schema:1 sum:10 count:5 buckets:[1 2 3]}} {{schema:1 sum:15 count:10 buckets:[1 2 3]}}
eval instant at 1m rate(series[1m1s])
```
Would not.
---------
Signed-off-by: Joshua Hesketh <josh@nitrotech.org>
# Conflicts:
# CHANGELOG.md
…m-format promqltest: use test expression format for histograms in assertion failure messages and include reset hint in the test expression
jhesketh
approved these changes
Oct 3, 2024
1 task
charleskorn
added a commit
to grafana/mimir
that referenced
this pull request
Oct 3, 2024
charleskorn
added a commit
to grafana/mimir
that referenced
this pull request
Oct 4, 2024
charleskorn
added a commit
to grafana/mimir
that referenced
this pull request
Oct 4, 2024
* Update to latest mimir-prometheus * Add changelog entries * Address PR feedback: improve changelog entries Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com> * Fix breaking change * Bring in grafana/mimir-prometheus#705 too * Adjust behaviour to match prometheus/prometheus#14821 * Re-enable tests now that we have prometheus/prometheus#14910 * Add more changelog entries --------- Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR cherry-picks three fixes from upstream that are currently stuck behind the pending Prometheus v3 merge that we don't yet want to do: