Merge branch 'master' into develop

2017-09-13 16:06:34 +02:00
parent 6ed1b084ce 85bd1861d6
commit a9e3130ef6
56 changed files with 385 additions and 303 deletions
@@ -5,6 +5,8 @@ import (
 	"strings"
 	"time"

+	gocontext "context"
+
 	"github.com/grafana/grafana/pkg/bus"
 	"github.com/grafana/grafana/pkg/components/null"
 	"github.com/grafana/grafana/pkg/components/simplejson"
@@ -112,6 +114,10 @@ func (c *QueryCondition) executeQuery(context *alerting.EvalContext, timeRange *

 	resp, err := c.HandleRequest(context.Ctx, req)
 	if err != nil {
+		if err == gocontext.DeadlineExceeded {
+			return nil, fmt.Errorf("Alert execution exceeded the timeout")
+		}
+
 		return nil, fmt.Errorf("tsdb.HandleRequest() error %v", err)
 	}