From 213d59e1624a2dc6e0375a5c374044ca9f2c0d8a Mon Sep 17 00:00:00 2001
From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com>
Date: Thu, 2 Dec 2021 01:57:43 -0500
Subject: [PATCH] CloudWatch: Fix broken queries for users migrating from
 8.2.4/8.2.5 to 8.3.0  (#42611) (#42616)

* move migration logic to a higher version number

* bump version in test

(cherry picked from commit ee9ca20f1fad58b7c7c7fa4cfbcb8b80d731ecf2)

Co-authored-by: Erik Sundell <erik.sundell@grafana.com>
---
 .../dashboard/state/DashboardMigrator.test.ts  |  2 +-
 .../dashboard/state/DashboardMigrator.ts       | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/public/app/features/dashboard/state/DashboardMigrator.test.ts b/public/app/features/dashboard/state/DashboardMigrator.test.ts
index ce67c1410aa..bce72b869c8 100644
--- a/public/app/features/dashboard/state/DashboardMigrator.test.ts
+++ b/public/app/features/dashboard/state/DashboardMigrator.test.ts
@@ -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', () => {
diff --git a/public/app/features/dashboard/state/DashboardMigrator.ts b/public/app/features/dashboard/state/DashboardMigrator.ts
index 5b4b5010e16..9fdddbbf0db 100644
--- a/public/app/features/dashboard/state/DashboardMigrator.ts
+++ b/public/app/features/dashboard/state/DashboardMigrator.ts
@@ -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;
     }