Use only es strategy)

elastic · Aug 27, 2020 · 3f7c3c4 · 3f7c3c4
1 parent 7ae65ab
commit 3f7c3c4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/src/plugins/vis_type_timelion/server/lib/config_manager.ts b/src/plugins/vis_type_timelion/server/lib/config_manager.ts
@@ -23,7 +23,6 @@ import { configSchema } from '../../config';
 
 export class ConfigManager {
   private esShardTimeout: number = 0;
-  private esRequestTimeout: number = 0;
   private graphiteUrls: string[] = [];
 
   constructor(config: PluginInitializerContext['config']) {
@@ -33,18 +32,13 @@ export class ConfigManager {
 
     config.legacy.globalConfig$.subscribe((configUpdate) => {
       this.esShardTimeout = configUpdate.elasticsearch.shardTimeout.asMilliseconds();
-      this.esRequestTimeout = configUpdate.elasticsearch.requestTimeout.asMilliseconds();
     });
   }
 
   getEsShardTimeout() {
     return this.esShardTimeout;
   }
 
-  getEsRequestTimeout() {
-    return this.esRequestTimeout;
-  }
-
   getGraphiteUrls() {
     return this.graphiteUrls;
   }

diff --git a/src/plugins/vis_type_timelion/server/routes/run.ts b/src/plugins/vis_type_timelion/server/routes/run.ts
@@ -90,7 +90,6 @@ export function runRoute(
           getFunction,
           allowedGraphiteUrls: configManager.getGraphiteUrls(),
           esShardTimeout: configManager.getEsShardTimeout(),
-          esRequestTimeout: configManager.getEsRequestTimeout(),
           savedObjectsClient: context.core.savedObjects.client,
           esDataClient: data.search.search,
         });

diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js b/src/plugins/vis_type_timelion/server/series_functions/es/es.test.js
@@ -41,7 +41,6 @@ function stubRequestAndServer(response, indexPatternSavedObjects = []) {
         });
       },
     },
-    esRequestTimeout: 30000,
   };
 }
 

diff --git a/src/plugins/vis_type_timelion/server/series_functions/es/index.js b/src/plugins/vis_type_timelion/server/series_functions/es/index.js
@@ -132,14 +132,9 @@ export default new Datasource('es', {
     const resp = await tlConfig.esDataClient(
       tlConfig.context,
       {
-        params: {
-          ...body,
-          waitForCompletionTimeout:
-            tlConfig.esRequestTimeout > 60000 ? `${tlConfig.esRequestTimeout}ms` : '1m',
-          keepAlive: tlConfig.esRequestTimeout > 60000 ? `${tlConfig.esRequestTimeout}ms` : '1m',
-        },
+        params: body,
       },
-      {}
+      { strategy: 'es' }
     );
 
     if (!resp.rawResponse._shards.total) {