Merge pull request #870 from bosun-monitor/web-template-error-result

cmd/bosun: Ensure web instances have their result set

cmd/bosun/web/expr.go

@@ -144,6 +144,13 @@ func procRule(t miniprofiler.Timer, c *conf.Conf, a *conf.Alert, now time.Time,
 				warning = append(warning, fmt.Sprintf("template group %s was not a subset of any result", template_group))
 			}
 		}
+		if e := instance.History[0]; e.Error != nil {
+			instance.Result = e.Error
+		} else if e.Crit != nil {
+			instance.Result = e.Crit
+		} else if e.Warn != nil {
+			instance.Result = e.Warn
+		}
 		var b_err, s_err error
 		func() {
 			defer func() {

cmd/bosun/web/web_test.go

@@ -0,0 +1,27 @@
+package web
+
+import (
+	"testing"
+	"time"
+
+	"bosun.org/cmd/bosun/conf"
+)
+
+func TestErrorTemplate(t *testing.T) {
+	c, err := conf.New("", `
+		template t {
+			body = {{.Eval "invalid"}}
+		}
+		alert a {
+			template = t
+			crit = 1
+		}
+	`)
+	if err != nil {
+		t.Fatal(err)
+	}
+	_, err = procRule(nil, c, c.Alerts["a"], time.Time{}, false, "", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+}