Skip to content

Commit 3bea8f2

Browse files
authored
Azure Monitor: Fix namespace selection for storageaccounts (grafana#56449)
1 parent f98ec2c commit 3bea8f2

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/setQueryValue.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ describe('setQueryValue', () => {
44
describe('setCustomNamespace', () => {
55
it('The metricnamespace must be: microsoft.storage/storageaccounts for storage accounts.', () => {
66
const result = setCustomNamespace({ refId: 'A' }, 'microsoft.storage/storageaccounts/fileservices');
7-
expect(result.azureMonitor?.customNamespace).toEqual('');
7+
expect(result.azureMonitor?.customNamespace).toBeUndefined();
8+
expect(result.azureMonitor?.metricNamespace).toEqual('microsoft.storage/storageaccounts/fileservices');
89
});
10+
911
it('Set a custom namespace for non storage accounts.', () => {
1012
const result = setCustomNamespace({ refId: 'A' }, 'foo/bar');
1113
expect(result.azureMonitor?.customNamespace).toEqual('foo/bar');

public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/setQueryValue.ts

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,26 @@ export function setCustomNamespace(query: AzureMonitorQuery, selection: string |
44
if (query.azureMonitor?.customNamespace === selection) {
55
return query;
66
}
7-
const customNamespace = selection?.toLowerCase().startsWith('microsoft.storage/storageaccounts/') ? '' : selection;
7+
8+
if (selection?.toLowerCase().startsWith('microsoft.storage/storageaccounts/')) {
9+
return {
10+
...query,
11+
azureMonitor: {
12+
...query.azureMonitor,
13+
metricNamespace: selection,
14+
metricName: undefined,
15+
aggregation: undefined,
16+
timeGrain: '',
17+
dimensionFilters: [],
18+
},
19+
};
20+
}
821

922
return {
1023
...query,
1124
azureMonitor: {
1225
...query.azureMonitor,
13-
customNamespace,
26+
customNamespace: selection,
1427
metricName: undefined,
1528
aggregation: undefined,
1629
timeGrain: '',

0 commit comments

Comments
 (0)