Merge upstream prometheus/prometheus at 31491eb #611
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
This should make it easier to test. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
So we can mock it. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Test fails due to bug in code on main. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Signed-off-by: tdakkota <tanc13@yandex.ru>
Release 2.51: Cherry-pick #13803 bugfix for label_join
Restrict the capacity of first argument to `append()` to force an allocation. This is for the slice implementation only. Signed-off-by: Domantas Jadenkus <djadenkus@gmail.com>
Azure Discovery tests: Add test for mapping VMs to labels
Restrict the capacity of first argument to `append()` to force an allocation. This is for the slice implementation only. Signed-off-by: Domantas Jadenkus <djadenkus@gmail.com> Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
* fix the bug of setting native histogram min bucket factor Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> * Add unit test for checking that min_bucket_factor is correctly applied Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> --------- Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
* fix the bug of setting native histogram min bucket factor Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> * Add unit test for checking that min_bucket_factor is correctly applied Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> --------- Signed-off-by: Ziqi Zhao <zhaoziqi9146@gmail.com> Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com> Co-authored-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
…td dev/var Signed-off-by: Jeanette Tan <jeanette.tan@grafana.com>
Fix hist std dev var negative
Release 2.51: Cherry-pick #13845 bugfix for DropMetricName
Release 2.51: Cherry pick #13846 fix the bug of setting native histogram min bucket factor
The definition of histograms in the test framework may create histograms in a non-compact form. Since histogram comparison relies on exact equality of the bucket layout, we have to compact the histograms created by the test framework language before comparing them to histograms returned from the PromQL engine. Signed-off-by: beorn7 <beorn@grafana.com>
Signed-off-by: beorn7 <beorn@grafana.com>
* Cut release 2.51.1 Co-authored-by: George Krajcsovits <krajorama@users.noreply.github.com> Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
This was an unintentional effect of splitting out Go tests into multiple parallel blocks. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
promql: Fix histogram comparison in test framework
Note that we have delayed v2.52 by a week to avoid collisions with events and travels. Signed-off-by: beorn7 <beorn@grafana.com>
Appoint release shepherds for v2.52 and v2.53
Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com>
…OOChunks-struct [refactor] moving mergedOOOChunks to ooo_head_read
CI: Publish step should require all Go tests to pass
Signed-off-by: carehabit <shenyuting@outlook.com>
Merge 2.51.1 into main
prometheus/prometheus#13446 removed the last usage of this field, but didn't remove the field. Signed-off-by: Julius Volz <julius.volz@gmail.com>
Signed-off-by: Nicolas Takashi <nicolas.tcs@hotmail.com>
…y fails or an unexpected series is returned (#13847) * promql: include more details in error message when creating test query fails Signed-off-by: Charles Korn <charles.korn@grafana.com> * Include more details when an unexpected metric is returned Signed-off-by: Charles Korn <charles.korn@grafana.com> --------- Signed-off-by: Charles Korn <charles.korn@grafana.com>
The strings produced by these tests can run to thousands of characters, which makes test logs difficult to read. Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
[TESTS] Truncate some long test names, for readability
…pstream # Conflicts: # .github/workflows/ci.yml # model/labels/regexp_test.go # promql/engine_test.go # tsdb/db.go
|
|
pracucci
approved these changes
Apr 4, 2024
Agree. One day™️ I'd love it if these updates were automated (or if we can do away with this repo entirely and just use upstream, but I know that requires a bit of work to achieve). |
1 task
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 includes the following changes, none of which seem concerning for Mimir:
Bug fixes:
Refactoring and tidy up:
Changes that don't affect Mimir:
Non-production changes: