Update Alertmanager vendor #6560
Conversation
| @@ -378,13 +379,14 @@ func (am *Alertmanager) ApplyConfig(userID string, conf *config.Config, rawCfg s | |||
| for _, ti := range conf.TimeIntervals { | |||
| timeIntervals[ti.Name] = ti.TimeIntervals | |||
| } | |||
| intervener := timeinterval.NewIntervener(timeIntervals) | |||
There was a problem hiding this comment.
New layer wrapping the time intervals map: prometheus/alertmanager#3556
| @@ -474,7 +476,7 @@ func buildReceiverIntegrations(nc config.Receiver, tmpl *template.Template, fire | |||
| return | |||
| } | |||
| n = wrapper(name, n) | |||
| integrations = append(integrations, notify.NewIntegration(n, rs, name, i)) | |||
| integrations = append(integrations, notify.NewIntegration(n, rs, name, i, nc.Name)) | |||
There was a problem hiding this comment.
Directly parallels the prometheus code.
There was a problem hiding this comment.
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.
| @@ -694,6 +689,7 @@ type PushoverConfig struct { | |||
| Priority string `yaml:"priority,omitempty" json:"priority,omitempty"` | |||
| Retry duration `yaml:"retry,omitempty" json:"retry,omitempty"` | |||
| Expire duration `yaml:"expire,omitempty" json:"expire,omitempty"` | |||
| TTL duration `yaml:"ttl,omitempty" json:"ttl,omitempty"` | |||
There was a problem hiding this comment.
We need to let the frontend folks know that this option is now support in Mimir so that Grafana can be adjusted. cc: @gillesdemey
|
@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
force-pushed
the
alexweav/upgrade-alertmanager
branch
from
ffd53fc
to
421d65a
Compare
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
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]