Cherry-pick fixes to release 1.15 branch #5241
Merged
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
* Batch Opmization Signed-off-by: Alan Protasio <alanprot@gmail.com> * Add test bacj Signed-off-by: Alan Protasio <alanprot@gmail.com> * Testing Multiples scrape intervals Signed-off-by: Alan Protasio <alanprot@gmail.com> * no assimption Signed-off-by: Alan Protasio <alanprot@gmail.com> * Using max chunk ts Signed-off-by: Alan Protasio <alanprot@gmail.com> * test with scrape 10 Signed-off-by: Alan Protasio <alanprot@gmail.com> * rename method Signed-off-by: Alan Protasio <alanprot@gmail.com> * comments Signed-off-by: Alan Protasio <alanprot@gmail.com> * using next Signed-off-by: Alan Protasio <alanprot@gmail.com> * change test name Signed-off-by: Alan Protasio <alanprot@gmail.com> * changelog/comments Signed-off-by: Alan Protasio <alanprot@gmail.com> --------- Signed-off-by: Alan Protasio <alanprot@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com>
…ect#5239) * Convert following metrics from summary to histogram cortex_bucket_store_series_blocks_queried cortex_bucket_store_series_data_fetched cortex_bucket_store_series_data_size_touched_bytes cortex_bucket_store_series_data_size_fetched_bytes cortex_bucket_store_series_data_touched cortex_bucket_store_series_result_series Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> * Update changelog Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> * fix changelog Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> --------- Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Ben Ye <benye@amazon.com>
yeya24
force-pushed
the
release-1.15.0-rc1
branch
from
4ce95a7 to
3e66504
Compare
|
This one is very important.. #5240 |
friedrichg
approved these changes
Mar 31, 2023
|
Sure I will also include that one. Thanks for the reminder @damnever |
Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com>
Signed-off-by: Ben Ye <benye@amazon.com>
damnever
approved these changes
Apr 1, 2023
alanprot
approved these changes
Apr 1, 2023
yeya24
changed the title
|
My bad... Squashed the commits. |
friedrichg
added a commit
that referenced
this pull request
Apr 23, 2023
* prepare 1.15.0-rc release (#5235) Signed-off-by: Ben Ye <benye@amazon.com> * Cherry-pick fixes to release 1.15 branch (#5241) * Batch Iterator optimization (#5237) * Batch Opmization Signed-off-by: Alan Protasio <alanprot@gmail.com> * Add test bacj Signed-off-by: Alan Protasio <alanprot@gmail.com> * Testing Multiples scrape intervals Signed-off-by: Alan Protasio <alanprot@gmail.com> * no assimption Signed-off-by: Alan Protasio <alanprot@gmail.com> * Using max chunk ts Signed-off-by: Alan Protasio <alanprot@gmail.com> * test with scrape 10 Signed-off-by: Alan Protasio <alanprot@gmail.com> * rename method Signed-off-by: Alan Protasio <alanprot@gmail.com> * comments Signed-off-by: Alan Protasio <alanprot@gmail.com> * using next Signed-off-by: Alan Protasio <alanprot@gmail.com> * change test name Signed-off-by: Alan Protasio <alanprot@gmail.com> * changelog/comments Signed-off-by: Alan Protasio <alanprot@gmail.com> --------- Signed-off-by: Alan Protasio <alanprot@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com> * Store Gateway: Convert metrics from summary to histograms (#5239) * Convert following metrics from summary to histogram cortex_bucket_store_series_blocks_queried cortex_bucket_store_series_data_fetched cortex_bucket_store_series_data_size_touched_bytes cortex_bucket_store_series_data_size_fetched_bytes cortex_bucket_store_series_data_touched cortex_bucket_store_series_result_series Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> * Update changelog Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> * fix changelog Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> --------- Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com> * update changelog Signed-off-by: Ben Ye <benye@amazon.com> * Catch context error in the s3 bucket client (#5240) Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com> * bump RC version Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Alan Protasio <alanprot@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com> Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com> Co-authored-by: Alan Protasio <approtas@amazon.com> Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com> Co-authored-by: Xiaochao Dong <the.xcdong@gmail.com> * Cherry-pick fixes to release 1.15 for new RC (#5259) * fix remote read error in query frontend (#5257) * fix remote read error in query frontend Signed-off-by: Ben Ye <benye@amazon.com> * fix integration test Signed-off-by: Ben Ye <benye@amazon.com> * add extra one query Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Ben Ye <benye@amazon.com> * bump RC version Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Ben Ye <benye@amazon.com> * Fix splitByInterval incorrect error response format (#5260) (#5261) * fix query frontend incorrect error response format * update changelog * fix integration test --------- Signed-off-by: Ben Ye <benye@amazon.com> * release 1.15.0 (#5274) Signed-off-by: Ben Ye <benye@amazon.com> * merge 1.15 into master and resolve changelog conflicts Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Ben Ye <benye@amazon.com> Signed-off-by: Alan Protasio <alanprot@gmail.com> Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com> Co-authored-by: Alan Protasio <approtas@amazon.com> Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com> Co-authored-by: Xiaochao Dong <the.xcdong@gmail.com>
yeya24
added a commit
to yeya24/cortex
that referenced
this pull request
Apr 28, 2023
* prepare 1.15.0-rc release (cortexproject#5235) Signed-off-by: Ben Ye <benye@amazon.com> * Cherry-pick fixes to release 1.15 branch (cortexproject#5241) * Batch Iterator optimization (cortexproject#5237) * Batch Opmization Signed-off-by: Alan Protasio <alanprot@gmail.com> * Add test bacj Signed-off-by: Alan Protasio <alanprot@gmail.com> * Testing Multiples scrape intervals Signed-off-by: Alan Protasio <alanprot@gmail.com> * no assimption Signed-off-by: Alan Protasio <alanprot@gmail.com> * Using max chunk ts Signed-off-by: Alan Protasio <alanprot@gmail.com> * test with scrape 10 Signed-off-by: Alan Protasio <alanprot@gmail.com> * rename method Signed-off-by: Alan Protasio <alanprot@gmail.com> * comments Signed-off-by: Alan Protasio <alanprot@gmail.com> * using next Signed-off-by: Alan Protasio <alanprot@gmail.com> * change test name Signed-off-by: Alan Protasio <alanprot@gmail.com> * changelog/comments Signed-off-by: Alan Protasio <alanprot@gmail.com> --------- Signed-off-by: Alan Protasio <alanprot@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com> * Store Gateway: Convert metrics from summary to histograms (cortexproject#5239) * Convert following metrics from summary to histogram cortex_bucket_store_series_blocks_queried cortex_bucket_store_series_data_fetched cortex_bucket_store_series_data_size_touched_bytes cortex_bucket_store_series_data_size_fetched_bytes cortex_bucket_store_series_data_touched cortex_bucket_store_series_result_series Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> * Update changelog Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> * fix changelog Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> --------- Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com> * update changelog Signed-off-by: Ben Ye <benye@amazon.com> * Catch context error in the s3 bucket client (cortexproject#5240) Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com> * bump RC version Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Alan Protasio <alanprot@gmail.com> Signed-off-by: Ben Ye <benye@amazon.com> Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com> Co-authored-by: Alan Protasio <approtas@amazon.com> Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com> Co-authored-by: Xiaochao Dong <the.xcdong@gmail.com> * Cherry-pick fixes to release 1.15 for new RC (cortexproject#5259) * fix remote read error in query frontend (cortexproject#5257) * fix remote read error in query frontend Signed-off-by: Ben Ye <benye@amazon.com> * fix integration test Signed-off-by: Ben Ye <benye@amazon.com> * add extra one query Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Ben Ye <benye@amazon.com> * bump RC version Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Ben Ye <benye@amazon.com> * Fix splitByInterval incorrect error response format (cortexproject#5260) (cortexproject#5261) * fix query frontend incorrect error response format * update changelog * fix integration test --------- Signed-off-by: Ben Ye <benye@amazon.com> * release 1.15.0 (cortexproject#5274) Signed-off-by: Ben Ye <benye@amazon.com> * merge 1.15 into master and resolve changelog conflicts Signed-off-by: Ben Ye <benye@amazon.com> --------- Signed-off-by: Ben Ye <benye@amazon.com> Signed-off-by: Alan Protasio <alanprot@gmail.com> Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com> Signed-off-by: Xiaochao Dong (@damnever) <the.xcdong@gmail.com> Co-authored-by: Alan Protasio <approtas@amazon.com> Co-authored-by: Friedrich Gonzalez <friedrichg@gmail.com> Co-authored-by: Xiaochao Dong <the.xcdong@gmail.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.
Cherry-pick #5237 and #5239 to release 1.15 branch.