logstash-input-beats 3.1.1-java → 3.1.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 768ccce03701a2fe20bcdefafe058fb754cfa00a
-  data.tar.gz: e28accad116b6b3e4feed499963e335cb7ce156c
+  metadata.gz: 8339387a4908bb5c514cd12af2227e9d973807e2
+  data.tar.gz: 6884b50706bc767c102e9a687302a4e603f05929
 SHA512:
-  metadata.gz: b3323df3ca381add52492e2162950cad4179f40b06d96d8eaceac395e0dfacb2011b50784e1d705241ad047f2d89086030065093623728fb4a365d364ea8da51
-  data.tar.gz: 79b695fa6f4f9c4316df81b7cbbdea25435358917e6eb32a53ed097a138dcd19bed249ae44b40738e226c4fdcb9a95b7886dc4463caabe87fa53833bbaaed2fa
+  metadata.gz: c7db638b764af26e2390244839e73fafee784ec4befccca389c74cddda368bdcb6c498d183b819295d3581380b807ab7dd69b0099bb6f3778e8dc7b8f4f91e41
+  data.tar.gz: 9c0885a173b525c2776af339f9c5b87e1bf065e7ff1f1d24492d5de3a5f3d3ae46d071e16fb7d11c3945e27023d6af9477d5ad4b5a351f4acb93a4d1216b1447

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.1.2
+   - Propagate SSL handshake error correctly
+   - Move back to log4j 1, to make it work better under logstash 2.4
+
 ## 3.1.1
    - Remove the SSL Converter, Private Key must be in the PKCS8 format, which is the default of any newer OpenSSL library
    - Replace FileInputStream with File reference to let netty handle correctly the certificates
@@ -6,8 +10,6 @@
    - Fix an issue when the input could hang forever when stopping Logstash
    - [Doc changes] Add Logstash config example and clarify use of the `type` config option
 
-
-
 ## 3.1.0
    - Fix a NullPointer Exception https://github.com/elastic/logstash/issues/5756
    - Log4j ERROR will now be propagated upstream, IE: InvalidCertificate OR InvalidFrameType.

data/VERSION

@@ -1 +1 @@
-3.1.1
+3.1.2

data/lib/logstash-input-beats_jars.rb

@@ -1,15 +1,12 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('org.apache.logging.log4j', 'log4j-1.2-api', '2.6.1')
-require_jar('org.apache.logging.log4j', 'log4j-slf4j-impl', '2.6.1')
 require_jar('io.netty', 'netty-all', '4.1.3.Final')
 require_jar('io.netty', 'netty-tcnative-boringssl-static', '1.1.33.Fork17')
-require_jar('org.apache.logging.log4j', 'log4j-api', '2.6.1')
-require_jar('org.apache.logging.log4j', 'log4j-core', '2.6.1')
 require_jar('org.javassist', 'javassist', '3.20.0-GA')
 require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.7.5')
 require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.7.5')
 require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.7.5')
 require_jar('com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.7.5')
-require_jar('org.logstash.beats', 'logstash-input-beats', '3.1.1')
+require_jar('log4j', 'log4j', '1.2.17')
+require_jar('org.logstash.beats', 'logstash-input-beats', '3.1.2')

data/lib/logstash/inputs/beats.rb

@@ -6,7 +6,6 @@ require "logstash/codecs/identity_map_codec"
 require "logstash/codecs/multiline"
 require "logstash/util"
 require "logstash-input-beats_jars"
-require "logstash/logging" rescue nil # removed in logstash 5
 
 import "org.logstash.beats.Server"
 import "org.logstash.netty.SslSimpleBuilder"
@@ -139,7 +138,7 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   config :client_inactivity_timeout, :validate => :number, :default => 15
 
   def register
-    # Compatibilty with logstash < 5 and pre Log4j integration
+    # Logstash 2.4
     if defined?(LogStash::Logging) && LogStash::Logging.respond_to?(:setup_log4j)
       LogStash::Logging.setup_log4j(@logger)
     end

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

@@ -50,12 +50,26 @@ module LogStash module Inputs class Beats
       unregister_connection(ctx)
     end
 
-    def onException(ctx)
-      unregister_connection(ctx)
+    def onChannelInitializeException(ctx, cause)
+      # This is mostly due to a bad certificate or keys, running Logstash in debug mode will show more information
+      if cause.is_a?(Java::JavaLang::IllegalArgumentException)
+        if input.logger.debug?
+          input.logger.error("Looks like you either have an invalid key or your private key was not in PKCS8 format.")
+        else
+          input.logger.error("Looks like you either have an invalid key or your private key was not in PKCS8 format.", :exception => cause)
+        end
+      else
+        input.logger.warn("Error when creating a connection", :exception => cause.to_s)
+      end
+    end
+
+    def onException(ctx, cause)
+      unregister_connection(ctx) unless connections_list[ctx].nil?
     end
 
     private
     def codec(ctx)
+      return if connections_list[ctx].nil?
       connections_list[ctx].codec
     end
 
@@ -69,8 +83,9 @@ module LogStash module Inputs class Beats
     end
 
     def flush_buffer(ctx)
-      transformer = EventTransformCommon.new(@input)
+      return if codec(ctx).nil?
 
+      transformer = EventTransformCommon.new(@input)
       codec(ctx).flush do |event|
         transformer.transform(event)
         @queue << event

data/spec/inputs/beats/message_listener_spec.rb

@@ -86,7 +86,7 @@ describe LogStash::Inputs::Beats::MessageListener do
 
   context "onException" do
     it "remove the connection to the connection list" do
-      expect { subject.onException(ctx) }.to change { subject.connections_list.count }.by(-1)
+      expect { subject.onException(ctx, double("Exception")) }.to change { subject.connections_list.count }.by(-1)
     end
 
     it "calls flush on codec" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -266,12 +266,9 @@ files:
 - vendor/jar-dependencies/com/fasterxml/jackson/module/jackson-module-afterburner/2.7.5/jackson-module-afterburner-2.7.5.jar
 - vendor/jar-dependencies/io/netty/netty-all/4.1.3.Final/netty-all-4.1.3.Final.jar
 - vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/1.1.33.Fork17/netty-tcnative-boringssl-static-1.1.33.Fork17.jar
-- vendor/jar-dependencies/org/apache/logging/log4j/log4j-1.2-api/2.6.1/log4j-1.2-api-2.6.1.jar
-- vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.6.1/log4j-api-2.6.1.jar
-- vendor/jar-dependencies/org/apache/logging/log4j/log4j-core/2.6.1/log4j-core-2.6.1.jar
-- vendor/jar-dependencies/org/apache/logging/log4j/log4j-slf4j-impl/2.6.1/log4j-slf4j-impl-2.6.1.jar
+- vendor/jar-dependencies/log4j/log4j/1.2.17/log4j-1.2.17.jar
 - vendor/jar-dependencies/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA.jar
-- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/3.1.1/logstash-input-beats-3.1.1.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/3.1.2/logstash-input-beats-3.1.2.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)