From a17a12b9bf52e061912f67a21528b71cd7f1e740 Mon Sep 17 00:00:00 2001 From: Tudor Golubenco Date: Thu, 1 Feb 2018 12:19:59 +0100 Subject: [PATCH] Add docs update and changelog entry for #6250 (#6253) Follow up for #6250. (cherry picked from commit c4b00a9dddee937a68015e205881bc364b7e12b4) --- CHANGELOG.asciidoc | 1 + libbeat/docs/outputconfig.asciidoc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 576245638f7..8395a74177c 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -21,6 +21,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di - Adding a local keystore to allow user to obfuscate password {pull}5687[5687] - Update go-ucfg library to support top level key reference and cyclic key reference for the keystore {pull}6098[6098] +- The default value for pipelining is reduced to 2 to avoid high memory in the Logstash beats input. {pull}6250[6250] *Auditbeat* diff --git a/libbeat/docs/outputconfig.asciidoc b/libbeat/docs/outputconfig.asciidoc index 02d4de56beb..04c7ba83fa8 100644 --- a/libbeat/docs/outputconfig.asciidoc +++ b/libbeat/docs/outputconfig.asciidoc @@ -457,7 +457,7 @@ output.logstash: Configures number of batches to be sent asynchronously to logstash while waiting for ACK from logstash. Output only becomes blocking once number of `pipelining` batches have been written. Pipelining is disabled if a values of 0 is -configured. The default value is 5. +configured. The default value is 2. [[port]] ===== `port`