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 pull request #3017 from volter/master

Browse Source 
"No limit" was not effective for ES terms aggregation
This commit is contained in:
Torkel Ödegaard 2015-10-23 17:39:44 +02:00
commit 91a814d295
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,15 +15,14 @@ function (angular) {
}; };
ElasticQueryBuilder.prototype.buildTermsAgg = function(aggDef, queryNode, target) { ElasticQueryBuilder.prototype.buildTermsAgg = function(aggDef, queryNode, target) {
var metricRef, metric, size, y; var metricRef, metric, y;
queryNode.terms = { "field": aggDef.field }; queryNode.terms = { "field": aggDef.field };
if (!aggDef.settings) { if (!aggDef.settings) {
return queryNode; return queryNode;
} }
size = parseInt(aggDef.settings.size, 10); queryNode.terms.size = parseInt(aggDef.settings.size, 10);
if (size > 0) { queryNode.terms.size = size; }
if (aggDef.settings.orderBy !== void 0) { if (aggDef.settings.orderBy !== void 0) {
queryNode.terms.order = {}; queryNode.terms.order = {};
queryNode.terms.order[aggDef.settings.orderBy] = aggDef.settings.order; queryNode.terms.order[aggDef.settings.orderBy] = aggDef.settings.order;