logstash-input-beats 3.1.11-java → 3.1.12-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2be322271b4505822e137944205b1a8e0dc8acfb
4
- data.tar.gz: aea0f6023183b9d979a42ac7dc844841524b6cd3
3
+ metadata.gz: 0a62873a6bcdf661b99a4183e007fa97a813a70a
4
+ data.tar.gz: e5b5cb5126c4d351f440f820c646829597132e68
5
5
  SHA512:
6
- metadata.gz: 83af6793e3b9fc258cb90df40590ccc4cda4c7f9eaf7c4ea57df276e48ac4ecb2a8d9a41de8326980ed216cad066c63ade1e879861ad70bea58ed22933595c35
7
- data.tar.gz: d53b6bbf7de8a48be0d4943170982708d3b8937dec0817444f820569500b0255987850b7c91707ec8e50962f8061e45b39d9af0b07e87361a1455d444f5384c8
6
+ metadata.gz: 931b6f3f131d4786a85d21d6a12482a94dd1b60cd8daa4f5762411d6e4b8a164f9a4c2ed38f6033426f31e6a4ab756927188c3d7ad1dca17a9fb1e22a81b490c
7
+ data.tar.gz: a9fab1bd3988424d84b4c3d134176c60e27b72f072a1fb36806070374c6f7619ab21b99d879c3c0ebc02139bec008df4eaa877823609b9232d9b609343e4607a
data/CHANGELOG.md CHANGED
@@ -1,3 +1,6 @@
1
+ ## 3.1.12
2
+ - Fix the Logger initialization in logstash 2.4.X #166
3
+
1
4
  ## 3.1.11
2
5
  - Uses SO_linger for the socket option to force the server to completely disconnect the idle clients https://github.com/elastic/logstash/issues/6300
3
6
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.1.11
1
+ 3.1.12
@@ -9,4 +9,4 @@ require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.7.5')
9
9
  require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.7.5')
10
10
  require_jar('com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.7.5')
11
11
  require_jar('log4j', 'log4j', '1.2.17')
12
- require_jar('org.logstash.beats', 'logstash-input-beats', '3.1.11')
12
+ require_jar('org.logstash.beats', 'logstash-input-beats', '3.1.12')
@@ -7,11 +7,6 @@ require "logstash/codecs/multiline"
7
7
  require "logstash/util"
8
8
  require "logstash-input-beats_jars"
9
9
 
10
- import "org.logstash.beats.Server"
11
- import "org.logstash.netty.SslSimpleBuilder"
12
- import "java.io.FileInputStream"
13
- java_import "io.netty.handler.ssl.OpenSsl"
14
-
15
10
  # This input plugin enables Logstash to receive events from the
16
11
  # https://www.elastic.co/products/beats[Elastic Beats] framework.
17
12
  #
@@ -138,11 +133,20 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
138
133
  config :client_inactivity_timeout, :validate => :number, :default => 60
139
134
 
140
135
  def register
141
- # Logstash 2.4
136
+ # For Logstash 2.4 we need to make sure that the logger is correctly set for the
137
+ # java classes before actually loading them.
138
+ #
139
+ # if we don't do this we will get this error:
140
+ # log4j:WARN No appenders could be found for logger (io.netty.util.internal.logging.InternalLoggerFactory)
142
141
  if defined?(LogStash::Logger) && LogStash::Logger.respond_to?(:setup_log4j)
143
142
  LogStash::Logger.setup_log4j(@logger)
144
143
  end
145
144
 
145
+ java_import "org.logstash.beats.Server"
146
+ java_import "org.logstash.netty.SslSimpleBuilder"
147
+ java_import "java.io.FileInputStream"
148
+ java_import "io.netty.handler.ssl.OpenSsl"
149
+
146
150
  if !@ssl
147
151
  @logger.warn("Beats input: SSL Certificate will not be used") unless @ssl_certificate.nil?
148
152
  @logger.warn("Beats input: SSL Key will not be used") unless @ssl_key.nil?
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-input-beats
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.11
4
+ version: 3.1.12
5
5
  platform: java
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-11-29 00:00:00.000000000 Z
11
+ date: 2016-11-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -268,7 +268,7 @@ files:
268
268
  - vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/1.1.33.Fork23/netty-tcnative-boringssl-static-1.1.33.Fork23.jar
269
269
  - vendor/jar-dependencies/log4j/log4j/1.2.17/log4j-1.2.17.jar
270
270
  - vendor/jar-dependencies/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA.jar
271
- - vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/3.1.11/logstash-input-beats-3.1.11.jar
271
+ - vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/3.1.12/logstash-input-beats-3.1.12.jar
272
272
  homepage: http://www.elastic.co/guide/en/logstash/current/index.html
273
273
  licenses:
274
274
  - Apache License (2.0)