From b4e76e75b1176901a1e79804c56e8ccaf62414b0 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.martinez@grafana.com>
Date: Wed, 14 Dec 2022 09:54:19 +0100
Subject: [PATCH] AzureMonitor: Fix filter query for empty queryType (#60252)

---
 .../datasource.test.ts                              | 13 +++++++++++++
 .../grafana-azure-monitor-datasource/datasource.ts  |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.test.ts
index f0677e6a1a8..ff3e0b329df 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.test.ts
@@ -34,4 +34,17 @@ describe('Azure Monitor Datasource', () => {
       );
     });
   });
+
+  it('should not filter a valid query', () => {
+    const ds = new Datasource(createMockInstanceSetttings());
+    const query = createMockQuery();
+    expect(ds.filterQuery(query)).toBe(true);
+  });
+
+  it('should filter out a query with no query type', () => {
+    const ds = new Datasource(createMockInstanceSetttings());
+    const query = createMockQuery();
+    delete query.queryType;
+    expect(ds.filterQuery(query)).toBe(false);
+  });
 });
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts
index 832b0db85cc..a3903e0bceb 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/datasource.ts
@@ -59,7 +59,7 @@ export default class Datasource extends DataSourceWithBackend<AzureMonitorQuery,
 
   filterQuery(item: AzureMonitorQuery): boolean {
     if (!item.queryType) {
-      return true;
+      return false;
     }
     const ds = this.pseudoDatasource[item.queryType];
     return ds?.filterQuery?.(item) ?? true;