diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index b7e80480397..65f7ffa0721 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -27,6 +27,7 @@ https://github.com/elastic/beats/compare/v1.2.3...1.3[Check the HEAD diff] *Affecting all Beats* - Fix output modes backoff counter reset. {issue}1803[1803] {pull}1814[1814] {pull}1818[1818] +- Set logstash output default bulk_max_size to 2048. {issue}1662[1662] *Packetbeat* diff --git a/filebeat/etc/filebeat.yml b/filebeat/etc/filebeat.yml index 3f3caede47f..eb81c6d5d02 100644 --- a/filebeat/etc/filebeat.yml +++ b/filebeat/etc/filebeat.yml @@ -282,6 +282,10 @@ output: # Number of workers per Logstash host. #worker: 1 + # The maximum number of events to bulk into a single batch window. The + # default is 2048. + #bulk_max_size: 2048 + # Set gzip compression level. #compression_level: 3 diff --git a/libbeat/etc/libbeat.yml b/libbeat/etc/libbeat.yml index 81f4002088e..3483d4d240b 100644 --- a/libbeat/etc/libbeat.yml +++ b/libbeat/etc/libbeat.yml @@ -111,6 +111,10 @@ output: # Number of workers per Logstash host. #worker: 1 + # The maximum number of events to bulk into a single batch window. The + # default is 2048. + #bulk_max_size: 2048 + # Set gzip compression level. #compression_level: 3 diff --git a/libbeat/outputs/logstash/logstash.go b/libbeat/outputs/logstash/logstash.go index 51a3ffeddf5..4394832c57e 100644 --- a/libbeat/outputs/logstash/logstash.go +++ b/libbeat/outputs/logstash/logstash.go @@ -44,7 +44,7 @@ const ( logstashDefaultTimeout = 30 * time.Second logstasDefaultMaxTimeout = 90 * time.Second defaultSendRetries = 3 - defaultMaxWindowSize = 1024 + defaultMaxWindowSize = 2048 defaultCompressionLevel = 3 ) diff --git a/packetbeat/etc/packetbeat.yml b/packetbeat/etc/packetbeat.yml index 5334d6c6e6f..082cfb68058 100644 --- a/packetbeat/etc/packetbeat.yml +++ b/packetbeat/etc/packetbeat.yml @@ -250,6 +250,10 @@ output: # Number of workers per Logstash host. #worker: 1 + # The maximum number of events to bulk into a single batch window. The + # default is 2048. + #bulk_max_size: 2048 + # Set gzip compression level. #compression_level: 3 diff --git a/topbeat/etc/topbeat.yml b/topbeat/etc/topbeat.yml index 7c7dfbff6c7..c856b1fe0a3 100644 --- a/topbeat/etc/topbeat.yml +++ b/topbeat/etc/topbeat.yml @@ -137,6 +137,10 @@ output: # Number of workers per Logstash host. #worker: 1 + # The maximum number of events to bulk into a single batch window. The + # default is 2048. + #bulk_max_size: 2048 + # Set gzip compression level. #compression_level: 3 diff --git a/winlogbeat/etc/winlogbeat.yml b/winlogbeat/etc/winlogbeat.yml index 67aa3d0789a..8a75513866f 100644 --- a/winlogbeat/etc/winlogbeat.yml +++ b/winlogbeat/etc/winlogbeat.yml @@ -136,6 +136,10 @@ output: # Number of workers per Logstash host. #worker: 1 + # The maximum number of events to bulk into a single batch window. The + # default is 2048. + #bulk_max_size: 2048 + # Set gzip compression level. #compression_level: 3