Skip to content

Upgrade Prometheus #3739

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 4 commits into from
Jan 25, 2021
Merged

Upgrade Prometheus #3739

merged 4 commits into from
Jan 25, 2021

Conversation

codesome
Copy link
Contributor

What this PR does:

Upgrades Prometheus to the lastest master commit b5dfa2414b9e65a275caad29c4023290d841c9ba.

This brings in the @ modifier in PromQL. It is disabled by default and I plan to submit a follow-up PR enabling it with cache handling for it.

Checklist

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

@@ -74,6 +74,8 @@ replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110

replace k8s.io/client-go => k8s.io/client-go v0.19.2

replace k8s.io/api => k8s.io/api v0.19.4
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is not used in any Cortex or vendored packages. It was actually used in tests of vendored package (Prometheus), so this replace should be safe (version was picked from what was present in go.sum).

@codesome
Copy link
Contributor Author

Gave updated packages a quick glance, nothing breaking Cortex

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Copy link
Contributor

@pstibrany pstibrany left a comment

Choose a reason for hiding this comment

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

Thank you! I haven't found anything disturbing in Prometheus diff. Haven't checked other dependencies very closely.

@codesome
Copy link
Contributor Author

TestStoreGateway_BlocksSharding is failing

@codesome
Copy link
Contributor Author

Bug is in creation of blocks in mockTSDB, it is creating 1 less block. Investigating.

@codesome
Copy link
Contributor Author

It is (most likely) because of prometheus/prometheus#8212. I have pushed a fix.

Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Copy link
Contributor

@pracucci pracucci left a comment

Choose a reason for hiding this comment

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

LGTM, thanks! I checked vendor changes and all LGTM. Prometheus changes look require no change to Cortex and other vendors changes looks good (I checked: aws-sdk-go, consul/api, prometheus/client_golang).

Ganesh Vernekar added 2 commits January 25, 2021 19:25
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
Signed-off-by: Ganesh Vernekar <cs15btech11018@iith.ac.in>
@pracucci pracucci merged commit d625141 into cortexproject:master Jan 25, 2021
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