From 3ae39ff02bcdcc2f8b7fd2092db94bfaf51434b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Mon, 3 Apr 2023 14:47:10 +0200
Subject: [PATCH] elasticsearch: removed code related to removed esVersion
 field (#65439)

elastic: remove code that references obsolete json field
---
 .../usagestats/statscollector/service.go      | 24 -------
 .../usagestats/statscollector/service_test.go | 70 +------------------
 .../api/elasticsearch/elasticsearch_test.go   |  1 -
 3 files changed, 3 insertions(+), 92 deletions(-)

diff --git a/pkg/infra/usagestats/statscollector/service.go b/pkg/infra/usagestats/statscollector/service.go
index 07db5905bb6..0845468d067 100644
--- a/pkg/infra/usagestats/statscollector/service.go
+++ b/pkg/infra/usagestats/statscollector/service.go
@@ -2,7 +2,6 @@ package statscollector
 
 import (
 	"context"
-	"fmt"
 	"strings"
 	"time"
 
@@ -74,7 +73,6 @@ func ProvideService(
 		s.collectConcurrentUsers,
 		s.collectDatasourceStats,
 		s.collectDatasourceAccess,
-		s.collectElasticStats,
 		s.collectAlertNotifierStats,
 		s.collectPrometheusFlavors,
 		s.collectAdditionalMetrics,
@@ -240,28 +238,6 @@ func (s *Service) collectDatasourceStats(ctx context.Context) (map[string]interf
 	return m, nil
 }
 
-func (s *Service) collectElasticStats(ctx context.Context) (map[string]interface{}, error) {
-	m := map[string]interface{}{}
-	esDataSourcesQuery := datasources.GetDataSourcesByTypeQuery{Type: datasources.DS_ES}
-	dataSources, err := s.datasources.GetDataSourcesByType(ctx, &esDataSourcesQuery)
-	if err != nil {
-		s.log.Error("Failed to get elasticsearch json data", "error", err)
-		return nil, err
-	}
-	for _, data := range dataSources {
-		esVersion, err := data.JsonData.Get("esVersion").String()
-		if err != nil {
-			continue
-		}
-		statName := fmt.Sprintf("stats.ds.elasticsearch.v%s.count", strings.ReplaceAll(esVersion, ".", "_"))
-
-		count, _ := m[statName].(int64)
-
-		m[statName] = count + 1
-	}
-	return m, nil
-}
-
 func (s *Service) collectDatasourceAccess(ctx context.Context) (map[string]interface{}, error) {
 	m := map[string]interface{}{}
 
diff --git a/pkg/infra/usagestats/statscollector/service_test.go b/pkg/infra/usagestats/statscollector/service_test.go
index 2d6c49d9285..98812cf14c8 100644
--- a/pkg/infra/usagestats/statscollector/service_test.go
+++ b/pkg/infra/usagestats/statscollector/service_test.go
@@ -128,19 +128,13 @@ func TestCollectingUsageStats(t *testing.T) {
 	statsService := statstest.NewFakeService()
 	expectedDataSources := []*datasources.DataSource{
 		{
-			JsonData: simplejson.NewFromAny(map[string]interface{}{
-				"esVersion": "2.0.0",
-			}),
+			JsonData: simplejson.NewFromAny(map[string]interface{}{}),
 		},
 		{
-			JsonData: simplejson.NewFromAny(map[string]interface{}{
-				"esVersion": "2.0.0",
-			}),
+			JsonData: simplejson.NewFromAny(map[string]interface{}{}),
 		},
 		{
-			JsonData: simplejson.NewFromAny(map[string]interface{}{
-				"esVersion": "70.1.1",
-			}),
+			JsonData: simplejson.NewFromAny(map[string]interface{}{}),
 		},
 	}
 
@@ -187,46 +181,6 @@ func TestCollectingUsageStats(t *testing.T) {
 	assert.InDelta(t, int64(65), metrics["stats.uptime"], 6)
 }
 
-func TestElasticStats(t *testing.T) {
-	sqlStore := dbtest.NewFakeDB()
-	statsService := statstest.NewFakeService()
-
-	expectedDataSources := []*datasources.DataSource{
-		{
-			JsonData: simplejson.NewFromAny(map[string]interface{}{
-				"esVersion": "2.0.0",
-			}),
-		},
-		{
-			JsonData: simplejson.NewFromAny(map[string]interface{}{
-				"esVersion": "2.0.0",
-			}),
-		},
-		{
-			JsonData: simplejson.NewFromAny(map[string]interface{}{
-				"esVersion": "70.1.1",
-			}),
-		},
-	}
-
-	s := createService(t, &setting.Cfg{
-		ReportingEnabled:     true,
-		BuildVersion:         "5.0.0",
-		AnonymousEnabled:     true,
-		BasicAuthEnabled:     true,
-		LDAPAuthEnabled:      true,
-		AuthProxyEnabled:     true,
-		Packaging:            "deb",
-		ReportingDistributor: "hosted-grafana",
-	}, sqlStore, statsService,
-		withDatasources(mockDatasourceService{datasources: expectedDataSources}))
-
-	metrics, err := s.collectElasticStats(context.Background())
-	require.NoError(t, err)
-
-	assert.EqualValues(t, 2, metrics["stats.ds."+datasources.DS_ES+".v2_0_0.count"])
-	assert.EqualValues(t, 1, metrics["stats.ds."+datasources.DS_ES+".v70_1_1.count"])
-}
 func TestDatasourceStats(t *testing.T) {
 	sqlStore := dbtest.NewFakeDB()
 	statsService := statstest.NewFakeService()
@@ -253,24 +207,6 @@ func TestDatasourceStats(t *testing.T) {
 		},
 	}
 
-	_ = []*datasources.DataSource{
-		{
-			JsonData: simplejson.NewFromAny(map[string]interface{}{
-				"esVersion": 2,
-			}),
-		},
-		{
-			JsonData: simplejson.NewFromAny(map[string]interface{}{
-				"esVersion": 2,
-			}),
-		},
-		{
-			JsonData: simplejson.NewFromAny(map[string]interface{}{
-				"esVersion": 70,
-			}),
-		},
-	}
-
 	statsService.ExpectedDataSourcesAccessStats = []*stats.DataSourceAccessStats{
 		{
 			Type:   datasources.DS_ES,
diff --git a/pkg/tests/api/elasticsearch/elasticsearch_test.go b/pkg/tests/api/elasticsearch/elasticsearch_test.go
index e017d2247a4..939a2cc56c7 100644
--- a/pkg/tests/api/elasticsearch/elasticsearch_test.go
+++ b/pkg/tests/api/elasticsearch/elasticsearch_test.go
@@ -47,7 +47,6 @@ func TestIntegrationElasticsearch(t *testing.T) {
 	jsonData := simplejson.NewFromAny(map[string]interface{}{
 		"httpMethod":      "post",
 		"httpHeaderName1": "X-CUSTOM-HEADER",
-		"esVersion":       "8.0.0",
 		"timeField":       "@timestamp",
 	})
 	secureJSONData := map[string]string{