IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Interpolate the field property in elastic search term queries (#8663)

Browse Source 
* Interpolate the field property in elastic search term queries

* more defensive interpolation of query.field in ES templates
This commit is contained in:
ajrnz 2017-07-12 06:25:56 +01:00 committed by Torkel Ödegaard
parent bb3bcbe6a1
commit 43974898c1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/app/plugins/datasource/elasticsearch/datasource.js
View File

@ -331,6 +331,9 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
this.metricFindQuery = function(query) {
query = angular.fromJson(query);
query.query = templateSrv.replace(query.query || '*', {}, 'lucene');
if ('field' in query) {
query.field = templateSrv.replace(query.field, {}, 'lucene');
}
if (!query) {
return $q.when([]);