IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 12:44:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

loki: alerting: better error-handling (#44700)

Browse Source
This commit is contained in:
Gábor Farkas 2022-02-01 13:34:03 +01:00 committed by GitHub
parent 22c3d72d9c
commit 3873c5e7b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/tsdb/loki/loki.go
View File

@ -99,7 +99,6 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest) (*backend.QueryDataResponse, error) {
result := backend.NewQueryDataResponse()
queryRes := backend.DataResponse{}
dsInfo, err := s.getDSInfo(req.PluginContext)
if err != nil {
@ -132,10 +131,15 @@ func (s *Service) QueryData(ctx context.Context, req *backend.QueryDataRequest)
defer span.End()
frames, err := runQuery(client, query)
queryRes := backend.DataResponse{}
if err != nil {
return result, err
queryRes.Error = err
} else {
queryRes.Frames = frames
}
queryRes.Frames = frames
result.Responses[query.RefID] = queryRes
}
return result, nil