Skip to content

Ensure time interval comparisons are in UTC #2648

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 26, 2021
Merged

Ensure time interval comparisons are in UTC #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ccbbae
Ensure time interval comparisons are in UTC
benridley Jul 13, 2021
c70481f
Fix minor timezone typo to help debugging.
benridley Jul 13, 2021
01287a4
Fix test case not being included in mute count
benridley Jul 13, 2021
a113694
Fix typo in label to help debugging (again)
benridley Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion notify/notify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ Loop:
return ctx, alerts, errors.Errorf("mute time %s doesn't exist in config", mtName)
}
for _, ti := range mt {
if ti.ContainsTime(now) {
if ti.ContainsTime(now.UTC()) {
muted = true
break Loop
}
Expand Down
22 changes: 17 additions & 5 deletions notify/notify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,28 +742,40 @@ func TestTimeMuteStage(t *testing.T) {
}{
{
// Friday during business hours
fireTime: "01 Jan 21 09:00 GMT",
fireTime: "01 Jan 21 09:00 +0000",
labels: model.LabelSet{"foo": "bar"},
shouldMute: false,
},
{
// Tuesday before 5pm
fireTime: "01 Dec 20 16:59 GMT",
fireTime: "01 Dec 20 16:59 +0000",
labels: model.LabelSet{"dont": "mute"},
shouldMute: false,
},
{
// Saturday
fireTime: "17 Oct 20 10:00 GMT",
fireTime: "17 Oct 20 10:00 +0000",
labels: model.LabelSet{"mute": "me"},
shouldMute: true,
},
{
// Wednesday before 9am
fireTime: "14 Oct 20 05:00 GMT",
fireTime: "14 Oct 20 05:00 +0000",
labels: model.LabelSet{"mute": "me"},
shouldMute: true,
},
{
// Ensure comparisons are UTC only. 12:00 KST should be muted (03:00 UTC)
fireTime: "14 Oct 20 12:00 +0900",
labels: model.LabelSet{"mute": "kst"},
shouldMute: true,
},
{
// Ensure comparisons are UTC only. 22:00 KST should not be muted (13:00 UTC)
fireTime: "14 Oct 20 22:00 +0900",
labels: model.LabelSet{"kst": "dont_mute"},
shouldMute: false,
},
}
var intervals []timeinterval.TimeInterval
err := yaml.Unmarshal([]byte(muteIn), &intervals)
Expand All @@ -776,7 +788,7 @@ func TestTimeMuteStage(t *testing.T) {
outAlerts := []*types.Alert{}
nonMuteCount := 0
for _, tc := range cases {
now, err := time.Parse(time.RFC822, tc.fireTime)
now, err := time.Parse(time.RFC822Z, tc.fireTime)
if err != nil {
t.Fatalf("Couldn't parse fire time %s %s", tc.fireTime, err)
}
Expand Down