Browse Source

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
Dave 6 years ago
parent
commit
c78b6e2a67
1 changed files with 5 additions and 1 deletions
  1. 5 1
      public/app/plugins/datasource/elasticsearch/datasource.ts

+ 5 - 1
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);