public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CloudWatch: Fix broken queries for users migrating from 8.2.4/8.2.5 to 8.3.0 (#42611) (#42616)

Browse Source 
* move migration logic to a higher version number

* bump version in test

(cherry picked from commit ee9ca20f1f)

Co-authored-by: Erik Sundell <erik.sundell@grafana.com>
This commit is contained in:
Grot (@grafanabot)
2021-12-02 07:57:43 +01:00
committed by GitHub
co-authored by Erik Sundell
parent e9b947ab66
commit 213d59e162
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard/state/DashboardMigrator.test.ts
+1 -1
View File
@@ -179,7 +179,7 @@ describe('DashboardModel', () => {
});
it('dashboard schema version should be set to latest', () => {
expect(model.schemaVersion).toBe(33);
expect(model.schemaVersion).toBe(34);
});
it('graph thresholds should be migrated', () => {
public/app/features/dashboard/state/DashboardMigrator.ts
+11 -7
View File
@@ -67,7 +67,7 @@ export class DashboardMigrator {
let i, j, k, n;
const oldVersion = this.dashboard.schemaVersion;
const panelUpgrades: PanelSchemeUpgradeHandler[] = [];
this.dashboard.schemaVersion = 33;
this.dashboard.schemaVersion = 34;
if (oldVersion === this.dashboard.schemaVersion) {
return;
@@ -692,12 +692,7 @@ export class DashboardMigrator {
}
if (oldVersion < 32) {
panelUpgrades.push((panel: PanelModel) => {
this.migrateCloudWatchQueries(panel);
return panel;
});
this.migrateCloudWatchAnnotationQuery();
// CloudWatch migrations have been moved to version 34
}
// Replace datasource name with reference, uid and type
@@ -727,6 +722,15 @@ export class DashboardMigrator {
});
}
if (oldVersion < 34) {
panelUpgrades.push((panel: PanelModel) => {
this.migrateCloudWatchQueries(panel);
return panel;
});
this.migrateCloudWatchAnnotationQuery();
}
if (panelUpgrades.length === 0) {
return;
}