Skip to content

[chore] Update Prometheus/Thanos/Thanos engine #5177

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 6 commits into from
Feb 24, 2023

Conversation

alanprot
Copy link
Member

@alanprot alanprot commented Feb 24, 2023

What this PR does:
Update Dependencies:

Prometheus: https://github.com/prometheus/prometheus/tree/v2.42.0
Thanos: thanos-io/thanos@fdeea39
Thanos Engine: thanos-io/promql-engine@ae04bbe

Prometheus introduced a breaking change to reuse iterators: prometheus/prometheus#11334

It also includes a new alerting rule field (keep_firing_for): prometheus/prometheus#11827

Which issue(s) this PR fixes:
Fixes #

Checklist

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

Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alan Protasio <[email protected]>
@alanprot alanprot marked this pull request as ready for review February 24, 2023 19:32
Signed-off-by: Alan Protasio <[email protected]>
Copy link
Contributor

@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!

@alanprot alanprot merged commit da2ad99 into cortexproject:master Feb 24, 2023
Comment on lines +123 to +127
seriesDataTouched *prometheus.HistogramVec
seriesDataFetched *prometheus.HistogramVec
seriesDataSizeTouched *prometheus.HistogramVec
seriesDataSizeFetched *prometheus.HistogramVec
seriesBlocksQueried prometheus.Histogram
Copy link
Member

Choose a reason for hiding this comment

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

Cortex uses these metrics. we need to change them too

data.SendSumOfSummariesWithLabels(out, m.seriesDataTouched, "thanos_bucket_store_series_data_touched", "data_type")
data.SendSumOfSummariesWithLabels(out, m.seriesDataFetched, "thanos_bucket_store_series_data_fetched", "data_type")
data.SendSumOfSummariesWithLabels(out, m.seriesDataSizeTouched, "thanos_bucket_store_series_data_size_touched_bytes", "data_type")
data.SendSumOfSummariesWithLabels(out, m.seriesDataSizeFetched, "thanos_bucket_store_series_data_size_fetched_bytes", "data_type")
data.SendSumOfSummariesWithLabels(out, m.seriesBlocksQueried, "thanos_bucket_store_series_blocks_queried")

alexqyle pushed a commit to alexqyle/cortex that referenced this pull request May 2, 2023
* Updating Dependencies

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

* fix test

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

* fix ling

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

* fix test

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

* Adding KeepFiringFor on the response

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

* changelog

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

---------

Signed-off-by: Alan Protasio <[email protected]>
Signed-off-by: Alex Le <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants