From 576eb94e5bfb2976b83cf36f9b3a5d0b9707b90f Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Thu, 28 Mar 2024 17:05:00 +0200
Subject: [PATCH] [v11.0.x] Azure/GCM: Update `filterQuery` methods to carry
 out migrations (#85365)

Azure/GCM: Update `filterQuery` methods to carry out migrations (#85355)

Update filterQuery methods to carry out migrations

(cherry picked from commit 697a18737d085486584d73e6dc1a9a7571ccf848)

Co-authored-by: Andreas Christou <andreas.christou@grafana.com>
---
 public/app/plugins/datasource/azuremonitor/datasource.ts    | 4 +++-
 .../app/plugins/datasource/cloud-monitoring/datasource.ts   | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/azuremonitor/datasource.ts b/public/app/plugins/datasource/azuremonitor/datasource.ts
index 9e785df76d8..224f4680f7b 100644
--- a/public/app/plugins/datasource/azuremonitor/datasource.ts
+++ b/public/app/plugins/datasource/azuremonitor/datasource.ts
@@ -76,8 +76,10 @@ export default class Datasource extends DataSourceWithBackend<AzureMonitorQuery,
     if (!item.queryType) {
       return false;
     }
+
+    const query = migrateQuery(item);
     const ds = this.pseudoDatasource[item.queryType];
-    return ds?.filterQuery?.(item) ?? true;
+    return ds?.filterQuery?.(query) ?? true;
   }
 
   query(options: DataQueryRequest<AzureMonitorQuery>): Observable<DataQueryResponse> {
diff --git a/public/app/plugins/datasource/cloud-monitoring/datasource.ts b/public/app/plugins/datasource/cloud-monitoring/datasource.ts
index cdde6ea4763..41ed0511c6e 100644
--- a/public/app/plugins/datasource/cloud-monitoring/datasource.ts
+++ b/public/app/plugins/datasource/cloud-monitoring/datasource.ts
@@ -303,11 +303,13 @@ export default class CloudMonitoringDatasource extends DataSourceWithBackend<
     }, {} as T);
   }
 
-  filterQuery(query: CloudMonitoringQuery): boolean {
-    if (query.hide) {
+  filterQuery(item: CloudMonitoringQuery): boolean {
+    if (item.hide) {
       return false;
     }
 
+    const query = this.migrateQuery(item);
+
     if (query.queryType === QueryType.SLO) {
       if (!query.sloQuery) {
         return false;