IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-27 00:37:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Elasticsearch: Use array of strings as index in backend queries (#67276)

Browse Source 
Elasticsearch: Use array of strings as indice in backend queries
This commit is contained in:
Ivana Huckova 2023-04-26 16:07:15 +02:00 committed by GitHub
parent a420040c73
commit d0ced39847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/tsdb/elasticsearch/client/client.go
View File

@ -207,7 +207,7 @@ func (c *baseClientImpl) createMultiSearchRequests(searchRequests []*SearchReque
header: map[string]interface{}{
"search_type": "query_then_fetch",
"ignore_unavailable": true,
"index": strings.Join(c.indices, ","),
"index": c.indices,
},
body: searchReq,
interval: searchReq.Interval,

2
pkg/tsdb/elasticsearch/client/client_test.go
View File

@ -96,7 +96,7 @@ func TestClient_ExecuteMultisearch(t *testing.T) {
jBody, err := simplejson.NewJson(bodyBytes)
require.NoError(t, err)
assert.Equal(t, "metrics-2018.05.15", jHeader.Get("index").MustString())
assert.Equal(t, []string{"metrics-2018.05.15"}, jHeader.Get("index").MustStringArray())
assert.True(t, jHeader.Get("ignore_unavailable").MustBool(false))
assert.Equal(t, "query_then_fetch", jHeader.Get("search_type").MustString())
assert.Empty(t, jHeader.Get("max_concurrent_shard_requests"))

2
pkg/tsdb/elasticsearch/snapshot_test.go
View File

@ -82,7 +82,7 @@ func TestRequestSnapshots(t *testing.T) {
queryHeader := []byte(`
{
"ignore_unavailable": true,
"index": "testdb-2022.11.14",
"index": ["testdb-2022.11.14"],
"search_type": "query_then_fetch"
}
`)