From b56b7d459fa2008b3e614c30c318a78983f74d94 Mon Sep 17 00:00:00 2001
From: Dave <35579731+davewat@users.noreply.github.com>
Date: Thu, 13 Jun 2019 09:45:31 -0400
Subject: [PATCH] Elasticsearch: Fix empty query request to send properly
 (#17488)

* ensure that empty Elasticsearch queries are properly set to *.  Fixes issue that appears when passing raw data from variables.

* combine null check and empty check into one

(cherry picked from commit c78b6e2a677532c7c607267011cd61d107450352)
---
 public/app/plugins/datasource/elasticsearch/datasource.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/elasticsearch/datasource.ts b/public/app/plugins/datasource/elasticsearch/datasource.ts
index 1a3789a780f..a9e39c3b4b7 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.ts
+++ b/public/app/plugins/datasource/elasticsearch/datasource.ts
@@ -257,7 +257,11 @@ export class ElasticDatasource {
         target.alias = this.templateSrv.replace(target.alias, options.scopedVars, 'lucene');
       }
 
-      const queryString = this.templateSrv.replace(target.query || '*', options.scopedVars, 'lucene');
+      let queryString = this.templateSrv.replace(target.query, options.scopedVars, 'lucene');
+      // Elasticsearch queryString should always be '*' if empty string
+      if (!queryString || queryString === '') {
+        queryString = '*';
+      }
       const queryObj = this.queryBuilder.build(target, adhocFilters, queryString);
       const esQuery = angular.toJson(queryObj);