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.

Sign up for GitHub

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

Jump to bottom

Chore: Update prometheus, thanos and promql-engine #6105

Merged
merged 2 commits into from
Jul 23, 2024
Merged

Chore: Update prometheus, thanos and promql-engine #6105

merged 2 commits into from
Jul 23, 2024

Conversation

harry671003
Copy link
Contributor

What this PR does:

  • Update prometheus to: e9dec5fc537b
  • Update thanos to: 990a60b72647
  • Update promql-engine to: cdbd6dfed36b

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]

@harry671003 harry671003 marked this pull request as ready for review July 22, 2024 20:55
yeya24
yeya24 reviewed Jul 22, 2024
View reviewed changes
go.mod Show resolved Hide resolved
pkg/ruler/user2/namespace Outdated Show resolved Hide resolved
CharlieTLe
CharlieTLe reviewed Jul 22, 2024
View reviewed changes
Copy link
Member

@CharlieTLe CharlieTLe left a comment

Choose a reason for hiding this comment

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

There seems to be unrelated changes like the addition of storage.LabelHints in some function calls. Are these related to the dependency updates?

pkg/ruler/user2/namespace Outdated Show resolved Hide resolved
go.mod
github.com/thanos-io/promql-engine v0.0.0-20240515161521-93aa311933cf
github.com/thanos-io/thanos v0.36.0-rc.0
github.com/thanos-io/promql-engine v0.0.0-20240718195911-cdbd6dfed36b
github.com/thanos-io/thanos v0.35.2-0.20240722172812-990a60b72647
Copy link
Member

Choose a reason for hiding this comment

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

Seems like we downgraded from thanos version v0.36.0-rc.0 to v0.35.2-0?

Copy link
Contributor Author

@harry671003 harry671003 Jul 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

990a60b72647 is newer.

v0.36.0-rc.0 is from one month ago.

@harry671003
Copy link
Contributor Author

harry671003 commented Jul 22, 2024 •
edited
Loading

There seems to be unrelated changes like the addition of storage.LabelHints in some function calls. Are these related to the dependency updates?

The interface for storage.Querier was changed in prometheus/prometheus#14109 to allow passing a hint to the storage layer.

Cortex implements this interface in many places.

yeya24
yeya24 approved these changes Jul 22, 2024
View reviewed changes
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 a lot

@harry671003 harry671003 requested a review from CharlieTLe July 22, 2024 23:36
CharlieTLe
CharlieTLe approved these changes Jul 23, 2024
View reviewed changes
Copy link
Member

@CharlieTLe CharlieTLe left a comment

Choose a reason for hiding this comment

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

Thanks

@harry671003
Chore: Update prometheus, thanos and promql-engine
dd52297 
Signed-off-by: 🌲 Harry 🌊 John 🏔 <[email protected]>
@harry671003
Remove test files
df1bf5d 
Signed-off-by: 🌲 Harry 🌊 John 🏔 <[email protected]>
@yeya24 yeya24 merged commit 75cfab4 into cortexproject:master Jul 23, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yeya24 yeya24 yeya24 approved these changes

@CharlieTLe CharlieTLe CharlieTLe approved these changes

Assignees
No one assigned
Labels
size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@harry671003 @CharlieTLe @yeya24