From 330bb05f9fe5218e624c50845c49da12844c15f9 Mon Sep 17 00:00:00 2001
From: Fabian Reinartz <fab.reinartz@gmail.com>
Date: Sat, 4 Jul 2015 14:05:04 +0200
Subject: [PATCH] store creation and resolve times in alert

---
 manager/api.go      |  1 +
 manager/dispatch.go | 40 +++++++++++++++++++++++++++-------------
 manager/notify.go   |  5 +++++
 manager/route.go    |  4 ++--
 manager/state.go    |  2 +-
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/manager/api.go b/manager/api.go
index 5156af4f..a347ef69 100644
--- a/manager/api.go
+++ b/manager/api.go
@@ -75,6 +75,7 @@ func (api *API) addAlerts(w http.ResponseWriter, r *http.Request) {
 	for _, alert := range alerts {
 		if alert.Timestamp.IsZero() {
 			alert.Timestamp = time.Now()
+			alert.CreatedAt = alert.Timestamp
 		}
 	}
 
diff --git a/manager/dispatch.go b/manager/dispatch.go
index 0f67e623..662404e9 100644
--- a/manager/dispatch.go
+++ b/manager/dispatch.go
@@ -1,6 +1,7 @@
 package manager
 
 import (
+	"fmt"
 	"sync"
 	"time"
 
@@ -26,7 +27,10 @@ func NewDispatcher(state State) *Dispatcher {
 	}
 }
 
-func (d *Dispatcher) notify(name string, alerts ...*Alert) {
+func (d *Dispatcher) notify(name string, alerts ...*Alert) error {
+	if len(alerts) == 0 {
+		return
+	}
 	n := &LogNotifier{}
 	i := []interface{}{name, "::"}
 	for _, a := range alerts {
@@ -49,7 +53,7 @@ func (d *Dispatcher) Run() {
 			d.processAlert(alert, m)
 		}
 
-		if !alert.Resolved {
+		if !alert.Resolved() {
 			// After the constant timeout update the alert to be resolved.
 			go func(alert *Alert) {
 				for {
@@ -57,7 +61,7 @@ func (d *Dispatcher) Run() {
 					time.Sleep(ResolveTimeout)
 
 					a := *alert
-					a.Resolved = true
+					a.ResolvedAt = time.Now()
 
 					if err := d.state.Alert().Add(&a); err != nil {
 						log.Error(err)
@@ -105,18 +109,16 @@ type Alert struct {
 	Labels model.LabelSet `json:"labels"`
 
 	// Extra key/value information which is not used for aggregation.
-	Payload map[string]string `json:"payload"`
+	Payload     map[string]string `json:"payload,omitempty"`
+	Summary     string            `json:"summary,omitempty"`
+	Description string            `json:"description,omitempty"`
+	Runbook     string            `json:"runbook,omitempty"`
 
-	// Short summary of alert.
-	Summary     string `json:"summary"`
-	Description string `json:"description"`
-	Runbook     string `json:"runbook"`
+	CreatedAt  time.Time `json:"created_at,omitempty"`
+	ResolvedAt time.Time `json:"resolved_at,omitempty"`
 
-	// When the alert was reported.
+	// The authoritative timestamp.
 	Timestamp time.Time `json:"timestamp"`
-
-	// Whether the alert with the given label set is resolved.
-	Resolved bool `json:"resolved"`
 }
 
 // Name returns the name of the alert. It is equivalent to the "alertname" label.
@@ -130,6 +132,18 @@ func (a *Alert) Fingerprint() model.Fingerprint {
 	return a.Labels.Fingerprint()
 }
 
+func (a *Alert) String() string {
+	s := fmt.Sprintf("%s[%x]", a.Name(), a.Fingerprint())
+	if a.Resolved() {
+		return s + "[resolved]"
+	}
+	return s + "[active]"
+}
+
+func (a *Alert) Resolved() bool {
+	return a.ResolvedAt.After(a.CreatedAt)
+}
+
 // aggrGroup aggregates alerts into groups based on
 // common values for a set of labels.
 type aggrGroup struct {
@@ -228,7 +242,7 @@ func (ag *aggrGroup) flush() {
 			continue
 		}
 		// TODO(fabxc): only delete if notify successful.
-		if a.Resolved {
+		if a.Resolved() {
 			delete(ag.alerts, fp)
 		}
 		alerts = append(alerts, a)
diff --git a/manager/notify.go b/manager/notify.go
index 7cea52d6..730168f5 100644
--- a/manager/notify.go
+++ b/manager/notify.go
@@ -5,12 +5,17 @@ import (
 )
 
 type Notifier interface {
+	Name() string
 	Send(...interface{})
 }
 
 type LogNotifier struct {
 }
 
+func (*LogNotifier) Name() string {
+	return "default"
+}
+
 func (*LogNotifier) Send(v ...interface{}) {
 	log.Infoln(v...)
 }
diff --git a/manager/route.go b/manager/route.go
index a723d7f4..00b101cd 100644
--- a/manager/route.go
+++ b/manager/route.go
@@ -8,8 +8,8 @@ import (
 )
 
 var DefaultRouteOpts = RouteOpts{
-	GroupWait:     1 * time.Minute,
-	GroupInterval: 1 * time.Minute,
+	GroupWait:     10 * time.Second,
+	GroupInterval: 10 * time.Second,
 }
 
 type Routes []*Route
diff --git a/manager/state.go b/manager/state.go
index a01201fb..f75ee3d4 100644
--- a/manager/state.go
+++ b/manager/state.go
@@ -125,7 +125,7 @@ func (s *memAlerts) Add(alerts ...*Alert) error {
 		fp := alert.Fingerprint()
 
 		// Last write wins.
-		if prev, ok := s.alerts[fp]; !ok || alert.Timestamp.After(prev.Timestamp) {
+		if prev, ok := s.alerts[fp]; !ok || !prev.Timestamp.After(alert.Timestamp) {
 			s.alerts[fp] = alert
 		}