From 629ce6897d3acd6d371fee370c3af65407c59823 Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Wed, 24 Jun 2020 14:24:30 -0700
Subject: [PATCH] Azure Logs: use executedQueryString in metadata (#25755)

---
 packages/grafana-data/src/types/data.ts                   | 1 -
 .../azure_log_analytics/response_parser.ts                | 4 ++--
 .../datasource/grafana-azure-monitor-datasource/types.ts  | 8 ++------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/grafana-data/src/types/data.ts b/packages/grafana-data/src/types/data.ts
index 04af0024e30..84cb52a2caf 100644
--- a/packages/grafana-data/src/types/data.ts
+++ b/packages/grafana-data/src/types/data.ts
@@ -44,7 +44,6 @@ export interface QueryResultMeta {
    * */
   gmdMeta?: any[]; // used by cloudwatch
   alignmentPeriod?: string; // used by stackdriver
-  query?: string; // used by azure log
   searchWords?: string[]; // used by log models and loki
   limit?: number; // used by log models and loki
   json?: boolean; // used to keep track of old json doc values
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 bc13c8a3b65..fb4808b8e0f 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
@@ -65,7 +65,7 @@ export default class ResponseParser {
       bucket.datapoints.push([row[valueIndex], epoch]);
       bucket.refId = query.refId;
       bucket.meta = {
-        query: query.query,
+        executedQueryString: query.query,
       };
     });
 
@@ -81,7 +81,7 @@ export default class ResponseParser {
       rows: rows,
       refId: query.refId,
       meta: {
-        query: query.query,
+        executedQueryString: query.query,
       },
     };
 
diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts b/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts
index 71811845e72..cecc22794ac 100644
--- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts
+++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/types.ts
@@ -1,4 +1,4 @@
-import { DataQuery, DataSourceJsonData, DataSourceSettings } from '@grafana/data';
+import { DataQuery, DataSourceJsonData, DataSourceSettings, TableData } from '@grafana/data';
 
 export type AzureDataSourceSettings = DataSourceSettings<AzureDataSourceJsonData, AzureDataSourceSecureJsonData>;
 
@@ -124,14 +124,10 @@ export interface AzureLogsVariable {
   value: string;
 }
 
-export interface AzureLogsTableData {
+export interface AzureLogsTableData extends TableData {
   columns: AzureLogsTableColumn[];
   rows: any[];
   type: string;
-  refId: string;
-  meta: {
-    query: string;
-  };
 }
 
 export interface AzureLogsTableColumn {