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

Upgrade Prometheus, Alertmanager and Thanos #4102

Merged

Conversation

pracucci
Copy link
Contributor

@pracucci pracucci commented Apr 22, 2021

What this PR does:
To unblock #4085 we need to upgrade prometheus/common and Alertmanager which, due to dependencies, require to upgrade Prometheus, Thanos and some other dependencies. This is the reason why in this PR you will see a bunch of dependencies updated.

I've checked the changes in all core dependencies (AWS, GCP, Alertmanager, Prometheus, Thanos) and everything looks safe to me.

Which issue(s) this PR fixes:
N/A

Checklist

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

go.mod Outdated
)
// Need to upgrade Prometheus and Alertmanager in Thanos too, due to some breaking changes.
// We use a commit from a branch until https://github.com/thanos-io/thanos/pull/4094 is not merged.
replace github.com/thanos-io/thanos v0.13.1-0.20210401085038-d7dff0c84d17 => github.com/thanos-io/thanos v0.19.1-0.20210422104148-b9144ea1b912
Copy link
Contributor Author

Choose a reason for hiding this comment

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

My plan is to keep this, so that we'll not block this PR by Thanos. I will remove this replace once Thanos PR is merged.

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.

Cortex changes LGTM.

@pracucci pracucci marked this pull request as draft April 22, 2021 13:32
@pracucci
Copy link
Contributor Author

I've converted into a draft because, while reviewing thanos-io/thanos#3937, I've spot some issues which we need to fix first.

@pracucci
Copy link
Contributor Author

I've converted into a draft because, while reviewing thanos-io/thanos#3937, I've spot some issues which we need to fix first.

Opened a Thanos PR thanos-io/thanos#4095

@pracucci pracucci force-pushed the upgrade-prometheus-and-alertmanager branch from ece091d to 7d5ceed Compare April 22, 2021 15:14
@pracucci pracucci force-pushed the upgrade-prometheus-and-alertmanager branch from 7d5ceed to 9c8994f Compare April 23, 2021 09:13
@pracucci
Copy link
Contributor Author

I've converted into a draft because, while reviewing thanos-io/thanos#3937, I've spot some issues which we need to fix first.

Opened a Thanos PR thanos-io/thanos#4095

Merged and updated vendored Thanos in this PR. The risky change here is thanos-io/thanos#3937 but I've reviewed and, despite complex, I haven't noticed any issue (except for the race condition in the pool.BuckedBytes, which has been merged.

@pracucci pracucci marked this pull request as ready for review April 23, 2021 09:35
@pracucci pracucci merged commit d3068f9 into cortexproject:master Apr 23, 2021
@pracucci pracucci deleted the upgrade-prometheus-and-alertmanager branch April 23, 2021 12:26
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.

2 participants