logstash-input-beats 3.1.0.beta1-java → 3.1.0.beta3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dc83f50cea6b2105ecf0082caebe2040de2ab68
-  data.tar.gz: 19e6d17b3b0dd20c7664a44577d77b1bd032d2d4
+  metadata.gz: cb25fdbb64427c6b19c563516139308b9b9d21e2
+  data.tar.gz: 9e4333e0d79ffcaabeaedf7978f69147706e66e1
 SHA512:
-  metadata.gz: bb9d9fb478c2a53368bf2b0cdcdc58b0955017d3a54ab42f5cb27e7afd516adba6e83f48f4d822e654d80ca75013f199e27ed5f8b51989b4728a980bbda910a6
-  data.tar.gz: 1723f186d35d767779c1ef14273e9822de1b49841896ca56bf47f105ab19cafc34d7d958d0e65c47b19c1c8d07d331415d172f41309cb2074e5b7ff86e30b8e6
+  metadata.gz: 55178dba928dc04f56fd595a5daaa2f1dfafd17cb74de2a3478e704abbe475bca6833937aab6178222ec70c6d7cb24a3e84f15ee00b0015295d9c85efca6efd3
+  data.tar.gz: fc1b41dc3337bc58ea9a4a5f31b050df518ae81937c94bbf79f902054294a26d16082512f7a6e29d46ccec475eb10e5b70ef3642e0a8982909b7e4f74c945e39

data/CHANGELOG.md

@@ -1,5 +1,17 @@
-## 3.1.0
+## 3.1.0.beta3
+    - Jars were missing from the latest release on rubygems
+
+## 3.1.0.beta2
+    - Better handling of connection timeout, added a new option to set the value for it, the default is 15 seconds #108
+    - Make sure that incomplete SSL handshake doesn't take down the server #101
+    - Sending Garbage data will now raise a specific exception `InvalidFrameProtocolException` #100
+    - Adding assertions on the payload size and the fields count to make the parser more resilient to erronous frames #99
+
+## 3.1.0.beta1
     - Rewrite of the beats input in Java using the Netty framewwork, this rewrite is meant to be backward compatible with the previous implementation
+
+## 3.0.4
+  - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
     but should yield better throughput and memory usage. https://github.com/logstash-plugins/logstash-input-beats/pull/93
 
 ## 3.0.3

data/VERSION

@@ -1 +1 @@
-3.1.0.beta1
+3.1.0.beta3

data/lib/logstash-input-beats_jars.rb

@@ -5,7 +5,7 @@ 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('org.bouncycastle', 'bcprov-jdk15on', '1.54')
 require_jar('org.bouncycastle', 'bcpkix-jdk15on', '1.54')
-require_jar('io.netty', 'netty-all', '4.1.1.Final')
+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')
@@ -14,4 +14,4 @@ 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.0.beta1')
+require_jar('org.logstash.beats', 'logstash-input-beats', '3.1.0.beta3')

data/lib/logstash/inputs/beats.rb

@@ -86,6 +86,9 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   # This option needs to be used with `ssl_certificate_authorities` and a defined list of CAs.
   config :ssl_verify_mode, :validate => ["none", "peer", "force_peer"], :default => "none"
 
+  # Time in milliseconds for an incomplete ssl handshake to timeout
+  config :ssl_handshake_timeout, :validate => :number, :default => 10000
+
   # The number of seconds before we raise a timeout. 
   # This option is useful to control how much time to wait if something is blocking the pipeline.
   config :congestion_threshold, :validate => :number, :default => 5
@@ -104,6 +107,9 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
   # The list of ciphers suite to use, listed by priorities.
   config :cipher_suites, :validate => :array, :default => org.logstash.netty.SslSimpleBuilder::DEFAULT_CIPHERS
 
+  # Close Idle clients after X seconds of inactivity.
+  config :client_inactivity_timeout, :validate => :number, :default => 15
+
   def register
     if !@ssl
       @logger.warn("Beats input: SSL Certificate will not be used") unless @ssl_certificate.nil?
@@ -134,11 +140,12 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
         .setProtocols(convert_protocols)
         .setCipherSuites(normalized_ciphers)
 
+      ssl_builder.setHandshakeTimeoutMilliseconds(@ssl_handshake_timeout)
+
       if client_authentification?
         if @ssl_verify_mode.upcase == "FORCE_PEER"
             ssl_builder.setVerifyMode(org.logstash.netty.SslSimpleBuilder::SslClientVerifyMode::FORCE_PEER)
         end
-
         ssl_builder.setCertificateAuthorities(@ssl_certificate_authorities)
       end
 

data/lib/tasks/test.rake

@@ -3,9 +3,9 @@ OS_PLATFORM = RbConfig::CONFIG["host_os"]
 VENDOR_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "vendor"))
 
 if OS_PLATFORM == "linux"
-  FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha4-SNAPSHOT-linux-x86_64.tar.gz"
+  FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha5-SNAPSHOT-linux-x86_64.tar.gz"
 elsif OS_PLATFORM == "darwin"
-  FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha4-SNAPSHOT-darwin-x86_64.tar.gz"
+  FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha5-SNAPSHOT-darwin-x86_64.tar.gz"
 end
 
 LSF_URL = "https://download.elastic.co/logstash-forwarder/binaries/logstash-forwarder_#{OS_PLATFORM}_amd64"

data/logstash-input-beats.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
 
   s.add_runtime_dependency "logstash-codec-plain"
   s.add_runtime_dependency "concurrent-ruby", [ ">= 0.9.2", "<= 1.0.0" ]

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta1
+  version: 3.1.0.beta3
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.60'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -257,7 +263,7 @@ files:
 - vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.7.5/jackson-core-2.7.5.jar
 - vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.7.5/jackson-databind-2.7.5.jar
 - 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.1.Final/netty-all-4.1.1.Final.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
@@ -266,7 +272,7 @@ files:
 - vendor/jar-dependencies/org/bouncycastle/bcpkix-jdk15on/1.54/bcpkix-jdk15on-1.54.jar
 - vendor/jar-dependencies/org/bouncycastle/bcprov-jdk15on/1.54/bcprov-jdk15on-1.54.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.0.beta1/logstash-input-beats-3.1.0.beta1.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/3.1.0.beta3/logstash-input-beats-3.1.0.beta3.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)