Elasticsearch: Remove xpack button and make includeFrozen not dependant on it (#84734)

pkg/tsdb/elasticsearch/client/client.go

@@ -38,7 +38,6 @@ type DatasourceInfo struct {
 	Interval                   string
 	MaxConcurrentShardRequests int64
 	IncludeFrozen              bool
-	XPack                      bool
 }
 
 type ConfiguredFields struct {
@@ -262,7 +261,7 @@ func (c *baseClientImpl) getMultiSearchQueryParameters() string {
 	}
 	qs = append(qs, fmt.Sprintf("max_concurrent_shard_requests=%d", maxConcurrentShardRequests))
 
-	if c.ds.IncludeFrozen && c.ds.XPack {
+	if c.ds.IncludeFrozen {
 		qs = append(qs, "ignore_throttled=false")
 	}
 

pkg/tsdb/elasticsearch/client/client_test.go

@@ -58,7 +58,6 @@ func TestClient_ExecuteMultisearch(t *testing.T) {
 			Interval:                   "Daily",
 			MaxConcurrentShardRequests: 6,
 			IncludeFrozen:              true,
-			XPack:                      true,
 		}
 
 		from := time.Date(2018, 5, 15, 17, 50, 0, 0, time.UTC)
@@ -148,7 +147,6 @@ func TestClient_ExecuteMultisearch(t *testing.T) {
 			Interval:                   "Daily",
 			MaxConcurrentShardRequests: 6,
 			IncludeFrozen:              true,
-			XPack:                      true,
 		}
 
 		from := time.Date(2018, 5, 15, 17, 50, 0, 0, time.UTC)
@@ -253,7 +251,6 @@ func TestClient_Index(t *testing.T) {
 				Interval:                   test.patternInDatasource,
 				MaxConcurrentShardRequests: 6,
 				IncludeFrozen:              true,
-				XPack:                      true,
 			}
 
 			from := time.Date(2018, 5, 10, 17, 50, 0, 0, time.UTC)

pkg/tsdb/elasticsearch/elasticsearch.go

@@ -157,11 +157,6 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			includeFrozen = false
 		}
 
-		xpack, ok := jsonData["xpack"].(bool)
-		if !ok {
-			xpack = false
-		}
-
 		configuredFields := es.ConfiguredFields{
 			TimeField:       timeField,
 			LogLevelField:   logLevelField,
@@ -177,7 +172,6 @@ func newInstanceSettings(httpClientProvider httpclient.Provider) datasource.Inst
 			ConfiguredFields:           configuredFields,
 			Interval:                   interval,
 			IncludeFrozen:              includeFrozen,
-			XPack:                      xpack,
 		}
 		return model, nil
 	}

pkg/tsdb/elasticsearch/querydata_test.go

@@ -57,7 +57,6 @@ func newFlowTestDsInfo(body []byte, statusCode int, requestCallback func(req *ht
 		HTTPClient:                 &client,
 		MaxConcurrentShardRequests: 42,
 		IncludeFrozen:              false,
-		XPack:                      true,
 	}
 }