logstash-input-beats 6.7.2-java → 6.8.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfe0b8587cd80a4285628570381bf998f5765e4d779ee02173b18c90cea621cc
-  data.tar.gz: 9f7b15e3627e6b6a594b9e2227185a7875b321d0a7062639d06332047480a59e
+  metadata.gz: d91fa10d8b1456fdc6a180867ed0a97469b8f6da7791b948710b5946282aa77f
+  data.tar.gz: d63fcf6fe46309ef34d5e4c0e28b322a72057064d3c6e1397446c758811d0a5c
 SHA512:
-  metadata.gz: 7f4f396f596f515f4194083e8e590a83a84e4d6f1e222f7a12de1a3dcb7483c830654f806781ab1fa494568f562fbfccfed09f0a40780858fcec70bf4a46c1e0
-  data.tar.gz: 1307df00e5d5edc2325020dbd8dd0f1902dcf4404412869f254a2b9303560267cebae254cf4852138533b8a6281ce599fb2d86312c2077792982338d9f471e3e
+  metadata.gz: a38aebb075a5d3ab1ac026026c162b93a06b26650a3c45284cf6553ed4e0b5608b39a8fea5c88feb15f12ca605967171e14c8d3212be12d3bd4aed68eb67c5c7
+  data.tar.gz: 9582e7adee36063b8c96d8d75423981bab56b40406d2a9bfee462a3bd51cae77b9ec69cb506f9307a0c3ad63c2eebc584a3f2ae6d51efb4d4f3e5407cc9a7839

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.8.1
+  - Added logging the best Netty's `maxOrder` setting when big payload trigger an unpooled allocation [#493](https://github.com/logstash-plugins/logstash-input-beats/pull/493)
+
+## 6.8.0
+  - Introduce expert only `event_loop_threads` to tune netty event loop threads count [#490](https://github.com/logstash-plugins/logstash-input-beats/pull/490)
+
 ## 6.7.2
   - Restore accidentally removed Lumberjack event parse source lines [#486](https://github.com/logstash-plugins/logstash-input-beats/pull/486)
 

data/VERSION

@@ -1 +1 @@
-6.7.2
+6.8.1

data/docs/index.asciidoc

@@ -217,6 +217,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
 | <<plugins-{type}s-{plugin}-client_inactivity_timeout>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-ecs_compatibility>> | <<string,string>>|No
 | <<plugins-{type}s-{plugin}-enrich>> |<<string,string>>|No
+| <<plugins-{type}s-{plugin}-event_loop_threads>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-executor_threads>> |<<number,number>>|No
 | <<plugins-{type}s-{plugin}-host>> |<<string,string>>|No
 | <<plugins-{type}s-{plugin}-include_codec_tag>> |<<boolean,boolean>>|__Deprecated__
@@ -339,6 +340,20 @@ input {
 }
 --------------------------------------------------
 
+[id="plugins-{type}s-{plugin}-event_loop_threads"]
+===== `event_loop_threads`
+
+* Value type is <<number,number>>
+* Defaults to 0.
+
+When setting `0`, the actual default is `available_processors * 2`
+
+This is an expert-level setting, and generally should not need to be set
+{plugin-uc} plugin is implemented based on a non-blocking mechanism, requiring a number of event loop and executor threads.
+The event loop threads are responsible to communicate with clients (accept incoming connections, enqueue/dequeue tasks and respond) and executor threads handle tasks.
+This configuration intends to limit or increase the number of threads to be created for the event loop.
+See <<plugins-{type}s-{plugin}-executor_threads>> configuration if you need to set executor threads count.
+
 [id="plugins-{type}s-{plugin}-executor_threads"]
 ===== `executor_threads`
 

data/lib/logstash/inputs/beats.rb

@@ -141,6 +141,10 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   # Beats handler executor thread
   config :executor_threads, :validate => :number, :default => LogStash::Config::CpuCoreStrategy.maximum
 
+  # Expert only setting which set's Netty Event Loop Group thread count
+  # defaults to zero where Netty's DEFAULT_EVENT_LOOP_THREADS (NettyRuntime.availableProcessors() * 2) will be applied
+  config :event_loop_threads, :validate => :number, :default => 0
+
   # Flag to determine whether to add host information (provided by the beat in the 'hostname' field) to the event
   config :add_hostname, :validate => :boolean, :default => false, :deprecated => 'This option will be removed in the future as beats determine the event schema'
 
@@ -243,7 +247,7 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   end # def register
 
   def create_server
-    server = org.logstash.beats.Server.new(@host, @port, @client_inactivity_timeout, @executor_threads)
+    server = org.logstash.beats.Server.new(@host, @port, @client_inactivity_timeout, @event_loop_threads, @executor_threads)
     server.setSslHandlerProvider(new_ssl_handshake_provider(new_ssl_context_builder)) if @ssl_enabled
     server
   end

data/lib/logstash-input-beats_jars.rb

@@ -8,4 +8,4 @@ require_jar('io.netty', 'netty-transport', '4.1.100.Final')
 require_jar('io.netty', 'netty-handler', '4.1.100.Final')
 require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.100.Final')
 require_jar('org.javassist', 'javassist', '3.24.0-GA')
-require_jar('org.logstash.beats', 'logstash-input-beats', '6.7.2')
+require_jar('org.logstash.beats', 'logstash-input-beats', '6.8.1')

data/spec/inputs/beats_spec.rb

@@ -13,7 +13,8 @@ describe LogStash::Inputs::Beats do
   let(:certificate) { BeatsInputTest.certificate }
   let(:port) { BeatsInputTest.random_port }
   let(:client_inactivity_timeout) { 400 }
-  let(:threads) { 1 + rand(9) }
+  let(:event_loop_threads) { 1 + rand(4) }
+  let(:executor_threads) { 1 + rand(9) }
   let(:queue)  { Queue.new }
   let(:config)   do
     {
@@ -21,7 +22,8 @@ describe LogStash::Inputs::Beats do
         "ssl_certificate" => certificate.ssl_cert,
         "ssl_key" => certificate.ssl_key,
         "client_inactivity_timeout" => client_inactivity_timeout,
-        "executor_threads" => threads,
+        "event_loop_threads" => event_loop_threads,
+        "executor_threads" => executor_threads,
         "type" => "example",
         "tags" => "beats"
     }
@@ -36,7 +38,7 @@ describe LogStash::Inputs::Beats do
       let(:port) { 9001 }
 
       it "sends the required options to the server" do
-        expect(org.logstash.beats.Server).to receive(:new).with(host, port, client_inactivity_timeout, threads)
+        expect(org.logstash.beats.Server).to receive(:new).with(host, port, client_inactivity_timeout, event_loop_threads, executor_threads)
         subject.register
       end
     end
@@ -529,8 +531,8 @@ describe LogStash::Inputs::Beats do
     subject(:plugin) { LogStash::Inputs::Beats.new(config) }
 
     before do
-      @server = org.logstash.beats.Server.new(host, port, client_inactivity_timeout, threads)
-      expect( org.logstash.beats.Server ).to receive(:new).with(host, port, client_inactivity_timeout, threads).and_return @server
+      @server = org.logstash.beats.Server.new(host, port, client_inactivity_timeout, event_loop_threads, executor_threads)
+      expect( org.logstash.beats.Server ).to receive(:new).with(host, port, client_inactivity_timeout, event_loop_threads, executor_threads).and_return @server
       expect( @server ).to receive(:listen)
 
       subject.register

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 6.7.2
+  version: 6.8.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -327,7 +327,7 @@ files:
 - vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.100.Final/netty-transport-native-unix-common-4.1.100.Final.jar
 - vendor/jar-dependencies/io/netty/netty-transport/4.1.100.Final/netty-transport-4.1.100.Final.jar
 - vendor/jar-dependencies/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA.jar
-- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.7.2/logstash-input-beats-6.7.2.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.8.1/logstash-input-beats-6.8.1.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)