Skip to content

Update Alertmanager vendor#6560

Merged
gotjosh merged 7 commits intomainfrom
alexweav/upgrade-alertmanager
Nov 20, 2023
Merged

Update Alertmanager vendor#6560
gotjosh merged 7 commits intomainfrom
alexweav/upgrade-alertmanager

Conversation

@alexweav
Copy link
Copy Markdown
Contributor

@alexweav alexweav commented Nov 3, 2023

What this PR does

Upgrades the vendoring of Alertmanager to the latest tip of main.

Which issue(s) this PR fixes or relates to

n/a

Checklist

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

for _, ti := range conf.TimeIntervals {
timeIntervals[ti.Name] = ti.TimeIntervals
}
intervener := timeinterval.NewIntervener(timeIntervals)
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

New layer wrapping the time intervals map: prometheus/alertmanager#3556

}
n = wrapper(name, n)
integrations = append(integrations, notify.NewIntegration(n, rs, name, i))
integrations = append(integrations, notify.NewIntegration(n, rs, name, i, nc.Name))
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@alexweav alexweav marked this pull request as ready for review November 3, 2023 22:15
@alexweav alexweav requested review from a team and grafanabot as code owners November 3, 2023 22:15
@stevesg stevesg self-requested a review November 3, 2023 22:24
Copy link
Copy Markdown
Contributor

@gotjosh gotjosh left a comment

Choose a reason for hiding this comment

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

LGTM

No new file-based configurations that we need to restrict, the aws-sdk version bump seems safe and the majority of the changes come from the fact that I updated the open API generator which added harmless changes to the generated models for the Alertmanager client.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We need to let the frontend folks know that this option is now support in Mimir so that Grafana can be adjusted. cc: @gillesdemey

@gotjosh gotjosh enabled auto-merge (squash) November 17, 2023 21:29
@gotjosh
Copy link
Copy Markdown
Contributor

gotjosh commented Nov 17, 2023

@grafana/mimir-maintainers this is good to go, but I can't merge due to restrictions - can someone please hit the green button? TIA

@alexweav alexweav force-pushed the alexweav/upgrade-alertmanager branch from ffd53fc to 421d65a Compare November 20, 2023 14:08
@gotjosh gotjosh merged commit 515cc50 into main Nov 20, 2023
@gotjosh gotjosh deleted the alexweav/upgrade-alertmanager branch November 20, 2023 14:27
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