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 #233

Merged
merged 6 commits into from
Sep 15, 2021
Merged

Upgrade Prometheus #233

merged 6 commits into from
Sep 15, 2021

Conversation

pracucci
Copy link
Collaborator

@pracucci pracucci commented Sep 14, 2021

What this PR does:
In this PR I'm upgrading Prometheus to latest main.

The following Prometheus changes affect us:

There are 3 other PRs affecting TSDB, but these should affect only snapshotting which is a feature we're not using in Mimir yet:

This upgrades Alertmanager too, adding SNS receiver. Unfortunately the SNS receiver HTTP client is unused, so I've open an Alertmanager fix PR first (the PR is included in vendor/ changes here, so lint CI is expected to fail).

Other updated vendored libs:

  • github.com/aws/aws-sdk-go v1.40.10 from to github.com/aws/aws-sdk-go v1.40.37: checked the CHANGELOG and I can't see any change affecting us
  • github.com/hashicorp/consul: checked the diff and changes are not affecting us.
  • github.com/hashicorp/memberlist: checked the diff and I can see few fixes and IngestionAwareTransport deprecation (we don't use it).
  • cloud.google.com/go from 0.87.0 to 0.92.0: checked the CHANGES, nothing affecting us.

Which issue(s) this PR fixes:
Fixes #192

Checklist

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

@pracucci
Copy link
Collaborator Author

This upgrades Alertmanager too, adding SNS receiver. Unfortunately the SNS receiver HTTP client is unused, so I've open an Alertmanager fix PR first (the PR is included in vendor/ changes here, so lint CI is expected to fail).

The PR has been merged. To include it, I had to upgrade Alertmanager to latest main. Compared to 0.23.0 (which is the version against which I've checked the diff when I've opened the PR), the following changes have been introduced affecting us:

@pracucci pracucci marked this pull request as ready for review September 15, 2021 07:43
Copy link
Member

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

Good job.

@@ -527,6 +528,9 @@ func buildReceiverIntegrations(nc *config.Receiver, tmpl *template.Template, fir
for i, c := range nc.PushoverConfigs {
add("pushover", i, c, func(l log.Logger) (notify.Notifier, error) { return pushover.New(c, tmpl, l, httpOps...) })
}
for i, c := range nc.SNSConfigs {
add("sns", i, c, func(l log.Logger) (notify.Notifier, error) { return sns.New(c, tmpl, l, httpOps...) })
Copy link
Member

Choose a reason for hiding this comment

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

Let's also add "sns" into allowedIntegrationNames in notifications_limit_flag.go

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks for spotting it!

Copy link
Contributor

@bboreham bboreham left a comment

Choose a reason for hiding this comment

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

lgtm, didn't see anything alarming in vendor changes.

Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
@pracucci pracucci merged commit f83a06c into main Sep 15, 2021
@pracucci pracucci deleted the upgrade-prometheus branch September 15, 2021 15:41
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.

Exemplars causing crash on start
3 participants