RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-01-01 11:02:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix alert batch comparison, improve debug output

Browse Source
This commit is contained in:
Fabian Reinartz 2015-10-05 16:51:34 +02:00
parent ecf6a7b48f
commit f14ada020a
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/acceptance.go
View File

@ -36,6 +36,13 @@ type AcceptanceOpts struct {
baseTime time.Time
}
func (opts *AcceptanceOpts) alertString(a *model.Alert) string {
if a.EndsAt.IsZero() {
return fmt.Sprintf("%s[%v:]", a, opts.relativeTime(a.StartsAt))
}
return fmt.Sprintf("%s[%v:%v]", a, opts.relativeTime(a.StartsAt), opts.relativeTime(a.EndsAt))
}
// expandTime returns the absolute time for the relative time
// calculated from the test's base time.
func (opts *AcceptanceOpts) expandTime(rel float64) time.Time {

12
test/acceptance/inhibit_test.go
View File

@ -52,15 +52,15 @@ inhibit_rules:
am.Push(At(2.2), Alert("alertname", "JobDown", "job", "testjob", "zone", "aa"))
co.Want(Between(2, 2.5),
Alert("alertname", "test1", "job", "testjob", "zone", "aa"),
Alert("alertname", "InstanceDown", "job", "testjob", "zone", "aa"),
Alert("alertname", "InstanceDown", "job", "testjob", "zone", "ab"),
Alert("alertname", "test1", "job", "testjob", "zone", "aa").Active(1),
Alert("alertname", "InstanceDown", "job", "testjob", "zone", "aa").Active(1),
Alert("alertname", "InstanceDown", "job", "testjob", "zone", "ab").Active(1),
)
co.Want(Between(3, 3.5),
Alert("alertname", "test1", "job", "testjob", "zone", "aa"),
Alert("alertname", "InstanceDown", "job", "testjob", "zone", "ab"),
Alert("alertname", "JobDown", "job", "testjob", "zone", "aa"),
Alert("alertname", "test1", "job", "testjob", "zone", "aa").Active(1),
Alert("alertname", "InstanceDown", "job", "testjob", "zone", "ab").Active(1),
Alert("alertname", "JobDown", "job", "testjob", "zone", "aa").Active(2.2),
)
at.Run()

20
test/collector.go
View File

@ -2,7 +2,6 @@ package test
import (
"fmt"
"sort"
"testing"
"time"
@ -29,12 +28,15 @@ func batchesEqual(as, bs model.Alerts, opts *AcceptanceOpts) bool {
return false
}
// Ensure sorting.
sort.Sort(as)
sort.Sort(bs)
for i, a := range as {
if !equalAlerts(a, bs[i], opts) {
for _, a := range as {
found := false
for _, b := range bs {
if equalAlerts(a, b, opts) {
found = true
break
}
}
if !found {
return false
}
}
@ -83,7 +85,7 @@ func (c *Collector) check() string {
report += fmt.Sprintf("---\n")
for _, e := range exp {
report += fmt.Sprintf("- %v\n", e)
report += fmt.Sprintf("- %v\n", c.opts.alertString(e))
}
for at, got := range c.collected {
@ -137,7 +139,7 @@ func (c *Collector) check() string {
for _, alerts := range col {
report += fmt.Sprintf("@ %v\n", at)
for _, a := range alerts {
report += fmt.Sprintf("- %v\n", a)
report += fmt.Sprintf("- %v\n", c.opts.alertString(a))
}
}
}