Skip to content

Commit

Permalink
Backport PR #7212
Browse files Browse the repository at this point in the history
---------

**Commit 1:**
Incorrect default `elasticsearch.requestTimeout`

Documentation says it's 300,000 ms, which is 5 minutes.
The default is actually 30 seconds, or 30,000 ms.

* Original sha: 7ac9f93
* Authored by awochna <awynter@tidyfoxdev.com> on 2016-05-10T17:29:04Z
* Committed by Alex Wynter <awochna@email.arizona.edu> on 2016-05-16T16:44:41Z
  • Loading branch information
jbudz committed May 27, 2016
1 parent 8a3483b commit a8b0a1e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/kibana-yml.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ authority for your Elasticsearch instance.
to `false`.
`elasticsearch.pingTimeout:`:: *Default: the value of the `elasticsearch.requestTimeout` setting* Time in milliseconds to
wait for Elasticsearch to respond to pings.
`elasticsearch.requestTimeout:`:: *Default: 300000* Time in milliseconds to wait for responses from the back end or
`elasticsearch.requestTimeout:`:: *Default: 30000* Time in milliseconds to wait for responses from the back end or
Elasticsearch. This value must be a positive integer.
`elasticsearch.requestHeadersWhitelist:`:: *Default: `[ 'authorization' ]`* List of Kibana client-side headers to send to Elasticsearch.
To send *no* client-side headers, set this value to [] (an empty list).
Expand Down

0 comments on commit a8b0a1e

Please sign in to comment.