List open incidents

cmd/bosun/conf/conf.go

@@ -295,6 +295,31 @@ func (ns *Notifications) Get(c *Conf, tags opentsdb.TagSet) map[string]*Notifica
 	return nots
 }
 
+func GetNotificationChains(c *Conf, n map[string]*Notification) ([][]string) {
+	chains := [][]string{}
+	for _, root := range n {
+		chain := []string{}
+		seen := make(map[string]bool)
+		var walkChain func(next *Notification)
+		walkChain = func(next *Notification) {
+			if (next == nil) {
+				chains = append(chains, chain)
+				return
+			}
+			if (seen[next.Name]) {
+				chain = append(chain, fmt.Sprintf("...%v", next.Name))
+				chains = append(chains, chain)
+				return
+			}
+			chain = append(chain, next.Name)
+			seen[next.Name] = true
+			walkChain(next.Next)
+		}
+		walkChain(root)
+	}
+	return chains
+}
+
 // parseNotifications parses the comma-separated string v for notifications and
 // returns them.
 func (c *Conf) parseNotifications(v string) (map[string]*Notification, error) {
@@ -340,9 +365,9 @@ type Notification struct {
 	body      string
 }
 
-func (n *Notification) MarshalJSON() ([]byte, error) {
-	return nil, fmt.Errorf("conf: cannot json marshal notifications")
-}
+// func (n *Notification) MarshalJSON() ([]byte, error) {
+// 	return nil, fmt.Errorf("conf: cannot json marshal notifications")
+// }
 
 type Vars map[string]string
 

cmd/bosun/sched/sched.go

@@ -22,6 +22,8 @@ import (
 	"github.com/MiniProfiler/go/miniprofiler"
 	"github.com/boltdb/bolt"
 	"github.com/bradfitz/slice"
+	"github.com/kylebrandt/boolq"
+	"github.com/kylebrandt/boolq/parse"
 	"github.com/tatsushid/go-fastping"
 )
 
@@ -372,16 +374,19 @@ func (s *Schedule) MarshalGroups(T miniprofiler.Timer, filter string) (*StateGro
 	}
 	t.FailingAlerts, t.UnclosedErrors = s.getErrorCounts()
 	T.Step("Setup", func(miniprofiler.Timer) {
-		matches, err2 := makeFilter(filter)
-		if err2 != nil {
-			err = err2
-			return
-		}
 		status2, err2 := s.GetOpenStates()
 		if err2 != nil {
 			err = err2
 			return
 		}
+		var parsedExpr *parse.Tree
+		if filter != "" {
+			parsedExpr, err2 = parse.Parse(filter)
+			if err2 != nil {
+				err = err2
+				return
+			}
+		}
 		for k, v := range status2 {
 			a := s.Conf.Alerts[k.Name()]
 			if a == nil {
@@ -391,7 +396,18 @@ func (s *Schedule) MarshalGroups(T miniprofiler.Timer, filter string) (*StateGro
 				}
 				continue
 			}
-			if matches(s.Conf, a, v) {
+			if parsedExpr == nil {
+				status[k] = v
+				continue
+			}
+			is := MakeIncidentSummary(s.Conf, silenced, v)
+			match := false
+			match, err2 = boolq.AskParsedExpr(*parsedExpr, is)
+			if err2 != nil {
+				err = err2
+				return
+			}
+			if match {
 				status[k] = v
 			}
 		}