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 to release-2.20 branch #2902

Merged
merged 4 commits into from
Jul 21, 2020

Conversation

codesome
Copy link
Contributor

Signed-off-by: Ganesh Vernekar [email protected]

What this PR does:

Upgrades Prometheus to release branch which contains some TSDB fixes

Checklist

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

Signed-off-by: Ganesh Vernekar <[email protected]>
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.

Thanks @codesome ! I checked the dependencies (see below) and LGTM 🚀

Checked dependencies:

  • github.com/aws/aws-sdk-go from v1.31.9 to v1.33.5: checked the release notes, no changes for us
  • github.com/hashicorp/consul from v1.4.0 to v1.5.0: checked the CHANGELOG focusing only on "api" changes, looks like only bug fixing has been done
  • github.com/hashicorp/memberlist from v0.2.0 to v0.2.2: checked the code diff (no CHANGELOG available) and changes are minor: mostly exported previously private consts and introduced a way to whitelist/blacklist CIDRs
  • github.com/prometheus/alertmanager from v0.20.0 to v0.21.0: checked the CHANGELOG. HipChat has been removed

@codesome please mention in the CHANGELOG (as a [CHANGE]) that HipChat support has been removed from the alertmanager (because removed from the Prometheus upstream too)

pracucci and others added 2 commits July 21, 2020 08:43
Signed-off-by: Marco Pracucci <[email protected]>
Signed-off-by: Ganesh Vernekar <[email protected]>
Comment on lines -70 to -72
replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v36.2.0+incompatible

replace github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.0+incompatible
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 also to be noted. There is a big bump here after the removal of these replace.

Copy link
Contributor

Choose a reason for hiding this comment

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

You're right! Could you check the azure changelog for any significative change for us, please? I would focus on azure blob storage only.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No issues with azure-sdk-for-go, that is something Prometheus imports (for the service discovery) and follow these guidelines to avoid breaking changes.

The blob storage client uses github.com/Azure/go-autorest and the upgrade has only 1 breaking change which is not concerning (By default, the DoRetryForStatusCodes functions will no longer infinitely retry a request when the response returns an HTTP status code of 429 (StatusTooManyRequests). To opt in to the old behavior set autorest.Count429AsRetry to false.)

We should be good in terms of blob storage.

@pracucci pracucci merged commit d6310af into cortexproject:master Jul 21, 2020
@pracucci pracucci mentioned this pull request Jul 28, 2020
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.

3 participants