Merge pull request #775 from bosun-monitor/fix_silence

cmd/bosun: Fix silence logic

cmd/bosun/sched/check_test.go

@@ -1,7 +1,12 @@
 package sched
 
 import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
 	"testing"
+	"time"
 
 	"bosun.org/cmd/bosun/conf"
 	"bosun.org/cmd/bosun/expr"
@@ -73,3 +78,52 @@ func TestCheckFlapping(t *testing.T) {
 		t.Fatal("expected notification")
 	}
 }
+
+func TestCheckSilence(t *testing.T) {
+	s := new(Schedule)
+	done := make(chan bool, 1)
+	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		done <- true
+	}))
+	defer ts.Close()
+	u, err := url.Parse(ts.URL)
+	if err != nil {
+		t.Fatal(err)
+	}
+	c, err := conf.New("", fmt.Sprintf(`
+		template t {
+			subject = "test"
+			body = "test"
+		}
+		notification n {
+			post = http://%s/
+		}
+		alert a {
+			template = t
+			warnNotification = n
+			warn = 1
+		}
+	`, u.Host))
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = s.Init(c)
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = s.AddSilence(time.Now().Add(-time.Hour), time.Now().Add(time.Hour), "a", "", false, true, "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = s.Check(nil, time.Now())
+	if err != nil {
+		t.Fatal(err)
+	}
+	s.CheckNotifications()
+	select {
+	case <-done:
+		t.Fatal("silenced notification was sent")
+	case <-time.After(time.Second * 2):
+		// Timeout *probably* means the silence worked
+	}
+}

cmd/bosun/sched/notify.go

@@ -89,12 +89,16 @@ func (s *Schedule) sendNotifications(silenced map[expr.AlertKey]Silence) {
 		ustates := make(States)
 		for _, st := range states {
 			ak := st.AlertKey()
+			_, silenced := silenced[ak]
 			if st.Last().Status == StUnknown {
-				if _, ok := silenced[ak]; ok {
+				if silenced {
 					log.Println("silencing unknown", ak)
 					continue
 				}
 				ustates[ak] = st
+			}
+			if silenced {
+				log.Println("silencing", ak)
 			} else {
 				s.notify(st, n)
 			}