IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-27 09:21:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Elasticsearch: Return error if invalid query (#61044)

Browse Source 
* Elasticsearch: Return error if invalid query

* Add test

* Fix query in test
This commit is contained in:
Ivana Huckova 2023-01-06 11:14:17 +01:00 committed by GitHub
parent 410b23c3d9
commit 30424a8618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/tests/api/elasticsearch/elasticsearch_test.go
View File

@ -77,6 +77,11 @@ func TestIntegrationElasticsearch(t *testing.T) {
"rawQuery": "*",
"type": "",
"timeField": "@timestamp",
"metrics": []interface{}{
map[string]interface{}{
"type": "logs",
},
},
})
buf1 := &bytes.Buffer{}
err = json.NewEncoder(buf1).Encode(dtos.MetricRequest{

13
pkg/tsdb/elasticsearch/time_series_query.go
View File

@ -37,11 +37,8 @@ func (e *timeSeriesQuery) execute() (*backend.QueryDataResponse, error) {
from := e.dataQueries[0].TimeRange.From.UnixNano() / int64(time.Millisecond)
to := e.dataQueries[0].TimeRange.To.UnixNano() / int64(time.Millisecond)
result := backend.QueryDataResponse{
Responses: backend.Responses{},
}
for _, q := range queries {
if err := e.processQuery(q, ms, from, to, result); err != nil {
if err := e.processQuery(q, ms, from, to); err != nil {
return &backend.QueryDataResponse{}, err
}
}
@ -59,8 +56,7 @@ func (e *timeSeriesQuery) execute() (*backend.QueryDataResponse, error) {
return parseResponse(res.Responses, queries)
}
func (e *timeSeriesQuery) processQuery(q *Query, ms *es.MultiSearchRequestBuilder, from, to int64,
result backend.QueryDataResponse) error {
func (e *timeSeriesQuery) processQuery(q *Query, ms *es.MultiSearchRequestBuilder, from, to int64) error {
defaultTimeField := e.client.GetTimeField()
b := ms.Search(q.Interval)
@ -72,10 +68,7 @@ func (e *timeSeriesQuery) processQuery(q *Query, ms *es.MultiSearchRequestBuilde
if len(q.BucketAggs) == 0 {
// If no aggregations, only document and logs queries are valid
if len(q.Metrics) == 0 || !(q.Metrics[0].Type == rawDataType || q.Metrics[0].Type == rawDocumentType || q.Metrics[0].Type == logsType) {
result.Responses[q.RefID] = backend.DataResponse{
Error: fmt.Errorf("invalid query, missing metrics and aggregations"),
}
return nil
return fmt.Errorf("invalid query, missing metrics and aggregations")
}
// Defaults for log and document queries

17
pkg/tsdb/elasticsearch/time_series_query_test.go
View File

@ -1316,7 +1316,9 @@ func TestExecuteTimeSeriesQuery(t *testing.T) {
c := newFakeClient()
_, err := executeTsdbQuery(c, `{
"timeField": "@timestamp",
"query": "foo"
"query": "foo",
"bucketAggs": [],
"metrics": [{ "id": "1", "type": "raw_data", "settings": {} }]
}`, from, to)
require.NoError(t, err)
sr := c.multisearchRequests[0].Requests[0]
@ -1329,7 +1331,9 @@ func TestExecuteTimeSeriesQuery(t *testing.T) {
c := newFakeClient()
_, err := executeTsdbQuery(c, `{
"timeField": "@timestamp",
"query": "foo"
"query": "foo",
"bucketAggs": [],
"metrics": [{ "id": "1", "type": "raw_data", "settings": {} }]
}`, from, to)
require.NoError(t, err)
sr := c.multisearchRequests[0].Requests[0]
@ -1399,6 +1403,15 @@ func TestExecuteTimeSeriesQuery(t *testing.T) {
"pre_tags": []string{"@HIGHLIGHT@"},
})
})
t.Run("With invalid query should return error", (func(t *testing.T) {
c := newFakeClient()
_, err := executeTsdbQuery(c, `{
"timeField": "@timestamp",
"query": "foo",
}`, from, to)
require.Error(t, err)
}))
})
}