Merge release-2.11 to main #6963
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
…6790) * Use BucketIndexBlocksFinder instead of BucketScanBlocksFinder The use of BucketScanBlocksFinder was supposed to be removed in #6673 but its counterpart BucketIndexBlocksFinder was accidentally removed instead. This reverses that. * Remove BlocksFinderBucketScan * Update docs wrt. bucket scanning option * Remove alert and runbook for bucket scanning (cherry picked from commit ff8a70a) Co-authored-by: Justin Lei <lei.justin@gmail.com>
* Draft release notes for 2.11 * Apply suggestions from code review Co-authored-by: Charles Korn <charleskorn@users.noreply.github.com> * More code review responses * More mode code review responses * Update docs/sources/mimir/release-notes/v2.11.md Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * More more more code review responses --------- Co-authored-by: Charles Korn <charleskorn@users.noreply.github.com> Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
This also adds a bit more details for how to use the feature. Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> (cherry picked from commit f52486a) Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
…e bucket (#6812) * store-gateway: use bucket index instead of scanning the bucket This is a follow-up to 6673, similar change to 6779 Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix TestStoreGateway_InitialSyncFailure Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix TestStoreGateway_InitialSyncWithDefaultShardingEnabled Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix TestBucketStores_SyncBlocks Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix TestBucketStores_InitialSyncShouldRetryOnFailure Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix TestBucketStores_InitialSync Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix TestBucketStores_Series_ShouldCorrectlyQuerySeriesSpanningMultipleChunks Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix TestBucketStore_Series_ShouldQueryBlockWithOutOfOrderChunks Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix TestBucketStores_deleteLocalFilesForExcludedTenants Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix TestStoreGateway_SyncShouldKeepPreviousBlocksIfInstanceIsUnhealthyInTheRing Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix TestStoreGateway_SeriesQueryingShouldEnforceMaxChunksPerQueryLimit Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix read-write mode integration tests Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Clean up users in integration tests more often Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Update CHANGELOG.md Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix TestGettingStartedWithGossipedRing Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Fix Test_MaxSeriesAndChunksPerQueryLimitHit Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Remove debug option Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> --------- Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> (cherry picked from commit 1a459bb) Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
…6818) * querier: default to using batch.NewChunkMergeIterator This is a follow-up of 6673 Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Update CHANGELOG.md Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Remove configurability of chunkIteratorFunc Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Remove configurability of chunkIteratorFunc in streaming code Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Remove unnecessary type declaration Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> --------- Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> (cherry picked from commit e09acc9) Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Sync to the newly created mimir-release-2.11 branch that includes grafana/mimir-prometheus#572 Signed-off-by: György Krajcsovits <gyorgy.krajcsovits@grafana.com>
Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> (cherry picked from commit a5badbb) Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
* Update 2.10 changelog and release notes Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> * Update CHANGELOG.md --------- Signed-off-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com> (cherry picked from commit 9bb55ff) Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
#6956) * Fix .metricsUsed in mimirtool analyze rule-file (#6953) * Fix .metricsUsed in mimirtool analyze rule-file This field wasn't populated. Fixes #6952 Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com> * Update CHANGELOG.md Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com> * make license Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com> --------- Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com> (cherry picked from commit 6a7bee2) Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com> * Update release notes Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com> --------- Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
* Add mark-blocks tool to release notes * Update VERSION to 2.11.0-rc.0
leizor
force-pushed
the
merge-release-2.11-to-main
branch
2 times, most recently
from
fa13c33
to
644d913
Compare
leizor
force-pushed
the
merge-release-2.11-to-main
branch
from
644d913
to
a26d64a
Compare
I'm not sure--maybe we don't do that until the main release? I was following the instruction here: https://github.com/grafana/mimir/blob/main/tools/release/create-pr-to-merge-release-branch-to-main.sh#L63 |
|
ah, thanks for pointing this out. I would trust the process 😄 |
dimitarvdimitrov
approved these changes
Dec 19, 2023
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.
#6670
In this PR I'm merging the release-2.11 branch to main branch. Please merge this PR using a merge commit or by using
tools/release/merge-approved-pr-branch-to-main.shscript.