AzureMonitor: Remove deprecated code (grafana#48328)

Author: andresmgot

.betterer.results

@@ -299,9 +299,6 @@ exports[`no enzyme tests`] = {
     "public/app/plugins/datasource/elasticsearch/configuration/DataLinks.test.tsx:248699332": [
       [0, 17, 13, "RegExp match", "2409514259"]
     ],
-    "public/app/plugins/datasource/grafana-azure-monitor-datasource/components/deprecated/components/InsightsConfig.test.tsx:1107283234": [
-      [0, 19, 13, "RegExp match", "2409514259"]
-    ],
     "public/app/plugins/datasource/influxdb/components/ConfigEditor.test.tsx:3456478975": [
       [0, 19, 13, "RegExp match", "2409514259"]
     ],

pkg/tsdb/azuremonitor/azuremonitor-resource-handler.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/grafana/grafana-plugin-sdk-go/backend/resource/httpadapter"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/azlog"
-	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/deprecated"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 )
 
@@ -125,7 +124,5 @@ func (s *Service) newResourceMux() *http.ServeMux {
 	mux.HandleFunc("/azuremonitor/", s.handleResourceReq(azureMonitor))
 	mux.HandleFunc("/loganalytics/", s.handleResourceReq(azureLogAnalytics))
 	mux.HandleFunc("/resourcegraph/", s.handleResourceReq(azureResourceGraph))
-	// Remove with Grafana 9
-	mux.HandleFunc("/appinsights/", s.handleResourceReq(deprecated.AppInsights))
 	return mux
 }

pkg/tsdb/azuremonitor/azuremonitor.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/Masterminds/semver"
 	"github.com/grafana/grafana-plugin-sdk-go/backend"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/datasource"
 	"github.com/grafana/grafana-plugin-sdk-go/backend/httpclient"
@@ -15,7 +14,6 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/deprecated"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/loganalytics"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/metrics"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/resourcegraph"
@@ -30,13 +28,6 @@ func ProvideService(cfg *setting.Cfg, httpClientProvider *httpclient.Provider, t
 		azureResourceGraph: &resourcegraph.AzureResourceGraphDatasource{Proxy: proxy},
 	}
 
-	// Insights Analytics and Application Insights were deprecated in Grafana 8.x and
-	// will be finally removed with Grafana 9
-	if setting.BuildVersion != "" && semver.MustParse(setting.BuildVersion).Compare(semver.MustParse("9.0.0-beta1")) < 0 {
-		executors[deprecated.InsightsAnalytics] = &deprecated.InsightsAnalyticsDatasource{Proxy: proxy}
-		executors[deprecated.AppInsights] = &deprecated.ApplicationInsightsDatasource{Proxy: proxy}
-	}
-
 	im := datasource.NewInstanceManager(NewInstanceSettings(cfg, httpClientProvider, executors))
 
 	s := &Service{

pkg/tsdb/azuremonitor/azuremonitor_test.go

@@ -14,41 +14,11 @@ import (
 
 	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/deprecated"
 	"github.com/grafana/grafana/pkg/tsdb/azuremonitor/types"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-func TestProvideService(t *testing.T) {
-	t.Run("it should skip insight analytics and app insights with Grafana 9", func(t *testing.T) {
-		currentV := setting.BuildVersion
-		t.Cleanup(func() {
-			setting.BuildVersion = currentV
-		})
-		versions := []struct {
-			version               string
-			shouldIncludeInsights bool
-		}{
-			{"8.5.0", true},
-			{"9.0.0-beta1", false},
-			{"9.0.0", false},
-		}
-		for _, v := range versions {
-			setting.BuildVersion = v.version
-			s := ProvideService(setting.NewCfg(), httpclient.NewProvider(), nil)
-			if v.shouldIncludeInsights {
-				assert.NotNil(t, s.executors[deprecated.InsightsAnalytics])
-				assert.NotNil(t, s.executors[deprecated.AppInsights])
-			} else {
-				assert.Nil(t, s.executors[deprecated.InsightsAnalytics])
-				assert.Nil(t, s.executors[deprecated.AppInsights])
-			}
-		}
-	})
-}
-
 func TestNewInstanceSettings(t *testing.T) {
 	tests := []struct {
 		name          string