logstash-input-beats 6.8.1-java → 6.8.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d91fa10d8b1456fdc6a180867ed0a97469b8f6da7791b948710b5946282aa77f
-  data.tar.gz: d63fcf6fe46309ef34d5e4c0e28b322a72057064d3c6e1397446c758811d0a5c
+  metadata.gz: d5d648febef34d9834c245aa2bf0e0df2c911dc3afc1ce3ba8fb1ee41b2117ff
+  data.tar.gz: acd87cf69f58bc303aa2b3181160d816f9302bf196caf6d84ac1206e02bb3fc1
 SHA512:
-  metadata.gz: a38aebb075a5d3ab1ac026026c162b93a06b26650a3c45284cf6553ed4e0b5608b39a8fea5c88feb15f12ca605967171e14c8d3212be12d3bd4aed68eb67c5c7
-  data.tar.gz: 9582e7adee36063b8c96d8d75423981bab56b40406d2a9bfee462a3bd51cae77b9ec69cb506f9307a0c3ad63c2eebc584a3f2ae6d51efb4d4f3e5407cc9a7839
+  metadata.gz: 930b79caab311cbf62bf7ed51409d2e6458f3eb162db4c3de338d14a56e06b9934312a5bffc23e941952699d5cb86036fe86b4375231913b3665636ff41d6e88
+  data.tar.gz: 6b2bd8ddc4d0127998cd1c877ea15b575144730eb788caad210b033efa45fbc402dfbad5bc41e8eb21b5ecae239fcbf46c47ecdbf93bc15bd649f2422b494697

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.8.3
+  - bump netty to 4.1.109 [#495](https://github.com/logstash-plugins/logstash-input-beats/pull/495)
+
+## 6.8.2
+  - Remove Logstash forwarder test cases and add Lumberjack test cases [#488](https://github.com/logstash-plugins/logstash-input-beats/pull/488)
+
 ## 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)
 

data/README.md

@@ -19,7 +19,7 @@ Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/log
 
 ## Developing
 
-### 1. Plugin Developement and Testing
+### 1. Plugin Development and Testing
 
 #### Code
 - To get started, you'll need JRuby with the Bundler gem installed.

data/VERSION

@@ -1 +1 @@
-6.8.1
+6.8.3

data/lib/logstash/inputs/beats/message_listener.rb

@@ -9,7 +9,7 @@ module LogStash module Inputs class Beats
     include org.logstash.beats.IMessageListener
 
     FILEBEAT_LOG_LINE_FIELD = "message".freeze
-    LSF_LOG_LINE_FIELD = "line".freeze
+    LUMBERJACK_LINE_FIELD = "line".freeze
 
     ConnectionState = Struct.new(:ctx, :codec, :ip_address)
 
@@ -183,8 +183,8 @@ module LogStash module Inputs class Beats
     def extract_target_field(hash)
       if from_filebeat?(hash)
         hash.delete(FILEBEAT_LOG_LINE_FIELD).to_s
-      elsif from_logstash_forwarder?(hash)
-        hash.delete(LSF_LOG_LINE_FIELD).to_s
+      elsif from_lumberjack?(hash)
+        hash.delete(LUMBERJACK_LINE_FIELD).to_s
       end
     end
 
@@ -192,8 +192,8 @@ module LogStash module Inputs class Beats
       !hash[FILEBEAT_LOG_LINE_FIELD].nil?
     end
 
-    def from_logstash_forwarder?(hash)
-      !hash[LSF_LOG_LINE_FIELD].nil?
+    def from_lumberjack?(hash)
+      !hash[LUMBERJACK_LINE_FIELD].nil?
     end
 
     def increment_connection_count

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.100.Final')
-require_jar('io.netty', 'netty-codec', '4.1.100.Final')
-require_jar('io.netty', 'netty-common', '4.1.100.Final')
-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('io.netty', 'netty-buffer', '4.1.109.Final')
+require_jar('io.netty', 'netty-codec', '4.1.109.Final')
+require_jar('io.netty', 'netty-common', '4.1.109.Final')
+require_jar('io.netty', 'netty-transport', '4.1.109.Final')
+require_jar('io.netty', 'netty-handler', '4.1.109.Final')
+require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.109.Final')
 require_jar('org.javassist', 'javassist', '3.24.0-GA')
-require_jar('org.logstash.beats', 'logstash-input-beats', '6.8.1')
+require_jar('org.logstash.beats', 'logstash-input-beats', '6.8.3')

data/lib/tasks/test.rake

@@ -9,8 +9,6 @@ elsif OS_PLATFORM == "darwin"
   FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-7.6.0-darwin-x86_64.tar.gz"
 end
 
-LSF_URL = "https://download.elastic.co/logstash-forwarder/binaries/logstash-forwarder_#{OS_PLATFORM}_amd64"
-
 require "fileutils"
 @files=[]
 
@@ -27,20 +25,9 @@ namespace :test do
   namespace :integration do
     task :setup do
       Rake::Task["test:integration:setup:filebeat"].invoke
-      Rake::Task["test:integration:setup:lsf"].invoke
     end
 
     namespace :setup do
-      desc "Download latest stable version of Logstash-forwarder"
-      task :lsf do
-        destination = File.join(VENDOR_PATH, "logstash-forwarder")
-        FileUtils.rm_rf(destination)
-        FileUtils.mkdir_p(destination)
-        download_destination = File.join(destination, "logstash-forwarder")
-        puts "Logstash-forwarder: downloading from #{LSF_URL} to #{download_destination}"
-        download(LSF_URL, download_destination)
-        File.chmod(0755, download_destination)
-      end
 
       desc "Download nigthly filebeat for integration testing"
       task :filebeat do
@@ -60,7 +47,7 @@ namespace :test do
 end
 
 # Uncompress all the file from the archive this only work with 
-# one level directory structure and its fine for LSF and filebeat packaging.
+# one level directory structure and filebeat packaging.
 def untar_all(file, destination)
   untar(file) do |entry| 
     out = entry.full_name.split("/").last

data/logstash-input-beats.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-wait"
   s.add_development_dependency "logstash-devutils"
   s.add_development_dependency "logstash-codec-json"
-  s.add_development_dependency "childprocess" # To make filebeat/LSF integration test easier to write.
+  s.add_development_dependency "childprocess" # To make filebeat integration test easier to write.
 
   s.platform = 'java'
 end

data/spec/inputs/beats/message_listener_spec.rb

@@ -199,7 +199,7 @@ describe LogStash::Inputs::Beats::MessageListener do
       end
     end
 
-    context "when the message is from LSF" do
+    context "when the message is from Lumberjack" do
       let(:message) { MockMessage.new("abc", { "line" => "hello world", '@metadata' => {} } )}
 
       it "extract the event" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 6.8.1
+  version: 6.8.3
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-22 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -311,7 +311,6 @@ files:
 - spec/inputs/beats/tls_spec.rb
 - spec/inputs/beats_spec.rb
 - spec/integration/filebeat_spec.rb
-- spec/integration/logstash_forwarder_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_process_helpers.rb
 - spec/support/file_helpers.rb
@@ -320,14 +319,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.100.Final/netty-buffer-4.1.100.Final.jar
-- vendor/jar-dependencies/io/netty/netty-codec/4.1.100.Final/netty-codec-4.1.100.Final.jar
-- vendor/jar-dependencies/io/netty/netty-common/4.1.100.Final/netty-common-4.1.100.Final.jar
-- vendor/jar-dependencies/io/netty/netty-handler/4.1.100.Final/netty-handler-4.1.100.Final.jar
-- 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/io/netty/netty-buffer/4.1.109.Final/netty-buffer-4.1.109.Final.jar
+- vendor/jar-dependencies/io/netty/netty-codec/4.1.109.Final/netty-codec-4.1.109.Final.jar
+- vendor/jar-dependencies/io/netty/netty-common/4.1.109.Final/netty-common-4.1.109.Final.jar
+- vendor/jar-dependencies/io/netty/netty-handler/4.1.109.Final/netty-handler-4.1.109.Final.jar
+- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.109.Final/netty-transport-native-unix-common-4.1.109.Final.jar
+- vendor/jar-dependencies/io/netty/netty-transport/4.1.109.Final/netty-transport-4.1.109.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.8.1/logstash-input-beats-6.8.1.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.8.3/logstash-input-beats-6.8.3.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -363,7 +362,6 @@ test_files:
 - spec/inputs/beats/tls_spec.rb
 - spec/inputs/beats_spec.rb
 - spec/integration/filebeat_spec.rb
-- spec/integration/logstash_forwarder_spec.rb
 - spec/spec_helper.rb
 - spec/support/client_process_helpers.rb
 - spec/support/file_helpers.rb

data/spec/integration/logstash_forwarder_spec.rb

@@ -1,108 +0,0 @@
-# encoding: utf-8
-require "logstash/inputs/beats"
-require "logstash/json"
-require "fileutils"
-require_relative "../support/flores_extensions"
-require_relative "../support/file_helpers"
-require_relative "../support/integration_shared_context"
-require_relative "../support/client_process_helpers"
-require "spec_helper"
-
-LSF_BINARY = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "vendor", "logstash-forwarder", "logstash-forwarder"))
-
-describe "Logstash-Forwarder", :integration => true do
-  include ClientProcessHelpers
-
-  before :all do
-    unless File.exist?(LSF_BINARY)
-      raise "Cannot find `logstash-forwarder` binary in `vendor/logstash-forwarder` Did you run `bundle exec rake test:integration:setup` before running the integration suite?"
-    end
-  end
-
-  include FileHelpers
-  include_context "beats configuration"
-
-  let(:client_wait_time) { 5 }
-
-  # Filebeat related variables
-  let(:cmd) { [lsf_exec, "-config", lsf_config_path] }
-
-  let(:lsf_exec) { LSF_BINARY }
-  let(:registry_file) { File.expand_path(File.join(File.dirname(__FILE__), "..", "..", ".logstash-forwarder")) }
-  let_tmp_file(:lsf_config_path) { lsf_config }
-  let(:log_file) { f = Stud::Temporary.file; f.close; f.path }
-  let(:lsf_config) do
- <<-CONFIG
-{
-  "network": {
-    "servers": [ "#{host}:#{port}" ],
-    "ssl ca": "#{certificate_authorities}"
-  },
-  "files": [
-    { "paths": [ "#{log_file}" ] }
-  ]
-}
- CONFIG
-  end
-  #
-
-  before :each do
-    FileUtils.rm_rf(registry_file) # ensure clean state between runs
-    start_client
-    sleep(1)
-    # let LSF start and than write the logs
-    File.open(log_file, "a") do |f|
-      f.write(events.join("\n") + "\n")
-    end
-    sleep(1) # give some time to the clients to pick up the changes
-  end
-
-  after :each do
-    stop_client
-  end
-
-  xcontext "Plain TCP" do
-    include ClientProcessHelpers
-
-    let(:certificate_authorities) { "" }
-
-    it "should not send any events" do
-      expect(queue.size).to eq(0), @execution_output
-    end
-  end
-
-  context "TLS" do
-    context "Server Verification" do
-      let(:input_config) do
-        super().merge({
-          "ssl_enabled" => true,
-          "ssl_certificate" => certificate_file,
-          "ssl_key" => certificate_key_file,
-        })
-      end
-
-      let(:certificate_data) { Flores::PKI.generate }
-      let_tmp_file(:certificate_file) { certificate_data.first }
-      let_tmp_file(:certificate_key_file) { convert_to_pkcs8(certificate_data.last) }
-      let(:certificate_authorities) { certificate_file }
-
-      context "self signed certificate" do
-        include_examples "send events"
-      end
-
-      context "with large batches" do
-        let(:number_of_events) { 10_000 }
-        include_examples "send events"
-      end
-
-      context "invalid CA on the client" do
-        let(:invalid_data) { Flores::PKI.generate }
-        let(:certificate_authorities) { f = Stud::Temporary.file; f.close; f.path }
-
-        it "should not send any events" do
-          expect(queue.size).to eq(0), @execution_output
-        end
-      end
-    end
-  end
-end