fix rollup in timeseries

elastic · Apr 23, 2021 · 2b08df0 · 2b08df0
1 parent e2aaa42
commit 2b08df0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/..._type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts b/..._type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.test.ts
@@ -87,7 +87,6 @@ describe('AbstractSearchStrategy', () => {
           body: 'body',
           index: 'index',
         },
-        indexType: undefined,
       },
       {
         sessionId: '1',

diff --git a/...s/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts b/...s/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts
@@ -21,7 +21,7 @@ export abstract class AbstractSearchStrategy {
     requestContext: VisTypeTimeseriesRequestHandlerContext,
     req: VisTypeTimeseriesVisDataRequest,
     bodies: any[],
-    indexType?: string
+    strategy?: string
   ) {
     const requests: any[] = [];
 
@@ -30,12 +30,14 @@ export abstract class AbstractSearchStrategy {
         requestContext.search
           .search(
             {
-              indexType,
               params: {
                 ...body,
               },
             },
-            req.body.searchSession
+            {
+              ...req.body.searchSession,
+              ...(strategy ? { strategy } : {}),
+            }
           )
           .toPromise()
       );

diff --git a/...ins/vis_type_timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts b/...ins/vis_type_timeseries/server/lib/search_strategies/strategies/rollup_search_strategy.ts
@@ -18,6 +18,7 @@ import type {
   VisTypeTimeseriesVisDataRequest,
 } from '../../../types';
 import { MAX_BUCKETS_SETTING } from '../../../../common/constants';
+import { ROLLUP_SEARCH_STRATEGY } from '../../../../../data/common';
 
 const getRollupIndices = (rollupData: { [key: string]: any }) => Object.keys(rollupData);
 const isIndexPatternContainsWildcard = (indexPattern: string) => indexPattern.includes('*');
@@ -28,7 +29,7 @@ export class RollupSearchStrategy extends AbstractSearchStrategy {
     req: VisTypeTimeseriesVisDataRequest,
     bodies: any[]
   ) {
-    return super.search(requestContext, req, bodies, 'rollup');
+    return super.search(requestContext, req, bodies, ROLLUP_SEARCH_STRATEGY);
   }
 
   async getRollupData(