logstash-input-beats 3.1.0.beta4-java → 3.1.0-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: fef6fdf8dd07d5b558b0e887cb70dc7be1eed5f8
4
- data.tar.gz: 114bf1a1e0f334f7331566644e0aaf5cd45f2510
3
+ metadata.gz: 3f99fa6cabf279fddd07fb11aa025fbd6d57b303
4
+ data.tar.gz: ecf36cdb6ac73a282e6b2f3f7410e1c798efde10
5
5
  SHA512:
6
- metadata.gz: f25c8f3f7ec00b2b7fb1c7addfff9ab604ca199f28d56429e4979f9521bc7d4cc1132183da64ce1db816633eaa7a3f594441d3000e6a4854ff1c00f025718239
7
- data.tar.gz: dabaa07ed963e323e5b0a709b3fbf3262ddb82a900e761932456a5fe6a53a53036d5314ef4814517984715905f88f2dcb9040a4f508569e06bb00a7aed300454
6
+ metadata.gz: 7c0bfd154e6db74356c9473cb6996744724539758fbd61baa326effd5435a364479c137c413daeceee5595d3f358290660293d5d34b2862c729e1905bbf071cb
7
+ data.tar.gz: 91436a6a28b8de8594aca1d263c879bc8e06682609fe3f0096a9be33bd598a891b147b5c10bbc18edc95249b13d4c17030387807873deb7eec2cf18a942b3c6f
@@ -1,3 +1,8 @@
1
+ ## 3.1.0
2
+ - Fix a NullPointer Exception https://github.com/elastic/logstash/issues/5756
3
+ - Log4j ERROR will now be propagated upstream, IE: InvalidCertificate OR InvalidFrameType.
4
+ - Relax constraints on multiline to make it work under 2.4
5
+
1
6
  ## 3.1.0.beta4
2
7
  - Fix a problem that would would make the server refuse concurrent connection to the server #111
3
8
 
@@ -10,6 +10,7 @@ Contributors:
10
10
  * Richard Pijnenburg (electrical)
11
11
  * Suyog Rao (suyograo)
12
12
  * Guy Boertje (guyboertje)
13
+ * Ian Cordasco (sigmavirus24)
13
14
 
14
15
  Note: If you've sent us patches, bug reports, or otherwise contributed to
15
16
  Logstash, and you aren't on the list above and want to be, please let us know
data/VERSION CHANGED
@@ -1 +1 @@
1
- 3.1.0.beta4
1
+ 3.1.0
@@ -14,4 +14,4 @@ require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.7.5')
14
14
  require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.7.5')
15
15
  require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.7.5')
16
16
  require_jar('com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.7.5')
17
- require_jar('org.logstash.beats', 'logstash-input-beats', '3.1.0.beta4')
17
+ require_jar('org.logstash.beats', 'logstash-input-beats', '3.1.0')
@@ -6,6 +6,7 @@ require "logstash/codecs/identity_map_codec"
6
6
  require "logstash/codecs/multiline"
7
7
  require "logstash/util"
8
8
  require "logstash-input-beats_jars"
9
+ require "logstash/logging" rescue nil # removed in logstash 5
9
10
 
10
11
  import "org.logstash.beats.Server"
11
12
  import "org.logstash.netty.SslSimpleBuilder"
@@ -86,6 +87,8 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
86
87
  # This option needs to be used with `ssl_certificate_authorities` and a defined list of CAs.
87
88
  config :ssl_verify_mode, :validate => ["none", "peer", "force_peer"], :default => "none"
88
89
 
90
+ config :include_codec_tag, :validate => :boolean, :default => true
91
+
89
92
  # Time in milliseconds for an incomplete ssl handshake to timeout
90
93
  config :ssl_handshake_timeout, :validate => :number, :default => 10000
91
94
 
@@ -111,6 +114,11 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
111
114
  config :client_inactivity_timeout, :validate => :number, :default => 15
112
115
 
113
116
  def register
117
+ # Compatibilty with logstash < 5 and pre Log4j integration
118
+ if defined?(LogStash::Logging) && LogStash::Logging.respond_to?(:setup_log4j)
119
+ LogStash::Logging.setup_log4j(@logger)
120
+ end
121
+
114
122
  if !@ssl
115
123
  @logger.warn("Beats input: SSL Certificate will not be used") unless @ssl_certificate.nil?
116
124
  @logger.warn("Beats input: SSL Key will not be used") unless @ssl_key.nil?
@@ -11,7 +11,7 @@ module LogStash module Inputs class Beats
11
11
  event.set("@timestamp", ts) unless ts.nil?
12
12
  hash.each { |k, v| event.set(k, v) }
13
13
  super(event)
14
- event.tag("beats_input_codec_#{codec_name}_applied")
14
+ event.tag("beats_input_codec_#{codec_name}_applied") if include_codec_tag?
15
15
  event
16
16
  end
17
17
 
@@ -44,5 +44,9 @@ module LogStash module Inputs class Beats
44
44
  decorate(event)
45
45
  event
46
46
  end
47
+
48
+ def include_codec_tag?
49
+ @input.include_codec_tag
50
+ end
47
51
  end
48
52
  end; end; end
@@ -11,7 +11,7 @@ module LogStash module Inputs class Beats
11
11
  class RawEventTransform < EventTransformCommon
12
12
  def transform(event)
13
13
  super(event)
14
- event.tag("beats_input_raw_event")
14
+ event.tag("beats_input_raw_event") if include_codec_tag?
15
15
  event
16
16
  end
17
17
  end
@@ -3,9 +3,9 @@ OS_PLATFORM = RbConfig::CONFIG["host_os"]
3
3
  VENDOR_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "vendor"))
4
4
 
5
5
  if OS_PLATFORM == "linux"
6
- FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha5-SNAPSHOT-linux-x86_64.tar.gz"
6
+ FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha6-SNAPSHOT-linux-x86_64.tar.gz"
7
7
  elsif OS_PLATFORM == "darwin"
8
- FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha5-SNAPSHOT-darwin-x86_64.tar.gz"
8
+ FILEBEAT_URL = "https://beats-nightlies.s3.amazonaws.com/filebeat/filebeat-5.0.0-alpha6-SNAPSHOT-darwin-x86_64.tar.gz"
9
9
  end
10
10
 
11
11
  LSF_URL = "https://download.elastic.co/logstash-forwarder/binaries/logstash-forwarder_#{OS_PLATFORM}_amd64"
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
25
25
  s.add_runtime_dependency "logstash-codec-plain"
26
26
  s.add_runtime_dependency "concurrent-ruby", [ ">= 0.9.2", "<= 1.0.0" ]
27
27
  s.add_runtime_dependency "thread_safe", "~> 0.3.5"
28
- s.add_runtime_dependency "logstash-codec-multiline", "~> 3.0"
28
+ s.add_runtime_dependency "logstash-codec-multiline", ">= 2.0.5"
29
29
  s.add_runtime_dependency 'jar-dependencies', '~> 0.3.4'
30
30
 
31
31
  s.add_development_dependency "flores", "~>0.0.6"
@@ -71,4 +71,11 @@ describe LogStash::Inputs::Beats::DecodedEventTransform do
71
71
  expect(subject.get("tags")).to include("beats_input_codec_dummy_applied")
72
72
  end
73
73
  end
74
+
75
+ context "when configured to not include codec tag" do
76
+ before { config.update("include_codec_tag" => false) }
77
+ it "does not tag the event" do
78
+ expect(subject.get("tags")).not_to include("beats_input_codec_plain_applied")
79
+ end
80
+ end
74
81
  end
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.0.beta4
4
+ version: 3.1.0
5
5
  platform: java
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-07-29 00:00:00.000000000 Z
11
+ date: 2016-08-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -81,17 +81,17 @@ dependencies:
81
81
  - !ruby/object:Gem::Dependency
82
82
  requirement: !ruby/object:Gem::Requirement
83
83
  requirements:
84
- - - "~>"
84
+ - - ">="
85
85
  - !ruby/object:Gem::Version
86
- version: '3.0'
86
+ version: 2.0.5
87
87
  name: logstash-codec-multiline
88
88
  prerelease: false
89
89
  type: :runtime
90
90
  version_requirements: !ruby/object:Gem::Requirement
91
91
  requirements:
92
- - - "~>"
92
+ - - ">="
93
93
  - !ruby/object:Gem::Version
94
- version: '3.0'
94
+ version: 2.0.5
95
95
  - !ruby/object:Gem::Dependency
96
96
  requirement: !ruby/object:Gem::Requirement
97
97
  requirements:
@@ -272,7 +272,7 @@ files:
272
272
  - vendor/jar-dependencies/org/bouncycastle/bcpkix-jdk15on/1.54/bcpkix-jdk15on-1.54.jar
273
273
  - vendor/jar-dependencies/org/bouncycastle/bcprov-jdk15on/1.54/bcprov-jdk15on-1.54.jar
274
274
  - vendor/jar-dependencies/org/javassist/javassist/3.20.0-GA/javassist-3.20.0-GA.jar
275
- - vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/3.1.0.beta4/logstash-input-beats-3.1.0.beta4.jar
275
+ - vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/3.1.0/logstash-input-beats-3.1.0.jar
276
276
  homepage: http://www.elastic.co/guide/en/logstash/current/index.html
277
277
  licenses:
278
278
  - Apache License (2.0)
@@ -291,9 +291,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
291
291
  version: '0'
292
292
  required_rubygems_version: !ruby/object:Gem::Requirement
293
293
  requirements:
294
- - - ">"
294
+ - - ">="
295
295
  - !ruby/object:Gem::Version
296
- version: 1.3.1
296
+ version: '0'
297
297
  requirements: []
298
298
  rubyforge_project:
299
299
  rubygems_version: 2.4.8