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

fix: mark bucketAgg parse errors as downstream (#97478)

Browse Source
This commit is contained in:
Nathan Vērzemnieks 2024-12-06 15:02:06 +01:00 committed by GitHub
parent eb01cb6705
commit 3d856dcb33
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/tsdb/elasticsearch/parse_query.go
View File

@ -1,6 +1,8 @@
package elasticsearch
import (
"fmt"
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana-plugin-sdk-go/backend/log"
@ -22,7 +24,7 @@ func parseQuery(tsdbQuery []backend.DataQuery, logger log.Logger) ([]*Query, err
bucketAggs, err := parseBucketAggs(model)
if err != nil {
logger.Error("Failed to parse bucket aggs in query", "error", err, "model", string(q.JSON))
return nil, err
return nil, backend.DownstreamError(err)
}
metrics, err := parseMetrics(model)
if err != nil {
@ -59,12 +61,12 @@ func parseBucketAggs(model *simplejson.Json) ([]*BucketAgg, error) {
agg.Type, err = aggJSON.Get("type").String()
if err != nil {
return nil, err
return nil, fmt.Errorf("failed to parse bucket aggs type: %w", err)
}
agg.ID, err = aggJSON.Get("id").String()
if err != nil {
return nil, err
return nil, fmt.Errorf("failed to parse bucket aggs id: %w", err)
}
agg.Field = aggJSON.Get("field").MustString()