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

Elasticsearch: Fix source for invalid query error (#93501)

Browse Source
This commit is contained in:
Isabella Siu 2024-09-20 11:06:30 -04:00 committed by GitHub
parent 2ad558d046
commit fac98d9084
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/elasticsearch/data_query.go
View File

@ -77,7 +77,7 @@ func (e *elasticsearchDataQuery) execute() (*backend.QueryDataResponse, error) {
e.logger.Info("Prepared request", "queriesLength", len(queries), "duration", time.Since(start), "stage", es.StagePrepareRequest) e.logger.Info("Prepared request", "queriesLength", len(queries), "duration", time.Since(start), "stage", es.StagePrepareRequest)
res, err := e.client.ExecuteMultisearch(req) res, err := e.client.ExecuteMultisearch(req)
if err != nil { if err != nil {
// We are returning error containing the source that was added trough errorsource.Middleware // We are returning error containing the source that was added through errorsource.Middleware
return errorsource.AddErrorToResponse(e.dataQueries[0].RefID, response, err), nil return errorsource.AddErrorToResponse(e.dataQueries[0].RefID, response, err), nil
} }
@ -87,7 +87,7 @@ func (e *elasticsearchDataQuery) execute() (*backend.QueryDataResponse, error) {
func (e *elasticsearchDataQuery) processQuery(q *Query, ms *es.MultiSearchRequestBuilder, from, to int64) error { func (e *elasticsearchDataQuery) processQuery(q *Query, ms *es.MultiSearchRequestBuilder, from, to int64) error {
err := isQueryWithError(q) err := isQueryWithError(q)
if err != nil { if err != nil {
err = fmt.Errorf("received invalid query. %w", err) err = errorsource.DownstreamError(fmt.Errorf("received invalid query. %w", err), false)
return err return err
} }