RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2024-12-26 08:02:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

notify: replace unfiltered with filtered alerts

Browse Source
This commit is contained in:
Frederic Branczyk 2017-01-04 13:50:40 +01:00
parent cb4260d4b7
commit c392ace697
No known key found for this signature in database
GPG Key ID: CA14788B1E48B256
3 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
notify/impl.go
View File

@ -79,7 +79,7 @@ func (i *Integration) Notify(ctx context.Context, alerts ...*types.Alert) (bool,
return false, nil
}
return i.notifier.Notify(ctx, alerts...)
return i.notifier.Notify(ctx, res...)
}
// BuildReceiverIntegrations builds a list of integration notifiers off of a

39
notify/notify_test.go
View File

@ -295,18 +295,44 @@ func TestRoutingStage(t *testing.T) {
}
}
func TestIntegration(t *testing.T) {
func TestIntegrationNoResolved(t *testing.T) {
res := []*types.Alert{}
r := notifierFunc(func(ctx context.Context, alerts ...*types.Alert) (bool, error) {
res = append(res, alerts...)
return false, nil
})
i1 := Integration{
i := Integration{
notifier: r,
conf: notifierConfigFunc(func() bool { return false }),
}
i2 := Integration{
alerts := []*types.Alert{
&types.Alert{
Alert: model.Alert{
EndsAt: time.Now().Add(-time.Hour),
},
},
&types.Alert{
Alert: model.Alert{
EndsAt: time.Now().Add(time.Hour),
},
},
}
i.Notify(nil, alerts...)
require.Equal(t, len(res), 1)
}
func TestIntegrationSendResolved(t *testing.T) {
res := []*types.Alert{}
r := notifierFunc(func(ctx context.Context, alerts ...*types.Alert) (bool, error) {
res = append(res, alerts...)
return false, nil
})
i := Integration{
notifier: r,
conf: notifierConfigFunc(func() bool { return true }),
}
@ -319,12 +345,9 @@ func TestIntegration(t *testing.T) {
},
}
i1.Notify(nil, alerts...)
i2.Notify(nil, alerts...)
i.Notify(nil, alerts...)
// Even though the alert is sent to both integrations, which end up being
// delivered to the same notifier, only one is actually delivered as the
// second integration filters the resolved notifications.
require.Equal(t, len(res), 1)
require.Equal(t, res, alerts)
}

28
test/acceptance/send_test.go
View File

@ -373,47 +373,27 @@ receivers:
am.Push(At(1),
Alert("alertname", "test", "lbl", "v1"),
Alert("alertname", "test", "lbl", "v2"),
Alert("alertname", "test", "lbl", "v3"),
)
am.Push(At(16),
am.Push(At(7),
Alert("alertname", "test", "lbl", "v1"),
Alert("alertname", "test", "lbl", "v2"),
Alert("alertname", "test", "lbl", "v3"),
)
co1.Want(Between(2, 2.5),
Alert("alertname", "test", "lbl", "v1").Active(1),
Alert("alertname", "test", "lbl", "v2").Active(1),
Alert("alertname", "test", "lbl", "v3").Active(1),
)
co1.Want(Between(12, 13),
Alert("alertname", "test", "lbl", "v1").Active(1, 11),
Alert("alertname", "test", "lbl", "v1").Active(1),
Alert("alertname", "test", "lbl", "v2").Active(1, 11),
Alert("alertname", "test", "lbl", "v3").Active(1, 11),
)
co1.Want(Between(17, 17.5),
Alert("alertname", "test", "lbl", "v1").Active(16),
Alert("alertname", "test", "lbl", "v2").Active(16),
Alert("alertname", "test", "lbl", "v3").Active(16),
)
co1.Want(Between(27, 28),
Alert("alertname", "test", "lbl", "v1").Active(16, 26),
Alert("alertname", "test", "lbl", "v2").Active(16, 26),
Alert("alertname", "test", "lbl", "v3").Active(16, 26),
)
co2.Want(Between(2, 2.5),
Alert("alertname", "test", "lbl", "v1").Active(1),
Alert("alertname", "test", "lbl", "v2").Active(1),
Alert("alertname", "test", "lbl", "v3").Active(1),
)
co2.Want(Between(17, 17.5),
Alert("alertname", "test", "lbl", "v1").Active(16),
Alert("alertname", "test", "lbl", "v2").Active(16),
Alert("alertname", "test", "lbl", "v3").Active(16),
co2.Want(Between(12, 13),
Alert("alertname", "test", "lbl", "v1").Active(1),
)
at.Run()