logstash-input-beats 3.1.0.beta4-java → 3.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef6fdf8dd07d5b558b0e887cb70dc7be1eed5f8
-  data.tar.gz: 114bf1a1e0f334f7331566644e0aaf5cd45f2510
+  metadata.gz: 3f99fa6cabf279fddd07fb11aa025fbd6d57b303
+  data.tar.gz: ecf36cdb6ac73a282e6b2f3f7410e1c798efde10
 SHA512:
-  metadata.gz: f25c8f3f7ec00b2b7fb1c7addfff9ab604ca199f28d56429e4979f9521bc7d4cc1132183da64ce1db816633eaa7a3f594441d3000e6a4854ff1c00f025718239
-  data.tar.gz: dabaa07ed963e323e5b0a709b3fbf3262ddb82a900e761932456a5fe6a53a53036d5314ef4814517984715905f88f2dcb9040a4f508569e06bb00a7aed300454
+  metadata.gz: 7c0bfd154e6db74356c9473cb6996744724539758fbd61baa326effd5435a364479c137c413daeceee5595d3f358290660293d5d34b2862c729e1905bbf071cb
+  data.tar.gz: 91436a6a28b8de8594aca1d263c879bc8e06682609fe3f0096a9be33bd598a891b147b5c10bbc18edc95249b13d4c17030387807873deb7eec2cf18a942b3c6f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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.
+   - Relax constraints on multiline to make it work under 2.4
+
 ## 3.1.0.beta4
     - Fix a problem that would would make the server refuse concurrent connection to the server #111
 

data/CONTRIBUTORS

@@ -10,6 +10,7 @@ Contributors:
 * Richard Pijnenburg (electrical)
 * Suyog Rao (suyograo)
 * Guy Boertje (guyboertje)
+* Ian Cordasco (sigmavirus24)
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/VERSION

@@ -1 +1 @@
-3.1.0.beta4
+3.1.0

data/lib/logstash-input-beats_jars.rb

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

data/lib/logstash/inputs/beats.rb

@@ -6,6 +6,7 @@ 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"
@@ -86,6 +87,8 @@ 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"
 
+  config :include_codec_tag, :validate => :boolean, :default => true
+
   # Time in milliseconds for an incomplete ssl handshake to timeout
   config :ssl_handshake_timeout, :validate => :number, :default => 10000
 
@@ -111,6 +114,11 @@ 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
+    if defined?(LogStash::Logging) && LogStash::Logging.respond_to?(:setup_log4j)
+      LogStash::Logging.setup_log4j(@logger)
+    end
+
     if !@ssl
       @logger.warn("Beats input: SSL Certificate will not be used") unless @ssl_certificate.nil?
       @logger.warn("Beats input: SSL Key will not be used") unless @ssl_key.nil?

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

@@ -11,7 +11,7 @@ module LogStash module Inputs class Beats
       event.set("@timestamp", ts) unless ts.nil?
       hash.each { |k, v| event.set(k, v) }
       super(event)
-      event.tag("beats_input_codec_#{codec_name}_applied")
+      event.tag("beats_input_codec_#{codec_name}_applied") if include_codec_tag?
       event
     end
 

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

@@ -44,5 +44,9 @@ module LogStash module Inputs class Beats
       decorate(event)
       event
     end
+
+    def include_codec_tag?
+      @input.include_codec_tag
+    end
   end
 end; end; end

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

@@ -11,7 +11,7 @@ module LogStash module Inputs class Beats
   class RawEventTransform < EventTransformCommon
     def transform(event)
       super(event)
-      event.tag("beats_input_raw_event")
+      event.tag("beats_input_raw_event") if include_codec_tag?
       event
     end
   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-alpha5-SNAPSHOT-linux-x86_64.tar.gz"
+  FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha6-SNAPSHOT-linux-x86_64.tar.gz"
 elsif OS_PLATFORM == "darwin"
-  FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha5-SNAPSHOT-darwin-x86_64.tar.gz"
+  FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha6-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

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "logstash-codec-plain"
   s.add_runtime_dependency "concurrent-ruby", [ ">= 0.9.2", "<= 1.0.0" ]
   s.add_runtime_dependency "thread_safe", "~> 0.3.5"
-  s.add_runtime_dependency "logstash-codec-multiline", "~> 3.0"
+  s.add_runtime_dependency "logstash-codec-multiline", ">= 2.0.5"
   s.add_runtime_dependency 'jar-dependencies', '~> 0.3.4'
 
   s.add_development_dependency "flores", "~>0.0.6"

data/spec/inputs/beats/decoded_event_transform_spec.rb

@@ -71,4 +71,11 @@ describe LogStash::Inputs::Beats::DecodedEventTransform do
       expect(subject.get("tags")).to include("beats_input_codec_dummy_applied")
     end
   end
+
+  context "when configured to not include codec tag" do
+    before { config.update("include_codec_tag" => false) }
+    it "does not tag the event" do
+      expect(subject.get("tags")).not_to include("beats_input_codec_plain_applied")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-beats
 version: !ruby/object:Gem::Version
-  version: 3.1.0.beta4
+  version: 3.1.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -81,17 +81,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.0.5
   name: logstash-codec-multiline
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -272,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.beta4/logstash-input-beats-3.1.0.beta4.jar
+- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/3.1.0/logstash-input-beats-3.1.0.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache License (2.0)
@@ -291,9 +291,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.4.8