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

refactoring: elasticsearch raw doc size limit option PR, #8527

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-06-08 11:53:12 +02:00
parent 3c41d0477a
commit 2c75593c1a
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ function (queryDef) {
}; };
ElasticQueryBuilder.prototype.documentQuery = function(query, size) { ElasticQueryBuilder.prototype.documentQuery = function(query, size) {
query.size = size === undefined ? 500 : size; query.size = size;
query.sort = {}; query.sort = {};
query.sort[this.timeField] = {order: 'desc', unmapped_type: 'boolean'}; query.sort[this.timeField] = {order: 'desc', unmapped_type: 'boolean'};
@@ -193,13 +193,12 @@ function (queryDef) {
// handle document query // handle document query
if (target.bucketAggs.length === 0) { if (target.bucketAggs.length === 0) {
metric = target.metrics[0]; metric = target.metrics[0];
if (metric && metric.type !== 'raw_document') { if (!metric || metric.type !== 'raw_document') {
target.bucketAggs = [{type: 'date_histogram', id: '2', settings: {interval: 'auto'}}]; throw {message: 'Invalid query'};
} else {
var size = metric && metric.hasOwnProperty("settings") && metric.settings.hasOwnProperty("size")
&& metric.settings["size"] !== null ? metric.settings["size"] : 500 ;
return this.documentQuery(query,size);
} }
var size = (metric.settings && metric.settings.size) || 500;
return this.documentQuery(query, size);
} }
nestedAggs = query; nestedAggs = query;

2
public/app/plugins/datasource/elasticsearch/specs/datasource_specs.ts
View File

@@ -62,7 +62,7 @@ describe('ElasticDatasource', function() {
from: moment.utc([2015, 4, 30, 10]), from: moment.utc([2015, 4, 30, 10]),
to: moment.utc([2015, 5, 1, 10]) to: moment.utc([2015, 5, 1, 10])
}, },
targets: [{ bucketAggs: [], metrics: [], query: 'escape\\:test' }] targets: [{ bucketAggs: [], metrics: [{type: 'raw_document'}], query: 'escape\\:test' }]
}); });
ctx.$rootScope.$apply(); ctx.$rootScope.$apply();