logstash-input-beats 6.9.1-java → 6.9.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 765bfc357e5f8f71d8b2ca407a57c5d3ab1bdc0df052477f0997c5318f694f54
-  data.tar.gz: 55f75fac1f6afc9777eb7068f8326544e855d1ee69982a9c811f6207dcac9293
+  metadata.gz: 6cc3149a1025ec65cc833215c63aec1f6d53a46f8799307259c7447576dbde15
+  data.tar.gz: 408e79964724fb2dfbc859fd392e3498c7d7467e91ed976eaaac5312ea21c4db
 SHA512:
-  metadata.gz: 205d378bb2482f9b29dadd2115a5dcd126644a69f75ebaa60c9092707cdc0ca34f66dd3ed37996fdbd07570b515d95bc1169778c67bc717718d5a1633728ce7e
-  data.tar.gz: 2e8abb74a6297423f6a5240072b6d8f332f69f8c83d8abc5babe69abea2c5c1f3207ad212be5d745f1c8b8ad50841e8dcbf2692f533d7335a39b4fdaffedfff8
+  metadata.gz: 66c49602c8d1d36558c66db1968b598b03219c6be483e4efc8875b2e8745bec84fc826bddac5b6b06b9b4cc86b5b66fb5745a7d13dcbf3d5dae7b908848be824
+  data.tar.gz: 90769236133dc69f0f355ce1bea6b89172bba89716260c834d0e1712f57f62de43c62f437867afeeaa6f7555e5dc4b9ebf75a6f0549018668bb46b537fac5bb9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.9.3
+  - Upgrade netty to 4.1.118 [#514](https://github.com/logstash-plugins/logstash-input-beats/pull/514)
+
+## 6.9.2
+  - Name netty threads according to their purpose and the plugin id [#511](https://github.com/logstash-plugins/logstash-input-beats/pull/511)
+
 ## 6.9.1
   - Upgrade netty to 4.1.115 [#507](https://github.com/logstash-plugins/logstash-input-beats/pull/507)
 

data/VERSION

@@ -1 +1 @@
-6.9.1
+6.9.3

data/lib/logstash/inputs/beats.rb

@@ -247,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, @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', '6.9.1')
+require_jar('org.logstash.beats', 'logstash-input-beats', '6.9.3')

data/lib/tasks/test.rake

@@ -40,17 +40,19 @@ namespace :test do
         puts "Filebeat: downloading from #{FILEBEAT_URL} to #{download_destination}"
         download(FILEBEAT_URL, download_destination)
 
-        untar_all(download_destination, File.join(VENDOR_PATH, "filebeat")) { |e| e }
+        untar_all(download_destination, VENDOR_PATH) { |e| e }
       end
     end
   end
 end
 
-# Uncompress all the file from the archive this only work with 
-# one level directory structure and filebeat packaging.
+require 'zlib'
+require 'minitar'
+
 def untar_all(file, destination)
-  untar(file) do |entry| 
-    out = entry.full_name.split("/").last
-    File.join(destination, out)
+  Zlib::GzipReader.open(file) do |reader|
+    Minitar.unpack(reader, destination)
   end
+  filebeat_full_name = Dir.glob(destination + "/filebeat-*").first
+  File.rename(filebeat_full_name, destination + "/filebeat")
 end

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
@@ -531,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, 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 6.9.1
+  version: 6.9.3
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-18 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:
@@ -319,14 +299,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/6.9.1/logstash-input-beats-6.9.1.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.9.3/logstash-input-beats-6.9.3.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)