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: Handle no-index case in backend mode (#68534)

Browse Source 
* elastic: backend migration: fix no-index case

* improved code
This commit is contained in:
Gábor Farkas 2023-05-17 15:24:46 +02:00 committed by GitHub
parent 14936f85df
commit fcef387151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,6 +118,12 @@ func TestClient_Index(t *testing.T) {
patternInDatasource string
indexInRequest []string
}{
{
name: "empty string",
indexInDatasource: "",
patternInDatasource: "",
indexInRequest: []string{},
},
{
name: "single string",
indexInDatasource: "logs-*",

6
pkg/tsdb/elasticsearch/client/index_pattern.go
View File

@ -35,7 +35,11 @@ type staticIndexPattern struct {
}
func (ip *staticIndexPattern) GetIndices(timeRange backend.TimeRange) ([]string, error) {
return []string{ip.indexName}, nil
if ip.indexName != "" {
return []string{ip.indexName}, nil
} else {
return []string{}, nil
}
}
type intervalGenerator interface {