From f9c70dc83430d8b331bbb1ac76b66667a86b0ee5 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Thu, 17 Jun 2021 05:38:11 -0400 Subject: [PATCH] AzureMonitor: Avoid instantiating appInsights for AppInsights for gov cloud (#35772) (#35867) (cherry picked from commit 4ac2ed5de63cdf069f5a454161aac1f82a125c23) Co-authored-by: Andres Martinez Gotor --- .../datasource.ts | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts index 7ca7a041022..a9fa695ba48 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts @@ -25,14 +25,17 @@ import InsightsAnalyticsDatasource from './insights_analytics/insights_analytics import { migrateMetricsDimensionFilters } from './query_ctrl'; import { map } from 'rxjs/operators'; import AzureResourceGraphDatasource from './azure_resource_graph/azure_resource_graph_datasource'; +import { getAzureCloud } from './credentials'; export default class Datasource extends DataSourceApi { azureMonitorDatasource: AzureMonitorDatasource; - appInsightsDatasource: AppInsightsDatasource; azureLogAnalyticsDatasource: AzureLogAnalyticsDatasource; - insightsAnalyticsDatasource: InsightsAnalyticsDatasource; resourcePickerData: ResourcePickerData; azureResourceGraphDatasource: AzureResourceGraphDatasource; + /** @deprecated */ + appInsightsDatasource?: AppInsightsDatasource; + /** @deprecated */ + insightsAnalyticsDatasource?: InsightsAnalyticsDatasource; pseudoDatasource: Record; optionsKey: Record; @@ -43,18 +46,23 @@ export default class Datasource extends DataSourceApi