IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prometheus: Fix showing of errors (#41356)

Browse Source 
* Prometheus: Fix showing of errors

* Refactor and add comment
This commit is contained in:
Ivana Huckova 2021-11-05 18:00:48 +01:00 committed by GitHub
parent 998aa42e5c
commit 2daae9eba8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/tsdb/prometheus/time_series_query.go
View File

@ -71,9 +71,9 @@ func (s *Service) executeTimeSeriesQuery(ctx context.Context, req *backend.Query
if err != nil { if err != nil {
plog.Error("Range query failed", "query", query.Expr, "err", err) plog.Error("Range query failed", "query", query.Expr, "err", err)
result.Responses[query.RefId] = backend.DataResponse{Error: err} result.Responses[query.RefId] = backend.DataResponse{Error: err}
} else { continue
response[RangeQueryType] = rangeResponse
} }
response[RangeQueryType] = rangeResponse
} }
if query.InstantQuery { if query.InstantQuery {
@ -81,16 +81,17 @@ func (s *Service) executeTimeSeriesQuery(ctx context.Context, req *backend.Query
if err != nil { if err != nil {
plog.Error("Instant query failed", "query", query.Expr, "err", err) plog.Error("Instant query failed", "query", query.Expr, "err", err)
result.Responses[query.RefId] = backend.DataResponse{Error: err} result.Responses[query.RefId] = backend.DataResponse{Error: err}
} else { continue
}
response[InstantQueryType] = instantResponse response[InstantQueryType] = instantResponse
} }
}
// This is a special case
// If exemplar query returns error, we want to only log it and continue with other results processing
if query.ExemplarQuery { if query.ExemplarQuery {
exemplarResponse, err := client.QueryExemplars(ctx, query.Expr, timeRange.Start, timeRange.End) exemplarResponse, err := client.QueryExemplars(ctx, query.Expr, timeRange.Start, timeRange.End)
if err != nil { if err != nil {
plog.Error("Exemplar query failed", "query", query.Expr, "err", err) plog.Error("Exemplar query failed", "query", query.Expr, "err", err)
result.Responses[query.RefId] = backend.DataResponse{Error: err}
} else { } else {
response[ExemplarQueryType] = exemplarResponse response[ExemplarQueryType] = exemplarResponse
} }