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

prettier: ran on all files again, sorry. now settings are defined in package.json

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-12-21 08:39:31 +01:00
parent af34f9977e
commit 3a1f52d8a2
262 changed files with 3996 additions and 7431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
public/app/plugins/datasource/elasticsearch/query_builder.ts
View File

@@ -28,10 +28,7 @@ export class ElasticQueryBuilder {
return queryNode;
}
queryNode.terms.size =
parseInt(aggDef.settings.size, 10) === 0
? 500
: parseInt(aggDef.settings.size, 10);
queryNode.terms.size = parseInt(aggDef.settings.size, 10) === 0 ? 500 : parseInt(aggDef.settings.size, 10);
if (aggDef.settings.orderBy !== void 0) {
queryNode.terms.order = {};
queryNode.terms.order[aggDef.settings.orderBy] = aggDef.settings.order;
@@ -52,10 +49,7 @@ export class ElasticQueryBuilder {
}
if (aggDef.settings.min_doc_count !== void 0) {
queryNode.terms.min_doc_count = parseInt(
aggDef.settings.min_doc_count,
10
);
queryNode.terms.min_doc_count = parseInt(aggDef.settings.min_doc_count, 10);
}
if (aggDef.settings.missing) {
@@ -184,9 +178,7 @@ export class ElasticQueryBuilder {
build(target, adhocFilters?, queryString?) {
// make sure query has defaults;
target.metrics = target.metrics || [{ type: 'count', id: '1' }];
target.bucketAggs = target.bucketAggs || [
{ type: 'date_histogram', id: '2', settings: { interval: 'auto' } },
];
target.bucketAggs = target.bucketAggs || [{ type: 'date_histogram', id: '2', settings: { interval: 'auto' } }];
target.timeField = this.timeField;
var i, nestedAggs, metric;
@@ -279,10 +271,7 @@ export class ElasticQueryBuilder {
}
for (var prop in metric.settings) {
if (
metric.settings.hasOwnProperty(prop) &&
metric.settings[prop] !== null
) {
if (metric.settings.hasOwnProperty(prop) && metric.settings[prop] !== null) {
metricAgg[prop] = metric.settings[prop];
}
}