From 611b6922f762afa0e76fd8679a9b8160bca74e6a Mon Sep 17 00:00:00 2001
From: Ivana <ivana.huckova@gmail.com>
Date: Mon, 13 Jul 2020 16:45:18 +0200
Subject: [PATCH] Remove _source just for metrics, not logs

---
 .../datasource/elasticsearch/elastic_response.ts    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/elastic_response.ts b/public/app/plugins/datasource/elasticsearch/elastic_response.ts
index 447fede18ae..218ea4d23c5 100644
--- a/public/app/plugins/datasource/elasticsearch/elastic_response.ts
+++ b/public/app/plugins/datasource/elasticsearch/elastic_response.ts
@@ -417,7 +417,13 @@ export class ElasticResponse {
       if (response.hits && response.hits.hits.length > 0) {
         const { propNames, docs } = flattenHits(response.hits.hits);
         if (docs.length > 0) {
-          const series = createEmptyDataFrame(propNames, this.targets[0].timeField, logMessageField, logLevelField);
+          const series = createEmptyDataFrame(
+            propNames,
+            this.targets[0].timeField,
+            isLogsRequest,
+            logMessageField,
+            logLevelField
+          );
 
           // Add a row for each document
           for (const doc of docs) {
@@ -554,6 +560,7 @@ const flattenHits = (hits: Doc[]): { docs: Array<Record<string, any>>; propNames
 const createEmptyDataFrame = (
   propNames: string[],
   timeField: string,
+  isLogsRequest: boolean,
   logMessageField?: string,
   logLevelField?: string
 ): MutableDataFrame => {
@@ -589,8 +596,8 @@ const createEmptyDataFrame = (
     if (fieldNames.includes(propName)) {
       continue;
     }
-    // Do not add _source field as we are showing each _source field in table instead.
-    if (propName === '_source') {
+    // Do not add _source field (besides logs) as we are showing each _source field in table instead.
+    if (!isLogsRequest && propName === '_source') {
       continue;
     }