logstash-input-beats 7.0.10-java → 7.0.12-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a7e09071290860cb84ba2b101e9a1d0881c3896e0191faaac0cbdfa61dcfd02
-  data.tar.gz: 9090eb95e42915ce3be612f91c305bdebe8d54dc33cb95c6db08bc95ce628f8a
+  metadata.gz: d54c774b4f05f81f9bd6cc50d15dff112e2434c61c2a66e4dbcc12786cd3d485
+  data.tar.gz: 6fb474a6020ff82157c6d5da0088d2d9dfbf5920fa2f9fd7332945437111a208
 SHA512:
-  metadata.gz: 7b35bfe519a52e1c91b61f0fed1b8706a3803ada26200fca7f8c09fbb1fda077764824a6c66de6ea94aa032bb9f89851d782a95a601cda52e2fa4ba1256747e9
-  data.tar.gz: 8805d73b864ef74479c5e697ad371cf1b8d55a9ca727d3f3e89e4d1b54dc0661cdaebfb5c371ad0aa1baf5079cd0c6e51d62e5e16e580c4fb6f3bf3bc911cb78
+  metadata.gz: 047ba52cbe6b04aae7e76c57453192c5fcc7b062c20c499c6b613bb99628201782a2355331761b9b0838938e3757c5e1766a2a3ef46c728a32dd3ba9db009774
+  data.tar.gz: c29c9f280e16a53b6c910c95501fe1401550d5042dcfa1c1cf47353eb5c54af0575accbb32814727027af952580302b914a92b26093e2300fa95abc20efcab99

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 7.0.12
+  - When configured to use a port that is already in use, the failure is now propagated to the pipeline [#537](https://github.com/logstash-plugins/logstash-input-beats/pull/537)
+    This fixes an issue where a misconfigured input could retry indefinitely while Logstash's health report continued to report the pipeline as healthy.
+
+## 7.0.11
+  - Update Netty dependency to 4.1.135.Final [#567](https://github.com/logstash-plugins/logstash-input-beats/pull/567)
+
 ## 7.0.10
   - Update Netty dependency to 4.1.134.Final [#541](https://github.com/logstash-plugins/logstash-input-beats/pull/541)
 

data/VERSION

@@ -1 +1 @@
-7.0.10
+7.0.12

data/lib/logstash/inputs/beats.rb

@@ -202,6 +202,12 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
     @logger.info("Starting input listener", :address => "#{@host}:#{@port}")
 
     @server = create_server
+    begin
+      @server.bind()
+    rescue java.net.BindException => bind_exception
+      @server.stop rescue nil
+      fail LogStash::ConfigurationError, "could not bind to #{@host}:#{@port}; #{bind_exception.message}"
+    end
   end # def register
 
   def create_server
@@ -211,9 +217,7 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   end
 
   def run(output_queue)
-    message_listener = MessageListener.new(output_queue, self)
-    @server.setMessageListener(message_listener)
-    @server.listen
+    @server.run(MessageListener.new(output_queue, self))
   end # def run
 
   def stop

data/lib/logstash-input-beats_jars.rb

@@ -1,12 +1,12 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('io.netty', 'netty-handler', '4.1.134.Final')
+require_jar('io.netty', 'netty-handler', '4.1.135.Final')
 require_jar('org.javassist', 'javassist', '3.24.0-GA')
-require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.134.Final')
-require_jar('io.netty', 'netty-codec', '4.1.134.Final')
-require_jar('io.netty', 'netty-transport', '4.1.134.Final')
-require_jar('io.netty', 'netty-resolver', '4.1.134.Final')
-require_jar('io.netty', 'netty-buffer', '4.1.134.Final')
-require_jar('io.netty', 'netty-common', '4.1.134.Final')
-require_jar('org.logstash.beats', 'logstash-input-beats', '7.0.10')
+require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.135.Final')
+require_jar('io.netty', 'netty-codec', '4.1.135.Final')
+require_jar('io.netty', 'netty-transport', '4.1.135.Final')
+require_jar('io.netty', 'netty-resolver', '4.1.135.Final')
+require_jar('io.netty', 'netty-buffer', '4.1.135.Final')
+require_jar('io.netty', 'netty-common', '4.1.135.Final')
+require_jar('org.logstash.beats', 'logstash-input-beats', '7.0.12')

data/lib/tasks/test.rake

@@ -1,12 +1,21 @@
 # encoding: utf-8
-OS_PLATFORM = RbConfig::CONFIG["host_os"]
 VENDOR_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "vendor"))
 
 #TODO: Figure out better means to keep this version in sync
-if OS_PLATFORM == "linux"
-  FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-8.19.2-linux-x86_64.tar.gz"
-elsif OS_PLATFORM == "darwin"
-  FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-8.19.2-linux-arm64.tar.gz"
+FILEBEAT_VERSION = "8.19.14"
+def filebeat_url
+  @filebeat_url ||= begin
+    host_os = RbConfig::CONFIG['host_os']
+    host_cpu = RbConfig::CONFIG['host_cpu']
+
+    fail("unsupported OS #{host_os}") unless %w(linux darwin).include?(host_os)
+    fail("unsupported CPU #{host_cpu}") unless %w(aarch64 x86_64).include?(host_cpu)
+
+    # for historic reasons aarch64 artifacts for linux are labeled arm64
+    host_cpu = "arm64" if host_os == "linux" && host_cpu == "aarch64"
+
+    "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-#{FILEBEAT_VERSION}-#{host_os}-#{host_cpu}.tar.gz"
+  end
 end
 
 require "fileutils"
@@ -37,8 +46,9 @@ namespace :test do
         FileUtils.rm_rf(download_destination)
         FileUtils.rm_rf(destination)
         FileUtils.rm_rf(File.join(VENDOR_PATH, "filebeat.tar"))
-        puts "Filebeat: downloading from #{FILEBEAT_URL} to #{download_destination}"
-        download(FILEBEAT_URL, download_destination)
+
+        puts "Filebeat: downloading from #{filebeat_url} to #{download_destination}"
+        download(filebeat_url, download_destination)
 
         untar_all(download_destination, VENDOR_PATH) { |e| e }
       end

data/spec/inputs/beats/message_listener_spec.rb

@@ -6,6 +6,8 @@ require "logstash/inputs/beats/message_listener"
 require "logstash/instrument/namespaced_null_metric"
 require "thread"
 
+require_relative "../../support/logstash_test"
+
 java_import java.util.HashMap
 
 class MockMessage
@@ -54,9 +56,7 @@ end
 
 shared_examples "when the message is from any libbeat" do |ecs_compatibility, host_field_name|
   let(:input) do
-    input = LogStash::Inputs::Beats.new({ "port" => 5555, "codec" => codec, "ecs_compatibility" => "#{ecs_compatibility}" })
-    input.register
-    input
+    LogStash::Inputs::Beats.new({ "port" => BeatsInputTest.find_available_port, "codec" => codec, "ecs_compatibility" => "#{ecs_compatibility}" })
   end
 
   #Requires data modeled as Java, not Ruby since the actual code pulls from Java backed (Netty) object
@@ -124,10 +124,12 @@ describe LogStash::Inputs::Beats::MessageListener do
   let(:queue)  { Queue.new }
   let(:codec) { DummyCodec.new }
   let(:input) do
-    input = LogStash::Inputs::Beats.new({ "port" => 5555, "codec" => codec })
-    input.register
-    input
+    LogStash::Inputs::Beats.new({ "port" => BeatsInputTest.find_available_port, "codec" => codec })
+  end
+  let(:registered_input) do
+    input.tap(&:register)
   end
+  after(:each) { input.stop }
 
   let(:ip_address) { "10.0.0.1" }
   let(:remote_address) { OngoingMethodMock.new("getHostAddress", ip_address) }
@@ -135,7 +137,7 @@ describe LogStash::Inputs::Beats::MessageListener do
 
   let(:message) { MockMessage.new("abc", { "message" => "hello world"}) }
 
-  subject { described_class.new(queue, input) }
+  subject { described_class.new(queue, registered_input) }
 
   before do
     subject.onNewConnection(ctx)

data/spec/inputs/beats_spec.rb

@@ -11,7 +11,7 @@ require "logstash/event"
 describe LogStash::Inputs::Beats do
   let(:connection) { double("connection") }
   let(:certificate) { BeatsInputTest.certificate }
-  let(:port) { BeatsInputTest.random_port }
+  let(:port) { BeatsInputTest.find_available_port(host: "::") }
   let(:client_inactivity_timeout) { 400 }
   let(:event_loop_threads) { 1 + rand(4) }
   let(:executor_threads) { 1 + rand(9) }
@@ -34,11 +34,12 @@ describe LogStash::Inputs::Beats do
   context "#register" do
     context "host related configuration" do
       let(:config) { super().merge("host" => host, "port" => port) }
-      let(:host) { "192.168.1.20" }
-      let(:port) { 9001 }
+      let(:host) { BeatsInputTest.own_ip_address }
+      let(:port) { BeatsInputTest.find_available_port(host: host) }
+      after(:each) { subject.stop }
 
       it "sends the required options to the server" do
-        expect(org.logstash.beats.Server).to receive(:new).with(plugin.id, host, port, client_inactivity_timeout, event_loop_threads, executor_threads)
+        expect(org.logstash.beats.Server).to receive(:new).with(plugin.id, host, port, client_inactivity_timeout, event_loop_threads, executor_threads).and_call_original
         subject.register
       end
     end
@@ -48,6 +49,21 @@ describe LogStash::Inputs::Beats do
       expect { plugin.register }.not_to raise_error
     end
 
+    context "when port is unavailable" do
+      around(:each) do |example|
+        BeatsInputTest.with_bound_port(port: port, &example)
+      end
+
+      after(:each) { subject.stop }
+
+      it "raises a helpful exception" do
+        expect do
+          plugin.register
+        end.to raise_error(LogStash::ConfigurationError)
+                 .with_message(a_string_including("could not bind to #{subject.host}:#{subject.port}"))
+      end
+    end
+
     context "with ssl enabled" do
 
       let(:config) { { "ssl_enabled" => true, "port" => port, "ssl_key" => certificate.ssl_key, "ssl_certificate" => certificate.ssl_cert } }
@@ -377,8 +393,8 @@ describe LogStash::Inputs::Beats do
           "ecs_compatibility" => 'disabled'
       )
     end
-    let(:host) { "192.168.1.20" }
-    let(:port) { 9002 }
+    let(:host) { BeatsInputTest.own_ip_address }
+    let(:port) { BeatsInputTest.find_available_port(host: host) }
 
     let(:queue) { Queue.new }
     let(:event) { LogStash::Event.new }
@@ -388,11 +404,10 @@ describe LogStash::Inputs::Beats do
     before do
       @server = org.logstash.beats.Server.new(plugin.id, host, port, client_inactivity_timeout, event_loop_threads, executor_threads)
       expect( org.logstash.beats.Server ).to receive(:new).with(plugin.id, host, port, client_inactivity_timeout, event_loop_threads, executor_threads).and_return @server
-      expect( @server ).to receive(:listen)
+      expect( @server ).to receive(:run) { |message_listener| @message_listener = message_listener }
 
       subject.register
-      subject.run(queue) # listen does nothing
-      @message_listener = @server.getMessageListener
+      subject.run(queue) # stub impl of run does nothing
 
       allow( ssl_engine = double('ssl_engine') ).to receive(:getSession).and_return ssl_session
       allow( ssl_handler = double('ssl-handler') ).to receive(:engine).and_return ssl_engine

data/spec/support/logstash_test.rb

@@ -30,6 +30,37 @@ module BeatsInputTest
     def random_port
       rand(2000..10000)
     end
+
+    ##
+    # Returns the IP address of an interface we own that is neither loopback nor multicast.
+    def own_ip_address
+      Socket.ip_address_list.lazy
+            .select(&:ip?)
+            .reject(&:ipv4_loopback?).reject(&:ipv6_loopback?)
+            .reject(&:ipv4_multicast?).reject(&:ipv6_multicast?)
+            .map(&:ip_address)
+            .first || fail("no serviceable IP addresses on this host: #{Socket.ip_address_list}")
+    end
+
+    ##
+    # yield the block with a port that is available
+    # @return [Integer]: a port that is available
+    def find_available_port(host:"::")
+      with_bound_port(host: host, &:itself)
+    end
+
+    ##
+    # Yields block with a port that is unavailable
+    # @yieldparam port [Integer]
+    # @yieldreturn [Object]
+    # @return [Object]
+    def with_bound_port(host:"::", port:0, &block)
+      server = TCPServer.new(host, port)
+
+      return yield(server.local_address.ip_port)
+    ensure
+      server&.close
+    end
   end
 
   class DummyNeverBlockedQueue < Array

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 7.0.10
+  version: 7.0.12
 platform: java
 authors:
 - Elastic
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
@@ -282,15 +282,15 @@ files:
 - spec/support/integration_shared_context.rb
 - spec/support/logstash_test.rb
 - spec/support/shared_examples.rb
-- vendor/jar-dependencies/io/netty/netty-buffer/4.1.134.Final/netty-buffer-4.1.134.Final.jar
-- vendor/jar-dependencies/io/netty/netty-codec/4.1.134.Final/netty-codec-4.1.134.Final.jar
-- vendor/jar-dependencies/io/netty/netty-common/4.1.134.Final/netty-common-4.1.134.Final.jar
-- vendor/jar-dependencies/io/netty/netty-handler/4.1.134.Final/netty-handler-4.1.134.Final.jar
-- vendor/jar-dependencies/io/netty/netty-resolver/4.1.134.Final/netty-resolver-4.1.134.Final.jar
-- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.134.Final/netty-transport-native-unix-common-4.1.134.Final.jar
-- vendor/jar-dependencies/io/netty/netty-transport/4.1.134.Final/netty-transport-4.1.134.Final.jar
+- vendor/jar-dependencies/io/netty/netty-buffer/4.1.135.Final/netty-buffer-4.1.135.Final.jar
+- vendor/jar-dependencies/io/netty/netty-codec/4.1.135.Final/netty-codec-4.1.135.Final.jar
+- vendor/jar-dependencies/io/netty/netty-common/4.1.135.Final/netty-common-4.1.135.Final.jar
+- vendor/jar-dependencies/io/netty/netty-handler/4.1.135.Final/netty-handler-4.1.135.Final.jar
+- vendor/jar-dependencies/io/netty/netty-resolver/4.1.135.Final/netty-resolver-4.1.135.Final.jar
+- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.135.Final/netty-transport-native-unix-common-4.1.135.Final.jar
+- vendor/jar-dependencies/io/netty/netty-transport/4.1.135.Final/netty-transport-4.1.135.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/7.0.10/logstash-input-beats-7.0.10.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/7.0.12/logstash-input-beats-7.0.12.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Receives events from the Elastic Beats framework
 test_files: