From 7b5decdbb0c0e887cf507455719791da938bffe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= <hugo.haggmark@grafana.com>
Date: Mon, 12 Oct 2020 14:59:21 +0200
Subject: [PATCH] Azure: Fixes cancellation of requests with different Azure
 sources (#28180)

* Azure: Fixes cancellation of requests whit different Azure query types

* Azure: Fixes cancellation of requests whit different Azure query types
---
 .../grafana-azure-monitor-datasource/datasource.ts       | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 7fa0daca956..8a3b9870479 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts
@@ -2,16 +2,16 @@ import _ from 'lodash';
 import AzureMonitorDatasource from './azure_monitor/azure_monitor_datasource';
 import AppInsightsDatasource from './app_insights/app_insights_datasource';
 import AzureLogAnalyticsDatasource from './azure_log_analytics/azure_log_analytics_datasource';
-import { AzureMonitorQuery, AzureDataSourceJsonData, AzureQueryType, InsightsAnalyticsQuery } from './types';
+import { AzureDataSourceJsonData, AzureMonitorQuery, AzureQueryType, InsightsAnalyticsQuery } from './types';
 import {
-  DataSourceApi,
   DataQueryRequest,
-  DataSourceInstanceSettings,
   DataQueryResponseData,
+  DataSourceApi,
+  DataSourceInstanceSettings,
   LoadingState,
   ScopedVars,
 } from '@grafana/data';
-import { Observable, of, from } from 'rxjs';
+import { from, Observable, of } from 'rxjs';
 import { DataSourceWithBackend } from '@grafana/runtime';
 import InsightsAnalyticsDatasource from './insights_analytics/insights_analytics_datasource';
 import { migrateMetricsDimensionFilters } from './query_ctrl';
@@ -82,6 +82,7 @@ export default class Datasource extends DataSourceApi<AzureMonitorQuery, AzureDa
       let q = byType[target.queryType];
       if (!q) {
         q = _.cloneDeep(options);
+        q.requestId = `${q.requestId}-${target.refId}`;
         q.targets = [];
         byType[target.queryType] = q;
       }