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

rearrange log statements for log15 (#41137)

Browse Source
This commit is contained in:
Will Browne 2021-11-02 09:20:17 +00:00 committed by GitHub
parent 0599b6180f
commit 2faf3b6a31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ func (s *Service) executeTimeSeriesQuery(ctx context.Context, req *backend.Query
if query.RangeQuery { if query.RangeQuery {
rangeResponse, _, err := client.QueryRange(ctx, query.Expr, timeRange) rangeResponse, _, err := client.QueryRange(ctx, query.Expr, timeRange)
if err != nil { if err != nil {
plog.Error("Range query", query.Expr, "failed with", 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 { } else {
response[RangeQueryType] = rangeResponse response[RangeQueryType] = rangeResponse
@ -79,7 +79,7 @@ func (s *Service) executeTimeSeriesQuery(ctx context.Context, req *backend.Query
if query.InstantQuery { if query.InstantQuery {
instantResponse, _, err := client.Query(ctx, query.Expr, query.End) instantResponse, _, err := client.Query(ctx, query.Expr, query.End)
if err != nil { if err != nil {
plog.Error("Instant query", query.Expr, "failed with", 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 { } else {
response[InstantQueryType] = instantResponse response[InstantQueryType] = instantResponse
@ -89,7 +89,7 @@ func (s *Service) executeTimeSeriesQuery(ctx context.Context, req *backend.Query
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", query.Expr, "failed with", err) plog.Error("Exemplar query failed", "query", query.Expr, "err", err)
result.Responses[query.RefId] = backend.DataResponse{Error: err} result.Responses[query.RefId] = backend.DataResponse{Error: err}
} else { } else {
response[ExemplarQueryType] = exemplarResponse response[ExemplarQueryType] = exemplarResponse
@ -230,7 +230,7 @@ func parseTimeSeriesResponse(value map[TimeSeriesQueryType]interface{}, query *P
case []apiv1.ExemplarQueryResult: case []apiv1.ExemplarQueryResult:
nextFrames = exemplarToDataFrames(v, query, nextFrames) nextFrames = exemplarToDataFrames(v, query, nextFrames)
default: default:
plog.Error("Query", query.Expr, "returned unexpected result type", v) plog.Error("Query returned unexpected result type", "type", v, "query", query.Expr)
continue continue
} }