logstash-input-beats 7.0.0-java → 7.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f99bdf1800764220d652953474bd4b98195cca6dec131e73fdbfdfae37c7d86
-  data.tar.gz: 3bafe83e5f676a384f2c7ecc473a600b922d31e6a3f1f6c3e9b3c6b4008f73da
+  metadata.gz: ec7b865b0fc421796675071270bf8f0d3286f76f12452c7a6428193e49d90e9e
+  data.tar.gz: 2fd9baad6fd04c72c106c6981267a593bdeaad69d37965aedd269676ccf40d73
 SHA512:
-  metadata.gz: 4d7ad1989c834ef2b9230904b0cf4bf19e168de73db12a7e06ea1a90edc546c4823b32cb823f68ee815740760716d315537c682adb91b7d5ab8b18b3d251f3c0
-  data.tar.gz: 709f7c0e404c009390fc94468ebdaa55a9cba2b702e2cf38b294ac81f00e2c227fd4242838a70bdd3e3b33236a45d16dd0177c08756e8075a503864f95acd52b
+  metadata.gz: 67da81a13687a75ac024fa44702dc9df87a17ff86d775e9c5a75c348955d7cc5c2a317859d4a6ddb52426e43582f8db1a0384b028aac1befe2727332f6d9baa0
+  data.tar.gz: a851c708aa215a5130434ac638ad65898453a50a78dcf52de2ca3a0058bdb140091f83184bbc2c2ef1390cb607770872dd5ee7c649563cb30fec55420302b470

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 7.0.2
+ - Upgrade netty 4.1.118 [#513](https://github.com/logstash-plugins/logstash-input-beats/pull/513)
+
+## 7.0.1
+  - Name netty threads according to their purpose and the plugin id [#511](https://github.com/logstash-plugins/logstash-input-beats/pull/511)
+
 ## 7.0.0
   - Remove deprecated SSL settings
   - SSL settings that were marked deprecated in version `6.6.0` are now marked obsolete, and will prevent the plugin from starting.

data/VERSION

@@ -1 +1 @@
-7.0.0
+7.0.2

data/lib/logstash/inputs/beats.rb

@@ -205,7 +205,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, @event_loop_threads, @executor_threads)
+    server = org.logstash.beats.Server.new(@id, @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

@@ -1,11 +1,11 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('io.netty', 'netty-buffer', '4.1.115.Final')
-require_jar('io.netty', 'netty-codec', '4.1.115.Final')
-require_jar('io.netty', 'netty-common', '4.1.115.Final')
-require_jar('io.netty', 'netty-transport', '4.1.115.Final')
-require_jar('io.netty', 'netty-handler', '4.1.115.Final')
-require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.115.Final')
+require_jar('io.netty', 'netty-buffer', '4.1.118.Final')
+require_jar('io.netty', 'netty-codec', '4.1.118.Final')
+require_jar('io.netty', 'netty-common', '4.1.118.Final')
+require_jar('io.netty', 'netty-transport', '4.1.118.Final')
+require_jar('io.netty', 'netty-handler', '4.1.118.Final')
+require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.118.Final')
 require_jar('org.javassist', 'javassist', '3.24.0-GA')
-require_jar('org.logstash.beats', 'logstash-input-beats', '7.0.0')
+require_jar('org.logstash.beats', 'logstash-input-beats', '7.0.2')

data/logstash-input-beats.gemspec

@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "concurrent-ruby", "~> 1.0"
   s.add_runtime_dependency "thread_safe", "~> 0.3.5"
   s.add_runtime_dependency "logstash-codec-multiline", ">= 2.0.5"
-  s.add_runtime_dependency 'jar-dependencies', '~> 0.3', '>= 0.3.4'
   s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~>1.3'
   s.add_runtime_dependency 'logstash-mixin-event_support', '~>1.0'
   s.add_runtime_dependency 'logstash-mixin-plugin_factory_support', '~>1.0'

data/spec/inputs/beats_spec.rb

@@ -38,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, 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)
         subject.register
       end
     end
@@ -386,8 +386,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, 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
+      @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)
 
       subject.register

data/spec/integration/filebeat_spec.rb

@@ -51,7 +51,7 @@ describe "Filebeat", :integration => true do
   before :each do
     FileUtils.rm_rf(File.join(File.dirname(__FILE__), "..", "..", "vendor", "filebeat", "data"))
     start_client
-    raise 'Filebeat did not start in allocated time' unless is_alive
+    raise "Filebeat did not start in allocated time, due to: #{@execution_output}" unless is_alive
     sleep(20) # give some time to FB to send something
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-02 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -86,26 +86,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.5
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.4
-  name: jar-dependencies
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.4
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -303,14 +283,14 @@ 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.115.Final/netty-buffer-4.1.115.Final.jar
-- vendor/jar-dependencies/io/netty/netty-codec/4.1.115.Final/netty-codec-4.1.115.Final.jar
-- vendor/jar-dependencies/io/netty/netty-common/4.1.115.Final/netty-common-4.1.115.Final.jar
-- vendor/jar-dependencies/io/netty/netty-handler/4.1.115.Final/netty-handler-4.1.115.Final.jar
-- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.115.Final/netty-transport-native-unix-common-4.1.115.Final.jar
-- vendor/jar-dependencies/io/netty/netty-transport/4.1.115.Final/netty-transport-4.1.115.Final.jar
+- vendor/jar-dependencies/io/netty/netty-buffer/4.1.118.Final/netty-buffer-4.1.118.Final.jar
+- vendor/jar-dependencies/io/netty/netty-codec/4.1.118.Final/netty-codec-4.1.118.Final.jar
+- vendor/jar-dependencies/io/netty/netty-common/4.1.118.Final/netty-common-4.1.118.Final.jar
+- vendor/jar-dependencies/io/netty/netty-handler/4.1.118.Final/netty-handler-4.1.118.Final.jar
+- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.118.Final/netty-transport-native-unix-common-4.1.118.Final.jar
+- vendor/jar-dependencies/io/netty/netty-transport/4.1.118.Final/netty-transport-4.1.118.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.0/logstash-input-beats-7.0.0.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/7.0.2/logstash-input-beats-7.0.2.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)