From 7a8437020d51d05b28758b9cd93b73f762b2d4a9 Mon Sep 17 00:00:00 2001
From: jcolladokuri <jcolladokuri@microsoft.com>
Date: Mon, 11 Apr 2022 16:36:51 -0700
Subject: [PATCH] Azure Monitor: Bug Fix for for template variables (#47478)

---
 .../variables.test.ts                         | 28 +++++++++++++++++++
 .../variables.ts                              |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.test.ts
index 4c927ff84b3..e7f5ef9779e 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.test.ts
@@ -471,6 +471,34 @@ describe('VariableSupport', () => {
         done();
       });
     });
+
+    it('should return None when there is no data', (done) => {
+      const variableSupport = new VariableSupport(
+        createMockDatasource({
+          azureLogAnalyticsDatasource: {
+            defaultSubscriptionId: 'defaultSubscriptionId',
+          },
+          getMetricNames: jest.fn().mockResolvedValueOnce([]),
+        })
+      );
+      const mockRequest = {
+        targets: [
+          {
+            refId: 'A',
+            queryType: AzureQueryType.GrafanaTemplateVariableFn,
+            grafanaTemplateVariableFn: {
+              kind: 'MetricNamesQuery',
+              rawQuery: 'metricNames(resourceGroup, metricDefinition, resourceName, metricNamespace)',
+            },
+          } as AzureMonitorQuery,
+        ],
+      } as DataQueryRequest<AzureMonitorQuery>;
+      const observables = variableSupport.query(mockRequest);
+      observables.subscribe((result: DataQueryResponseData) => {
+        expect(result.data.length).toBe(0);
+        done();
+      });
+    });
   });
 
   it('passes on the query to the main datasource for all non-grafana template variable fns', (done) => {
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.ts
index 2f7b0a41cb8..6c70fa479ab 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.ts
@@ -32,7 +32,7 @@ export class VariableSupport extends CustomVariableSupport<DataSource, AzureMoni
         try {
           const templateVariablesResults = await this.callGrafanaTemplateVariableFn(queryObj.grafanaTemplateVariableFn);
           return {
-            data: templateVariablesResults ? [toDataFrame(templateVariablesResults)] : [],
+            data: templateVariablesResults?.length ? [toDataFrame(templateVariablesResults)] : [],
           };
         } catch (err) {
           return { data: [], error: { message: messageFromError(err) } };