From 9bdca03aac91798508d49ec238f21635499cdfff Mon Sep 17 00:00:00 2001
From: Joe Fleming <joe.fleming@gmail.com>
Date: Fri, 26 Feb 2016 16:55:24 -0700
Subject: [PATCH] use requestTimeout and pingTimeout on exposed client

Fixes #6377
---
 src/plugins/elasticsearch/lib/expose_client.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/plugins/elasticsearch/lib/expose_client.js b/src/plugins/elasticsearch/lib/expose_client.js
index f12fb803c4855..33ca7a9fc85da 100644
--- a/src/plugins/elasticsearch/lib/expose_client.js
+++ b/src/plugins/elasticsearch/lib/expose_client.js
@@ -18,6 +18,8 @@ module.exports = function (server) {
       clientKey: config.get('elasticsearch.ssl.key'),
       ca: config.get('elasticsearch.ssl.ca'),
       apiVersion: config.get('elasticsearch.apiVersion'),
+      pingTimeout: config.get('elasticsearch.pingTimeout'),
+      requestTimeout: config.get('elasticsearch.requestTimeout'),
       keepAlive: true,
       auth: true
     });
@@ -43,6 +45,8 @@ module.exports = function (server) {
       ssl: ssl,
       apiVersion: options.apiVersion,
       keepAlive: options.keepAlive,
+      pingTimeout: options.pingTimeout,
+      requestTimeout: options.requestTimeout,
       log: function () {
         this.error = function (err) {
           server.log(['error', 'elasticsearch'], err);