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

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

Browse Source 
* move migration logic to a higher version number

* bump version in test
This commit is contained in:
Erik Sundell
2021-12-02 07:36:18 +01:00
committed by GitHub
parent ae655f2675
commit ee9ca20f1f
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/dashboard/state/DashboardMigrator.test.ts
View File

@@ -179,7 +179,7 @@ describe('DashboardModel', () => {
}); });
it('dashboard schema version should be set to latest', () => { 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', () => { it('graph thresholds should be migrated', () => {

18
public/app/features/dashboard/state/DashboardMigrator.ts
View File

@@ -67,7 +67,7 @@ export class DashboardMigrator {
let i, j, k, n; let i, j, k, n;
const oldVersion = this.dashboard.schemaVersion; const oldVersion = this.dashboard.schemaVersion;
const panelUpgrades: PanelSchemeUpgradeHandler[] = []; const panelUpgrades: PanelSchemeUpgradeHandler[] = [];
this.dashboard.schemaVersion = 33; this.dashboard.schemaVersion = 34;
if (oldVersion === this.dashboard.schemaVersion) { if (oldVersion === this.dashboard.schemaVersion) {
return; return;
@@ -692,12 +692,7 @@ export class DashboardMigrator {
} }
if (oldVersion < 32) { if (oldVersion < 32) {
panelUpgrades.push((panel: PanelModel) => { // CloudWatch migrations have been moved to version 34
this.migrateCloudWatchQueries(panel);
return panel;
});
this.migrateCloudWatchAnnotationQuery();
} }
// Replace datasource name with reference, uid and type // 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) { if (panelUpgrades.length === 0) {
return; return;
} }