diff --git a/pkg/tsdb/elasticsearch/client/client.go b/pkg/tsdb/elasticsearch/client/client.go index 1004ab5efa4..577a40f2756 100644 --- a/pkg/tsdb/elasticsearch/client/client.go +++ b/pkg/tsdb/elasticsearch/client/client.go @@ -36,7 +36,6 @@ type DatasourceInfo struct { Database string ConfiguredFields ConfiguredFields Interval string - TimeInterval string MaxConcurrentShardRequests int64 IncludeFrozen bool XPack bool diff --git a/pkg/tsdb/elasticsearch/elasticsearch.go b/pkg/tsdb/elasticsearch/elasticsearch.go index e6deb0c525b..b60f392c6c6 100644 --- a/pkg/tsdb/elasticsearch/elasticsearch.go +++ b/pkg/tsdb/elasticsearch/elasticsearch.go @@ -120,11 +120,6 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst interval = "" } - timeInterval, ok := jsonData["timeInterval"].(string) - if !ok { - timeInterval = "" - } - index, ok := jsonData["index"].(string) if !ok { index = "" @@ -171,7 +166,6 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst MaxConcurrentShardRequests: int64(maxConcurrentShardRequests), ConfiguredFields: configuredFields, Interval: interval, - TimeInterval: timeInterval, IncludeFrozen: includeFrozen, XPack: xpack, } diff --git a/pkg/tsdb/elasticsearch/elasticsearch_test.go b/pkg/tsdb/elasticsearch/elasticsearch_test.go index 3a336e410de..0434a79ae10 100644 --- a/pkg/tsdb/elasticsearch/elasticsearch_test.go +++ b/pkg/tsdb/elasticsearch/elasticsearch_test.go @@ -15,7 +15,6 @@ type datasourceInfo struct { TimeField any `json:"timeField"` MaxConcurrentShardRequests int64 `json:"maxConcurrentShardRequests"` Interval string `json:"interval"` - TimeInterval string `json:"timeInterval"` } func TestNewInstanceSettings(t *testing.T) { @@ -40,7 +39,6 @@ func TestNewInstanceSettings(t *testing.T) { dsInfo := datasourceInfo{ MaxConcurrentShardRequests: 5, Interval: "Daily", - TimeInterval: "TimeInterval", } settingsJSON, err := json.Marshal(dsInfo) @@ -59,7 +57,6 @@ func TestNewInstanceSettings(t *testing.T) { MaxConcurrentShardRequests: 5, Interval: "Daily", TimeField: "", - TimeInterval: "TimeInterval", } settingsJSON, err := json.Marshal(dsInfo) diff --git a/pkg/tsdb/elasticsearch/querydata_test.go b/pkg/tsdb/elasticsearch/querydata_test.go index 3f9cefd6975..7a559b68fb4 100644 --- a/pkg/tsdb/elasticsearch/querydata_test.go +++ b/pkg/tsdb/elasticsearch/querydata_test.go @@ -53,7 +53,6 @@ func newFlowTestDsInfo(body []byte, statusCode int, requestCallback func(req *ht Interval: "Daily", Database: "[testdb-]YYYY.MM.DD", ConfiguredFields: configuredFields, - TimeInterval: "1s", URL: "http://localhost:9200", HTTPClient: &client, MaxConcurrentShardRequests: 42,