Skip to content

Cherry-pick fixes to release 1.15 for new RC #5259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2023

Conversation

yeya24
Copy link
Contributor

@yeya24 yeya24 commented Apr 11, 2023

What this PR does:

Cherry pick fix #5257.

Bumped the RC version and we will release 1.15.0-rc.2.

yeya24 added 2 commits April 11, 2023 11:02
* fix remote read error in query frontend

Signed-off-by: Ben Ye <[email protected]>

* fix integration test

Signed-off-by: Ben Ye <[email protected]>

* add extra one query

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
@yeya24 yeya24 merged commit 66948fd into cortexproject:release-1.15 Apr 11, 2023
@yeya24 yeya24 deleted the release-1.15.0-rc2 branch April 12, 2023 05:16
friedrichg added a commit that referenced this pull request Apr 23, 2023
* prepare 1.15.0-rc release (#5235)

Signed-off-by: Ben Ye <[email protected]>

* Cherry-pick fixes to release 1.15 branch (#5241)

* Batch Iterator optimization (#5237)

* Batch Opmization

Signed-off-by: Alan Protasio <[email protected]>

* Add test bacj

Signed-off-by: Alan Protasio <[email protected]>

* Testing Multiples scrape intervals

Signed-off-by: Alan Protasio <[email protected]>

* no assimption

Signed-off-by: Alan Protasio <[email protected]>

* Using max chunk ts

Signed-off-by: Alan Protasio <[email protected]>

* test with scrape 10

Signed-off-by: Alan Protasio <[email protected]>

* rename method

Signed-off-by: Alan Protasio <[email protected]>

* comments

Signed-off-by: Alan Protasio <[email protected]>

* using next

Signed-off-by: Alan Protasio <[email protected]>

* change test name

Signed-off-by: Alan Protasio <[email protected]>

* changelog/comments

Signed-off-by: Alan Protasio <[email protected]>

---------

Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Ben Ye <[email protected]>

* 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 <[email protected]>

* Update changelog

Signed-off-by: Friedrich Gonzalez <[email protected]>

* fix changelog

Signed-off-by: Friedrich Gonzalez <[email protected]>

---------

Signed-off-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Ben Ye <[email protected]>

* update changelog

Signed-off-by: Ben Ye <[email protected]>

* Catch context error in the s3 bucket client (#5240)

Signed-off-by: Xiaochao Dong (@damnever) <[email protected]>
Signed-off-by: Ben Ye <[email protected]>

* bump RC version

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Xiaochao Dong (@damnever) <[email protected]>
Co-authored-by: Alan Protasio <[email protected]>
Co-authored-by: Friedrich Gonzalez <[email protected]>
Co-authored-by: Xiaochao Dong <[email protected]>

* 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 <[email protected]>

* fix integration test

Signed-off-by: Ben Ye <[email protected]>

* add extra one query

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>

* bump RC version

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>

* 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 <[email protected]>

* release 1.15.0 (#5274)

Signed-off-by: Ben Ye <[email protected]>

* merge 1.15 into master and resolve changelog conflicts

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Xiaochao Dong (@damnever) <[email protected]>
Co-authored-by: Alan Protasio <[email protected]>
Co-authored-by: Friedrich Gonzalez <[email protected]>
Co-authored-by: Xiaochao Dong <[email protected]>
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 <[email protected]>

* Cherry-pick fixes to release 1.15 branch (cortexproject#5241)

* Batch Iterator optimization (cortexproject#5237)

* Batch Opmization

Signed-off-by: Alan Protasio <[email protected]>

* Add test bacj

Signed-off-by: Alan Protasio <[email protected]>

* Testing Multiples scrape intervals

Signed-off-by: Alan Protasio <[email protected]>

* no assimption

Signed-off-by: Alan Protasio <[email protected]>

* Using max chunk ts

Signed-off-by: Alan Protasio <[email protected]>

* test with scrape 10

Signed-off-by: Alan Protasio <[email protected]>

* rename method

Signed-off-by: Alan Protasio <[email protected]>

* comments

Signed-off-by: Alan Protasio <[email protected]>

* using next

Signed-off-by: Alan Protasio <[email protected]>

* change test name

Signed-off-by: Alan Protasio <[email protected]>

* changelog/comments

Signed-off-by: Alan Protasio <[email protected]>

---------

Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Ben Ye <[email protected]>

* 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 <[email protected]>

* Update changelog

Signed-off-by: Friedrich Gonzalez <[email protected]>

* fix changelog

Signed-off-by: Friedrich Gonzalez <[email protected]>

---------

Signed-off-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Ben Ye <[email protected]>

* update changelog

Signed-off-by: Ben Ye <[email protected]>

* Catch context error in the s3 bucket client (cortexproject#5240)

Signed-off-by: Xiaochao Dong (@damnever) <[email protected]>
Signed-off-by: Ben Ye <[email protected]>

* bump RC version

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Xiaochao Dong (@damnever) <[email protected]>
Co-authored-by: Alan Protasio <[email protected]>
Co-authored-by: Friedrich Gonzalez <[email protected]>
Co-authored-by: Xiaochao Dong <[email protected]>

* 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 <[email protected]>

* fix integration test

Signed-off-by: Ben Ye <[email protected]>

* add extra one query

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>

* bump RC version

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>

* 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 <[email protected]>

* release 1.15.0 (cortexproject#5274)

Signed-off-by: Ben Ye <[email protected]>

* merge 1.15 into master and resolve changelog conflicts

Signed-off-by: Ben Ye <[email protected]>

---------

Signed-off-by: Ben Ye <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: Xiaochao Dong (@damnever) <[email protected]>
Co-authored-by: Alan Protasio <[email protected]>
Co-authored-by: Friedrich Gonzalez <[email protected]>
Co-authored-by: Xiaochao Dong <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants