RepoMirrors/alertmanager
1
0
Fork 0
mirror of https://github.com/prometheus/alertmanager synced 2025-04-11 03:31:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

provider/mesh: allow timestamp equality tolerance

Browse Source
This commit is contained in:
Fabian Reinartz 2016-06-21 11:47:49 +02:00
parent ddd3189bfe
commit a89ba5b5ca
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
provider/mesh/state.go
View File

@ -196,6 +196,8 @@ func (st *silenceState) Encode() [][]byte {
return [][]byte{buf.Bytes()} return [][]byte{buf.Bytes()}
} }
const timestampTolerance = time.Second
// silenceModAllowed checks whether silence a may be changed to silence b. // silenceModAllowed checks whether silence a may be changed to silence b.
// Returns an error stating the reason if not. // Returns an error stating the reason if not.
// The silences are guaranteed to be valid. Silence a may be nil if b is a new. // The silences are guaranteed to be valid. Silence a may be nil if b is a new.
@ -211,7 +213,16 @@ func silenceModAllowed(a, b *types.Silence, now time.Time) error {
if a.ID != b.ID { if a.ID != b.ID {
return fmt.Errorf("IDs do not match") return fmt.Errorf("IDs do not match")
} }
if !b.StartsAt.Equal(a.StartsAt) {
almostEqual := func(s, t time.Time) bool {
d := s.Sub(t)
return d <= timestampTolerance && d >= -timestampTolerance
}
if almostEqual(a.StartsAt, b.StartsAt) {
// Always pick original timestamp so we cannot drift the time
// by spamming edits.
b.StartsAt = a.StartsAt
} else {
if a.StartsAt.Before(now) { if a.StartsAt.Before(now) {
return fmt.Errorf("start time of active silence must not be modified") return fmt.Errorf("start time of active silence must not be modified")
} }
@ -219,7 +230,11 @@ func silenceModAllowed(a, b *types.Silence, now time.Time) error {
return fmt.Errorf("start time cannot be moved into the past") return fmt.Errorf("start time cannot be moved into the past")
} }
} }
if !b.EndsAt.Equal(a.EndsAt) { if almostEqual(a.EndsAt, b.EndsAt) {
// Always pick original timestamp so we cannot drift the time
// by spamming edits.
b.EndsAt = a.EndsAt
} else {
if a.EndsAt.Before(now) { if a.EndsAt.Before(now) {
return fmt.Errorf("end time must not be modified for elapsed silence") return fmt.Errorf("end time must not be modified for elapsed silence")
} }
@ -227,6 +242,7 @@ func silenceModAllowed(a, b *types.Silence, now time.Time) error {
return fmt.Errorf("end time must not be set into the past") return fmt.Errorf("end time must not be set into the past")
} }
} }
if !a.Matchers.Equal(b.Matchers) { if !a.Matchers.Equal(b.Matchers) {
return fmt.Errorf("matchers must not be modified") return fmt.Errorf("matchers must not be modified")
} }

24
provider/mesh/state_test.go
View File

@ -374,6 +374,8 @@ func TestSilenceModAllowed(t *testing.T) {
}, },
}, },
{ {
// Modify silence comment and creator and set not-yet started
// end time into future.
a: &types.Silence{ a: &types.Silence{
ID: id1, ID: id1,
Matchers: matchers, Matchers: matchers,
@ -413,7 +415,27 @@ func TestSilenceModAllowed(t *testing.T) {
Comment: "y", Comment: "y",
}, },
}, },
{
a: &types.Silence{
ID: id1,
Matchers: matchers,
StartsAt: now.Add(-10 * time.Minute),
EndsAt: now.Add(-5 * time.Minute),
UpdatedAt: now.Add(-10 * time.Minute),
CreatedBy: "x",
Comment: "x",
},
// Timestamp tolerance must be respected.
b: &types.Silence{
ID: id1,
Matchers: matchers,
StartsAt: now.Add(-10*time.Minute + timestampTolerance),
EndsAt: now.Add(-5*time.Minute - timestampTolerance),
UpdatedAt: now,
CreatedBy: "x",
Comment: "x",
},
},
{ {
a: nil, a: nil,
b: &types.Silence{ b: &types.Silence{