Skip to content
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

Store Gateway: Convert metrics from summary to histograms #5239

Merged
merged 3 commits into from
Mar 30, 2023

Conversation

friedrichg
Copy link
Member

@friedrichg friedrichg commented Mar 29, 2023

What this PR does: Following metrics were updated in thanos 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

Which issue(s) this PR fixes:
Fixes #5216

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

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>
@friedrichg friedrichg changed the title Convert metrics from summary to histogram Store Gateway: Convert metrics from summary to histogra Mar 29, 2023
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
@friedrichg friedrichg changed the title Store Gateway: Convert metrics from summary to histogra Store Gateway: Convert metrics from summary to histograms Mar 29, 2023
@friedrichg friedrichg requested a review from yeya24 March 29, 2023 12:19
@alanprot
Copy link
Member

Thanks!

Should we pull this on the 1.15 release? @yeya24 WDYT?

@yeya24
Copy link
Collaborator

yeya24 commented Mar 29, 2023

Yeah @alanprot, I agree we need another RC for this. THanks

CHANGELOG.md Outdated
@@ -11,6 +11,7 @@
* [CHANGE] Tracing: Use the default OTEL trace sampler when `-tracing.otel.exporter-type` is set to `awsxray`. #5141
* [CHANGE] Ingester partial error log line to debug level. #5192
* [CHANGE] Change HTTP status code from 503/422 to 499 if a request is canceled. #5220
* [CHANGE] Store gateways summary metrics have been converted to histograms `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` #5239
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we move this change into master / unreleased section?
Once this is merged, I will add this commit for our new RC

@yeya24 yeya24 self-requested a review March 29, 2023 20:43
Signed-off-by: Friedrich Gonzalez <friedrichg@gmail.com>
Copy link
Collaborator

@yeya24 yeya24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@yeya24 yeya24 merged commit 9e99c41 into cortexproject:master Mar 30, 2023
14 checks passed
@friedrichg friedrichg deleted the convert-to-histogram branch March 30, 2023 16:55
yeya24 pushed a commit to yeya24/cortex that referenced this pull request Mar 31, 2023
…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>
yeya24 pushed a commit to yeya24/cortex that referenced this pull request Mar 31, 2023
…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>
@alvinlin123 alvinlin123 added this to the Release 1.15 milestone Mar 31, 2023
yeya24 added a commit that referenced this pull request Apr 1, 2023
* 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>
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 pushed a commit to yeya24/cortex that referenced this pull request Apr 28, 2023
…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>
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>
alexqyle pushed a commit to alexqyle/cortex that referenced this pull request May 2, 2023
…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: Alex Le <leqiyue@amazon.com>
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.

Store-Gateway histogram metrics are NaN
4 participants