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

AzureMonitor: Fix dimension migration (#62485)

Browse Source 
Remove unneeded properties post migration
This commit is contained in:
Andreas Christou 2023-01-31 12:36:21 +00:00 committed by GitHub
parent 13f8ea2656
commit f77853f91e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts
View File

@ -155,6 +155,27 @@ describe('AzureMonitor: migrateQuery', () => {
})
);
});
it('correctly removes outdated fields', () => {
const result = migrateQuery({
...azureMonitorQueryV8,
azureMonitor: { dimension: 'testDimension', dimensionFilter: 'testFilter' },
});
expect(result).toMatchObject(
expect.objectContaining({
azureMonitor: expect.objectContaining({
dimensionFilters: [
{
dimension: 'testDimension',
operator: 'eq',
filters: ['testFilter'],
},
],
}),
})
);
expect(result.azureMonitor).not.toHaveProperty('dimension');
expect(result.azureMonitor).not.toHaveProperty('dimensionFilter');
});
it('correctly migrates a metric definition', () => {
const result = migrateQuery({ ...azureMonitorQueryV8, azureMonitor: { metricDefinition: 'ms.ns/mn' } });

3
public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts
View File

@ -103,6 +103,9 @@ function migrateDimensionToDimensionFilter(query: AzureMonitorQuery): AzureMonit
]);
}
delete workingQuery.azureMonitor?.dimension;
delete workingQuery.azureMonitor?.dimensionFilter;
return workingQuery;
}