Vendor update mimir-prometheus at aa96f2e80ba9 #10168
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
Which is upstream Prometheus at b9dd95f499aa2912d9cfbcfddfbdd6bc0a5207a5
Mostly just annotation infos.
Signed-off-by: György Krajcsovits <[email protected]>
krajorama
added a commit
that referenced
this pull request
Dec 11, 2024
…12d74 (#10188) * Vendor update mimir-prometheus at 2cb07a115f0ccdd767d07e02e2cb4e29a7a24206 This is upstream at https://github.com/prometheus/prometheus/tree/af2a1cb10c89de496cd4309ac532624b34112d74 Changes listed in grafana/mimir-prometheus#787 * make generate-otlp * Sync upstream tests * Fix and improve changes/resets functions * fix(test): time functions ignore native histograms No need to test query sharding on time functions for native histograms since prometheus/prometheus#15479 . As those functions do not return samples on native histograms. * Update changelog retroactively Looked through changes from #10102, #10123, #10136, #10168, #10188 Signed-off-by: György Krajcsovits <[email protected]> Co-authored-by: Joshua Hesketh <[email protected]>
bjorns163
pushed a commit
to bjorns163/mimir
that referenced
this pull request
Dec 30, 2024
* Vendor update mimir-prometheus at aa96f2e80ba9 Which is upstream Prometheus at b9dd95f499aa2912d9cfbcfddfbdd6bc0a5207a5 * Do not use new limit in storage.NewMergeSeriesSet * MQE: Fix our test cases Mostly just annotation infos. * MQE: re-sync upstream tests * Update otlp * Update changelog Signed-off-by: György Krajcsovits <[email protected]> --------- Signed-off-by: György Krajcsovits <[email protected]> Co-authored-by: György Krajcsovits <[email protected]>
bjorns163
pushed a commit
to bjorns163/mimir
that referenced
this pull request
Dec 30, 2024
…12d74 (grafana#10188) * Vendor update mimir-prometheus at 2cb07a115f0ccdd767d07e02e2cb4e29a7a24206 This is upstream at https://github.com/prometheus/prometheus/tree/af2a1cb10c89de496cd4309ac532624b34112d74 Changes listed in grafana/mimir-prometheus#787 * make generate-otlp * Sync upstream tests * Fix and improve changes/resets functions * fix(test): time functions ignore native histograms No need to test query sharding on time functions for native histograms since prometheus/prometheus#15479 . As those functions do not return samples on native histograms. * Update changelog retroactively Looked through changes from grafana#10102, grafana#10123, grafana#10136, grafana#10168, grafana#10188 Signed-off-by: György Krajcsovits <[email protected]> Co-authored-by: Joshua Hesketh <[email protected]>
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.
Which is upstream Prometheus at b9dd95f499aa2912d9cfbcfddfbdd6bc0a5207a5
grafana/mimir-prometheus#786 has the relevant changes
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.