From 21e2ac6d8a270c756520bfc4aa37a061ce05eeff Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Wed, 17 May 2023 15:39:07 +0200 Subject: [PATCH] [v10.0.x] Elasticsearch: Handle no-index case in backend mode (#68629) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Elasticsearch: Handle no-index case in backend mode (#68534) * elastic: backend migration: fix no-index case * improved code (cherry picked from commit fcef387151078b79b21140065bf6e184040d35f6) Co-authored-by: Gábor Farkas --- pkg/tsdb/elasticsearch/client/client_test.go | 6 ++++++ pkg/tsdb/elasticsearch/client/index_pattern.go | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/tsdb/elasticsearch/client/client_test.go b/pkg/tsdb/elasticsearch/client/client_test.go index 7c4461eb4d6..ee218ed31e2 100644 --- 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 index 625841a7893..ff2e1205068 100644 --- a/pkg/tsdb/elasticsearch/client/index_pattern.go +++ b/pkg/tsdb/elasticsearch/client/index_pattern.go @@ -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 {