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

Update Alertmanager to latest master (8b584eb2265e). #4237

Merged
merged 5 commits into from Jun 3, 2021

Conversation

pstibrany
Copy link
Contributor

What this PR does: This PR updates alertmanager to latest master (prometheus/alertmanager@f686ff3).

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

Checklist

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

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
@pstibrany
Copy link
Contributor Author

Integration tests currently failing due to bug in JSON-marshalling of URL wrapper. PRs with the fix:

Copy link
Contributor

@stevesg stevesg left a comment

Choose a reason for hiding this comment

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

Looks good assuming the upstream fixes are merged.

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.

I checked the changes in alertmanager and common: LGTM (modulo the URL marshalling issue you've found).

A nit, non blocking: while looking at the code I've noticed a TODO at integration/e2ecortex/client.go:211. Can we fix it?

@pstibrany
Copy link
Contributor Author

I checked the changes in alertmanager and common: LGTM (modulo the URL marshalling issue you've found).

A nit, non blocking: while looking at the code I've noticed a TODO at integration/e2ecortex/client.go:211. Can we fix it?

I don't see what struct to use here. Alertmanager v1 api uses inline struct to send the response:

func (api *API) status(w http.ResponseWriter, req *http.Request) {

@pracucci
Copy link
Contributor

pracucci commented Jun 3, 2021

I checked the changes in alertmanager and common: LGTM (modulo the URL marshalling issue you've found).
A nit, non blocking: while looking at the code I've noticed a TODO at integration/e2ecortex/client.go:211. Can we fix it?

I don't see what struct to use here. Alertmanager v1 api uses inline struct to send the response:

func (api *API) status(w http.ResponseWriter, req *http.Request) {

I think it was added by @jtlisi: do you remember it?

In any case, this is definitely not a blocker, so please merge this PR as soon as ready.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
@pstibrany pstibrany mentioned this pull request Jun 3, 2021
3 tasks
Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
@pstibrany pstibrany mentioned this pull request Jun 3, 2021
3 tasks
…479cc2511e.

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
@pstibrany pstibrany merged commit e5eb216 into cortexproject:master Jun 3, 2021
@pstibrany pstibrany deleted the update-alertmanager branch June 7, 2021 06:56
@bboreham bboreham changed the title Update Alertmanager to latest master (f686ff3be2bf). Update Alertmanager to latest master (8b584eb2265e). Jun 29, 2021
@bboreham
Copy link
Contributor

Since this added features and deprecated others, it really needed a CHANGELOG comment.
From the issue: "Updating alertmanager adds new functionality such as negative matches/timebased routing...."
match, match_re are deprecated.

@bboreham
Copy link
Contributor

The new feature side was added to CHANGELOG in #4325.

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.

Upgrade alertmanager to 0.22.1+
4 participants