From df86048b6da679cfb8e1b1bbb54539538fbd5b4b Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 31 Jan 2023 12:48:45 +0000 Subject: [PATCH] [v9.3.x] AzureMonitor: Fix dimension migration (#62578) AzureMonitor: Fix dimension migration (#62485) Remove unneeded properties post migration (cherry picked from commit f77853f91ef8406bf54c8f3ea7337485a6013a4f) Co-authored-by: Andreas Christou --- .../utils/migrateQuery.test.ts | 21 +++++++++++++++++++ .../utils/migrateQuery.ts | 3 +++ 2 files changed, 24 insertions(+) diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts index 7fe16431aec..073e9da4a98 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.test.ts @@ -151,6 +151,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' } }); diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts index 1b44cb3be91..ac90cca6e01 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/utils/migrateQuery.ts @@ -95,6 +95,9 @@ function migrateDimensionToDimensionFilter(query: AzureMonitorQuery): AzureMonit ]); } + delete workingQuery.azureMonitor?.dimension; + delete workingQuery.azureMonitor?.dimensionFilter; + return workingQuery; }