diff --git a/src/plugins/elasticsearch/index.js b/src/plugins/elasticsearch/index.js index b35c87c62c9c2..82d1983a2b3fe 100644 --- a/src/plugins/elasticsearch/index.js +++ b/src/plugins/elasticsearch/index.js @@ -19,7 +19,7 @@ module.exports = function ({ Plugin }) { username: string(), password: string(), shardTimeout: number().default(0), - requestTimeout: number().default(300000), + requestTimeout: number().default(30000), pingTimeout: number().default(30000), startupTimeout: number().default(5000), ssl: object({ diff --git a/src/plugins/elasticsearch/lib/create_proxy.js b/src/plugins/elasticsearch/lib/create_proxy.js index 338a7aa3433cc..e54c6d95d8e67 100644 --- a/src/plugins/elasticsearch/lib/create_proxy.js +++ b/src/plugins/elasticsearch/lib/create_proxy.js @@ -19,7 +19,7 @@ function createProxy(server, method, route, config) { passThrough: true, agent: createAgent(server), xforward: true, - timeout: server.config().get('elasticsearch.requestTimeout') + 100 + timeout: server.config().get('elasticsearch.requestTimeout') } }, }; diff --git a/src/server/KbnServer.js b/src/server/KbnServer.js index 07fd7e54e97b5..4124f3320add1 100644 --- a/src/server/KbnServer.js +++ b/src/server/KbnServer.js @@ -73,7 +73,7 @@ module.exports = class KbnServer { let { server, config } = this; await this.ready(); - server.listener.timeout = config.get('elasticsearch.requestTimeout') + 100; + server.listener.timeout = config.get('elasticsearch.requestTimeout'); await fromNode(cb => server.start(cb)); await require('./pid')(this, server, config);