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

Merge branch 'patch-1' of https://github.com/goldeelox/grafana into goldeelox-patch-1

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-25 20:34:38 +02:00
commit 68397d342b
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/plugins/datasource/elasticsearch/query_builder.js
View File

@ -119,8 +119,12 @@ function (queryDef) {
query.fields = ["*", "_source"]; query.fields = ["*", "_source"];
} }
query.script_fields = {}, query.script_fields = {};
query.docvalue_fields = [this.timeField]; if (this.esVersion < 5) {
query.fielddata_fields = [this.timeField];
} else {
query.docvalue_fields = [this.timeField];
}
return query; return query;
}; };