From 717a96ab8ded92f921407d1a531b1388f3b0ea3e Mon Sep 17 00:00:00 2001
From: Leandro Piccilli <piccilli@gmail.com>
Date: Tue, 8 Nov 2016 22:18:59 +0100
Subject: [PATCH] Fix raw document query on ES 5.x

---
 .../app/plugins/datasource/elasticsearch/query_builder.js  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js
index 292020a032f..76608b7f90c 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -102,7 +102,12 @@ function (queryDef) {
     query.size = 500;
     query.sort = {};
     query.sort[this.timeField] = {order: 'desc', unmapped_type: 'boolean'};
-    query.fields = ["*", "_source"];
+
+    // fields field not supported on ES 5.x
+    if (this.esVersion < 5) {
+      query.fields = ["*", "_source"];
+    }
+
     query.script_fields = {},
     query.fielddata_fields = [this.timeField];
     return query;