logstash-input-beats 6.6.4-java → 6.7.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86ce6b68a88ac7c16e2a523eb6bab08539517339c379d1cfa22dca974d40ee1f
-  data.tar.gz: 02dca8ff5dbfde91ca5c948075da5fdace15675e54618726b90c911efd6f58b4
+  metadata.gz: 633344379c679c34cba9b726bf6743f8dad7da7b65b4266e647d1539c3ef3a08
+  data.tar.gz: 340d1c62e61b64f6787a8e87df877cfd6073aa42ff9601504f21272119fc9937
 SHA512:
-  metadata.gz: 01537e0632838ef4e479b73cea3f6cab77e65b760643efbb88e52afafde3c10846e2cb2fb5223ea5228ab825ca357d4b53eae8383d881d4d43cad8d785b181f4
-  data.tar.gz: 4867172bce87147d645e874f968b70d8ba8e7d290e8b9337680d93d887a3b7e38650f065fdfbd1075e90f530315cffb3eb5f88a25f1d32096dc8519c57e3669d
+  metadata.gz: 779e37e64ba62a4fd988a535866f393bb4797980eee02260b56ddf145194f398f1c2abfb5708d1939279bb4fcf2a6cba0b59b061ea59ea8c57d2a700d64e2e81
+  data.tar.gz: 39f78d631e00518b17af3d88109b3c41f58a3e9ef61d26e7e2a7c97eb0fb0c915b6f7d994b6975d5fd4d0f95cf5e24a54b7d959b373b501dacda8d639c19b04f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.7.1
+  - bump netty to 4.1.100 and jackson to 2.15.3 [#484](https://github.com/logstash-plugins/logstash-input-beats/pull/484)
+
+## 6.7.0
+ - PROTOCOL: adds explicit support for receiving a 0-length window to encapsulate an empty batch. Empty batches are acknowledged with the same 0-sequence ACK's that are used as keep-alives during processing. [#479](https://github.com/logstash-plugins/logstash-input-beats/pull/479)  
+
 ## 6.6.4
  - [DOC] Fix misleading `enrich/source_data` input beats documentation about the Logstash host. [#478](https://github.com/logstash-plugins/logstash-input-beats/pull/478)
 

data/VERSION

@@ -1 +1 @@
-6.6.4
+6.7.1

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

@@ -9,7 +9,6 @@ module LogStash module Inputs class Beats
     include org.logstash.beats.IMessageListener
 
     FILEBEAT_LOG_LINE_FIELD = "message".freeze
-    LSF_LOG_LINE_FIELD = "line".freeze
 
     ConnectionState = Struct.new(:ctx, :codec, :ip_address)
 
@@ -183,8 +182,6 @@ 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
       end
     end
 
@@ -192,10 +189,6 @@ module LogStash module Inputs class Beats
       !hash[FILEBEAT_LOG_LINE_FIELD].nil?
     end
 
-    def from_logstash_forwarder?(hash)
-      !hash[LSF_LOG_LINE_FIELD].nil?
-    end
-
     def increment_connection_count
       current_connection_count = @connections_list.size
       @metric.gauge(:current_connections, current_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.94.Final')
-require_jar('io.netty', 'netty-codec', '4.1.94.Final')
-require_jar('io.netty', 'netty-common', '4.1.94.Final')
-require_jar('io.netty', 'netty-transport', '4.1.94.Final')
-require_jar('io.netty', 'netty-handler', '4.1.94.Final')
-require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.94.Final')
+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('org.javassist', 'javassist', '3.24.0-GA')
-require_jar('org.logstash.beats', 'logstash-input-beats', '6.6.4')
+require_jar('org.logstash.beats', 'logstash-input-beats', '6.7.1')

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=[]
 
@@ -21,24 +19,15 @@ end
 require "logstash/devutils/rake"
 
 namespace :test do
+  task :java do
+    exit(1) unless system './gradlew test'
+  end
   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
         FileUtils.mkdir_p(VENDOR_PATH)
@@ -57,7 +46,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/spec/inputs/beats/message_listener_spec.rb

@@ -199,16 +199,6 @@ describe LogStash::Inputs::Beats::MessageListener do
       end
     end
 
-    context "when the message is from LSF" do
-      let(:message) { MockMessage.new("abc", { "line" => "hello world", '@metadata' => {} } )}
-
-      it "extract the event" do
-        subject.onNewMessage(ctx, message)
-        event = queue.pop
-        expect(event.get("message")).to eq("hello world")
-      end
-    end
-
     it_behaves_like "when the message is from any libbeat", :disabled, "[@metadata][ip_address]"
     it_behaves_like "when the message is from any libbeat", :v1, "[@metadata][input][beats][host][ip]"
     it_behaves_like "when the message is from any libbeat", :v8, "[@metadata][input][beats][host][ip]"

data/spec/integration/filebeat_spec.rb

@@ -222,7 +222,9 @@ describe "Filebeat", :integration => true do
 
             # NOTE: CentOS 7 base image (LS < 7.17) uses OpenSSL 1.0 while later is using Ubuntu 20.04 with OpenSSL 1.1.1
             # the default algorithm for `openssl pkcs8 -topk8` changed to -v2 which Java does not support (see GH-443)
-            cmd = "openssl pkcs8 -topk8 -in #{cert_key} -out #{@cert_key_pkcs8} -v1 PBE-SHA1-RC2-128 -passin pass:#{@passphrase} -passout pass:#{@passphrase}"
+            # Starting from OpenSSL 3, RC cipher algorithms has been moved into provider-legacy package which is not always installed in all OSes.
+            # Use cipher that is available in openssl main package.
+            cmd = "openssl pkcs8 -topk8 -in #{cert_key} -out #{@cert_key_pkcs8} -v1 PBE-SHA1-3DES -passin pass:#{@passphrase} -passout pass:#{@passphrase}"
             unless system(cmd)
               fail "failed to run openssl command: #{$?} \n#{cmd}"
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 6.6.4
+  version: 6.7.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-10-18 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.94.Final/netty-buffer-4.1.94.Final.jar
-- vendor/jar-dependencies/io/netty/netty-codec/4.1.94.Final/netty-codec-4.1.94.Final.jar
-- vendor/jar-dependencies/io/netty/netty-common/4.1.94.Final/netty-common-4.1.94.Final.jar
-- vendor/jar-dependencies/io/netty/netty-handler/4.1.94.Final/netty-handler-4.1.94.Final.jar
-- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.94.Final/netty-transport-native-unix-common-4.1.94.Final.jar
-- vendor/jar-dependencies/io/netty/netty-transport/4.1.94.Final/netty-transport-4.1.94.Final.jar
+- 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/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA.jar
-- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.6.4/logstash-input-beats-6.6.4.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.7.1/logstash-input-beats-6.7.1.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