From 538e1fbc643c9a2725f08ad713a319c21d69fde7 Mon Sep 17 00:00:00 2001
From: Leandro Piccilli <piccilli@gmail.com>
Date: Thu, 27 Oct 2016 18:59:24 +0200
Subject: [PATCH] Fix templating using query

---
 .../datasource/elasticsearch/query_builder.js | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js
index cb1081a3bc6..292020a032f 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -251,7 +251,7 @@ function (queryDef) {
   };
 
   ElasticQueryBuilder.prototype.getTermsQuery = function(queryDef) {
-    var query, queryPath;
+    var query;
 
     if (this.esVersion >= 5) {
       query = {
@@ -262,7 +262,15 @@ function (queryDef) {
           }
         }
       };
-      queryPath = query.query.bool.must;
+
+      if (queryDef.query) {
+        query.query.bool.must.push({
+          "query_string": {
+            "analyze_wildcard": true,
+            "query": queryDef.query,
+          }
+        });
+      }
 
     } else {
       query = {
@@ -277,16 +285,15 @@ function (queryDef) {
           }
         }
       };
-      queryPath = query.query.filtered.query;
-    }
 
-    if (queryDef.query) {
-      queryPath = {
-        "query_string": {
-          "analyze_wildcard": true,
-          "query": queryDef.query,
-        }
-      };
+      if (queryDef.query) {
+        query.query.filtered.query = {
+          "query_string": {
+            "analyze_wildcard": true,
+            "query": queryDef.query,
+          }
+        };
+      }
     }
 
     query.aggs =  {