diff --git a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.ts b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.ts index b21cfc9c8d5..f6ec8f2b8f1 100644 --- a/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.ts +++ b/public/app/plugins/datasource/azuremonitor/components/MetricsQueryEditor/dataHooks.ts @@ -128,7 +128,8 @@ const defaultMetricMetadata: MetricMetadata = { export const useMetricMetadata = (query: AzureMonitorQuery, datasource: Datasource, onChange: OnChangeFn) => { const [metricMetadata, setMetricMetadata] = useState(defaultMetricMetadata); const { subscription } = query; - const { resources, metricNamespace, metricName, aggregation, timeGrain, customNamespace } = query.azureMonitor ?? {}; + const { resources, metricNamespace, metricName, aggregation, timeGrain, customNamespace, region } = + query.azureMonitor ?? {}; const { resourceGroup, resourceName } = getResourceGroupAndName(resources); const multipleResources = (resources && resources.length > 1) ?? false; @@ -138,11 +139,11 @@ export const useMetricMetadata = (query: AzureMonitorQuery, datasource: Datasour setMetricMetadata(defaultMetricMetadata); return; } - datasource.azureMonitorDatasource .getMetricMetadata( { subscription, resourceGroup, resourceName, metricNamespace, metricName, customNamespace }, - multipleResources + multipleResources, + region ) .then((metadata) => { // TODO: Move the aggregationTypes and timeGrain defaults into `getMetricMetadata` @@ -161,6 +162,7 @@ export const useMetricMetadata = (query: AzureMonitorQuery, datasource: Datasour }); }); }, [ + region, datasource, subscription, resourceGroup, diff --git a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts index 772ad52d88f..961c86c09e9 100644 --- a/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts +++ b/public/app/plugins/datasource/azuremonitor/resourcePicker/resourcePickerData.ts @@ -1,7 +1,7 @@ import { uniq } from 'lodash'; import { DataSourceInstanceSettings } from '@grafana/data'; -import { DataSourceWithBackend } from '@grafana/runtime'; +import { DataSourceWithBackend, reportInteraction } from '@grafana/runtime'; import { logsResourceTypes, resourceTypeDisplayNames } from '../azureMetadata'; import AzureMonitorDatasource from '../azure_monitor/azure_monitor_datasource'; @@ -359,6 +359,7 @@ export default class ResourcePickerData extends DataSourceWithBackend