From 7cfab776504a42ff3bf929e55fc0af43b9b5b0c9 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres.mgotor@gmail.com>
Date: Mon, 25 Apr 2022 03:34:12 -0700
Subject: [PATCH] AzureMonitor: Remove workaround in Logs editor (#48104)

---
 .../azure_log_analytics_datasource.test.ts          |  5 +----
 .../azure_log_analytics/response_parser.ts          | 13 ++-----------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.test.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.test.ts
index 5da7a4ab09f..6acfffb8630 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.test.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/azure_log_analytics_datasource.test.ts
@@ -138,10 +138,7 @@ describe('AzureLogAnalyticsDatasource', () => {
 
     it('should include template variables as global parameters', async () => {
       const result = await ctx.ds.azureLogAnalyticsDatasource.getKustoSchema('myWorkspace');
-      expect(result.globalParameters.map((f: { name: string }) => f.name)).toEqual([
-        `$${singleVariable.name}`,
-        '$__timeFilter',
-      ]);
+      expect(result.globalParameters.map((f: { name: string }) => f.name)).toEqual([`$${singleVariable.name}`]);
     });
   });
 
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.ts
index 8d70eeea6de..da97cbe4a45 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_log_analytics/response_parser.ts
@@ -236,8 +236,8 @@ export function transformMetadataToKustoSchema(
         {
           name: 'timeColumn',
           type: 'System.String',
-          defaultValue: 'TimeGenerated',
-          cslDefaultValue: 'TimeGenerated',
+          defaultValue: '""',
+          cslDefaultValue: '""',
         },
       ],
     },
@@ -291,15 +291,6 @@ export function transformMetadataToKustoSchema(
     };
   });
 
-  // It's not possible to define optional paramaters in Kusto
-  // and it's not possible to define the same function twice so
-  // we are defining $__timeFilter also as a parameter when used
-  // with no arguments as a workaround
-  globalParameters.push({
-    name: `$__timeFilter`,
-    type: 'boolean',
-  });
-
   return {
     clusterType: 'Engine',
     cluster: {