bosun-monitor · captncraig · Feb 3, 2016 · Feb 3, 2016
diff --git a/build/validate.sh b/build/validate.sh
@@ -61,7 +61,7 @@ if [ "$GOGENERATEDIFF" != '' ]; then
 fi
 
 echo -e "\nRunning go test bosun.org/..."
-go test bosun.org/...
+go test -v bosun.org/...
 GOTESTRESULT=$?
 if [ "$GOTESTRESULT" != 0 ]; then
 	BUILDMSG="${BUILDMSG}tests fail."

diff --git a/cmd/bosun/conf/conf.go b/cmd/bosun/conf/conf.go
@@ -244,7 +244,7 @@ type Alert struct {
 	UnjoinedOK       bool `json:",omitempty"`
 	Log              bool
 	RunEvery         int
-	returnType       eparse.FuncType
+	returnType       models.FuncType
 
 	template string
 	squelch  []string
@@ -934,7 +934,7 @@ func (c *Conf) loadAlert(s *parse.SectionNode) {
 		c.errorf("neither crit or warn specified")
 	}
 	var tags eparse.Tags
-	var ret eparse.FuncType
+	var ret models.FuncType
 	if a.Crit != nil {
 		ctags, err := a.Crit.Root.Tags()
 		if err != nil {
@@ -1188,7 +1188,7 @@ func (c *Conf) NewExpr(s string) *expr.Expr {
 		c.error(err)
 	}
 	switch exp.Root.Return() {
-	case eparse.TypeNumberSet, eparse.TypeScalar:
+	case models.TypeNumberSet, models.TypeScalar:
 		break
 	default:
 		c.errorf("expression must return a number")
@@ -1306,28 +1306,28 @@ func (c *Conf) Funcs() map[string]eparse.Func {
 		if err != nil {
 			return nil, err
 		}
-		if a.returnType != eparse.TypeNumberSet {
+		if a.returnType != models.TypeNumberSet {
 			return nil, fmt.Errorf("alert requires a number-returning expression (got %v)", a.returnType)
 		}
 		return e.Root.Tags()
 	}
 
 	funcs := map[string]eparse.Func{
 		"alert": {
-			Args:   []eparse.FuncType{eparse.TypeString, eparse.TypeString},
-			Return: eparse.TypeNumberSet,
+			Args:   []models.FuncType{models.TypeString, models.TypeString},
+			Return: models.TypeNumberSet,
 			Tags:   tagAlert,
 			F:      c.alert,
 		},
 		"lookup": {
-			Args:   []eparse.FuncType{eparse.TypeString, eparse.TypeString},
-			Return: eparse.TypeNumberSet,
+			Args:   []models.FuncType{models.TypeString, models.TypeString},
+			Return: models.TypeNumberSet,
 			Tags:   lookupTags,
 			F:      lookup,
 		},
 		"lookupSeries": {
-			Args:   []eparse.FuncType{eparse.TypeSeriesSet, eparse.TypeString, eparse.TypeString},
-			Return: eparse.TypeNumberSet,
+			Args:   []models.FuncType{models.TypeSeriesSet, models.TypeString, models.TypeString},
+			Return: models.TypeNumberSet,
 			Tags:   lookupSeriesTags,
 			F:      lookupSeries,
 		},

diff --git a/cmd/bosun/conf/notify.go b/cmd/bosun/conf/notify.go
@@ -12,6 +12,7 @@ import (
 	"bosun.org/_third_party/github.com/jordan-wright/email"
 	"bosun.org/collect"
 	"bosun.org/metadata"
+	"bosun.org/models"
 	"bosun.org/slog"
 	"bosun.org/util"
 )
@@ -25,7 +26,7 @@ func init() {
 		"The number of email notifications that Bosun failed to send.")
 }
 
-func (n *Notification) Notify(subject, body string, emailsubject, emailbody []byte, c *Conf, ak string, attachments ...*Attachment) {
+func (n *Notification) Notify(subject, body string, emailsubject, emailbody []byte, c *Conf, ak string, attachments ...*models.Attachment) {
 	if len(n.Email) > 0 {
 		go n.DoEmail(emailsubject, emailbody, c, ak, attachments...)
 	}
@@ -93,13 +94,7 @@ func (n *Notification) DoGet(ak string) {
 	}
 }
 
-type Attachment struct {
-	Data        []byte
-	Filename    string
-	ContentType string
-}
-
-func (n *Notification) DoEmail(subject, body []byte, c *Conf, ak string, attachments ...*Attachment) {
+func (n *Notification) DoEmail(subject, body []byte, c *Conf, ak string, attachments ...*models.Attachment) {
 	e := email.NewEmail()
 	e.From = c.EmailFrom
 	for _, a := range n.Email {

diff --git a/cmd/bosun/database/database.go b/cmd/bosun/database/database.go
@@ -20,8 +20,8 @@ type DataAccess interface {
 	Metadata() MetadataDataAccess
 	Search() SearchDataAccess
 	Errors() ErrorDataAccess
+	State() StateDataAccess
 	Silence() SilenceDataAccess
-	Incidents() IncidentDataAccess
 }
 
 type MetadataDataAccess interface {

diff --git a/cmd/bosun/database/incident_data.go b/cmd/bosun/database/incident_data.go