elastic: backend migration: fix no-index case

grafana · May 16, 2023 · f9b7e3e · f9b7e3e
1 parent 14fb4ff
commit f9b7e3e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/pkg/tsdb/elasticsearch/client/client_test.go b/pkg/tsdb/elasticsearch/client/client_test.go
@@ -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-*",

diff --git a/pkg/tsdb/elasticsearch/client/index_pattern.go b/pkg/tsdb/elasticsearch/client/index_pattern.go
@@ -35,7 +35,12 @@ type staticIndexPattern struct {
 }
 
 func (ip *staticIndexPattern) GetIndices(timeRange backend.TimeRange) ([]string, error) {
-	return []string{ip.indexName}, nil
+	name := ip.indexName
+	if name != "" {
+		return []string{name}, nil
+	} else {
+		return []string{}, nil
+	}
 }
 
 type intervalGenerator interface {