opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-21 07:04:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve error message for timeouts

Browse Source 
closes #9220
This commit is contained in:
bergquist
2017-09-11 20:07:57 +02:00
parent e5f84484eb
commit 057b8a6b2d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/alerting/conditions/query.go
View File

@ -5,6 +5,8 @@ import (
"strings" "strings"
"time" "time"
gocontext "context"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/null" "github.com/grafana/grafana/pkg/components/null"
"github.com/grafana/grafana/pkg/components/simplejson" "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) resp, err := c.HandleRequest(context.Ctx, req)
if err != nil { 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) return nil, fmt.Errorf("tsdb.HandleRequest() error %v", err)
} }