1818 */
1919
2020const filter = ( metric ) => metric . type === 'filter_ratio' ;
21+ import { esQuery } from '../../../../../../data/server' ;
2122import { bucketTransform } from '../../helpers/bucket_transform' ;
2223import { overwrite } from '../../helpers' ;
2324import { calculateAggRoot } from './calculate_agg_root' ;
2425
25- export function ratios ( req , panel ) {
26+ export function ratios ( req , panel , esQueryConfig , indexPatternObject ) {
2627 return ( next ) => ( doc ) => {
2728 panel . series . forEach ( ( column ) => {
2829 const aggRoot = calculateAggRoot ( doc , column ) ;
2930 if ( column . metrics . some ( filter ) ) {
3031 column . metrics . filter ( filter ) . forEach ( ( metric ) => {
31- overwrite ( doc , `${ aggRoot } .timeseries.aggs.${ metric . id } -numerator.filter` , {
32- query_string : { query : metric . numerator || '*' , analyze_wildcard : true } ,
33- } ) ;
34- overwrite ( doc , `${ aggRoot } .timeseries.aggs.${ metric . id } -denominator.filter` , {
35- query_string : { query : metric . denominator || '*' , analyze_wildcard : true } ,
36- } ) ;
32+ overwrite (
33+ doc ,
34+ `${ aggRoot } .timeseries.aggs.${ metric . id } -numerator.filter` ,
35+ esQuery . buildEsQuery ( indexPatternObject , metric . numerator , [ ] , esQueryConfig )
36+ ) ;
37+ overwrite (
38+ doc ,
39+ `${ aggRoot } .timeseries.aggs.${ metric . id } -denominator.filter` ,
40+ esQuery . buildEsQuery ( indexPatternObject , metric . denominator , [ ] , esQueryConfig )
41+ ) ;
3742
3843 let numeratorPath = `${ metric . id } -numerator>_count` ;
3944 let denominatorPath = `${ metric . id } -denominator>_count` ;
@@ -46,7 +51,7 @@ export function ratios(req, panel) {
4651 } ) ,
4752 } ;
4853 overwrite ( doc , `${ aggRoot } .timeseries.aggs.${ metric . id } -numerator.aggs` , aggBody ) ;
49- overwrite ( doc , `${ aggBody } .timeseries.aggs.${ metric . id } -denominator.aggs` , aggBody ) ;
54+ overwrite ( doc , `${ aggRoot } .timeseries.aggs.${ metric . id } -denominator.aggs` , aggBody ) ;
5055 numeratorPath = `${ metric . id } -numerator>metric` ;
5156 denominatorPath = `${ metric . id } -denominator>metric` ;
5257 }
0 commit comments