IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Azure Monitor: Fix multi-resource bug "Missing required region params, requested QueryParams: api-version:2017-12-01-preview..." (#79669)

Browse Source 
* actually fix the bug

* prettier
This commit is contained in:
Andrew Hackmann
2023-12-20 09:24:44 -06:00
committed by GitHub
parent b2b7f57b16
commit 8ff0cfddf4
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
public/app/plugins/datasource/azuremonitor/azure_monitor/url_builder.test.ts
View File

@@ -174,6 +174,22 @@ describe('AzureMonitorUrlBuilder', () => {
'/subscriptions/sub/resource-uri/resource/providers/microsoft.insights/metricdefinitions?api-version=2017-05-01-preview&metricnamespace=custom%2Fnamespace'
);
});
it('adds a region with multiple resources', () => {
const url = UrlBuilder.buildAzureMonitorGetMetricNamesUrl(
'baseUrl',
'apiVersion',
{
resourceUri: '/subscriptions/sub/resource-uri/resource',
},
templateSrv,
true,
'region'
);
expect(url).toBe(
'baseUrl/subscriptions/sub/resource-uri/resource/providers/microsoft.insights/metricdefinitions?api-version=apiVersion&region=region'
);
});
});
describe('Legacy query object', () => {

6
public/app/plugins/datasource/azuremonitor/azure_monitor/url_builder.ts
View File

@@ -104,10 +104,10 @@ export default class UrlBuilder {
if (multipleResources && !customNamespace && metricNamespace) {
url += `&metricnamespace=${encodeURIComponent(metricNamespace)}`;
}
if (region) {
url += `&region=${region}`;
}
if (region && multipleResources) {
url += `&region=${region}`;
}
return url;