Skip to content

Commit

Permalink
Fixes bug with filter ratio (elastic#16052)
Browse files Browse the repository at this point in the history
  • Loading branch information
simianhacker committed Jan 16, 2018
1 parent 385ebe4 commit 3baed0e
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ export default function ratios(req, panel) {
const aggRoot = calculateAggRoot(doc, column);
if (column.metrics.some(filter)) {
column.metrics.filter(filter).forEach(metric => {
_.set(doc, `${aggRoot}.timecolumn.aggs.${metric.id}-numerator.filter`, {
_.set(doc, `${aggRoot}.timeseries.aggs.${metric.id}-numerator.filter`, {
query_string: { query: metric.numerator || '*', analyze_wildcard: true }
});
_.set(doc, `${aggRoot}.timecolumn.aggs.${metric.id}-denominator.filter`, {
_.set(doc, `${aggRoot}.timeseries.aggs.${metric.id}-denominator.filter`, {
query_string: { query: metric.denominator || '*', analyze_wildcard: true }
});

Expand All @@ -26,13 +26,13 @@ export default function ratios(req, panel) {
field: metric.field
})
};
_.set(doc, `${aggRoot}.timecolumn.aggs.${metric.id}-numerator.aggs`, aggBody);
_.set(doc, `${aggBody}.timecolumn.aggs.${metric.id}-denominator.aggs`, aggBody);
_.set(doc, `${aggRoot}.timeseries.aggs.${metric.id}-numerator.aggs`, aggBody);
_.set(doc, `${aggBody}.timeseries.aggs.${metric.id}-denominator.aggs`, aggBody);
numeratorPath = `${metric.id}-numerator>metric`;
denominatorPath = `${metric.id}-denominator>metric`;
}

_.set(doc, `${aggRoot}.timecolumn.aggs.${metric.id}`, {
_.set(doc, `${aggRoot}.timeseries.aggs.${metric.id}`, {
bucket_script: {
buckets_path: {
numerator: numeratorPath,
Expand Down

0 comments on commit 3baed0e

Please sign in to comment.