logstash-input-beats 5.1.11-java → 6.0.0-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (22) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +3 -8
  3. data/VERSION +1 -1
  4. data/docs/index.asciidoc +2 -3
  5. data/lib/logstash/inputs/beats.rb +1 -9
  6. data/lib/logstash-input-beats_jars.rb +6 -6
  7. data/lib/tasks/test.rake +2 -2
  8. data/logstash-input-beats.gemspec +1 -1
  9. data/spec/integration/filebeat_spec.rb +20 -17
  10. data/vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.9.7/jackson-annotations-2.9.7.jar +0 -0
  11. data/vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7.jar +0 -0
  12. data/vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7.jar +0 -0
  13. data/vendor/jar-dependencies/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.7/jackson-module-afterburner-2.9.7.jar +0 -0
  14. data/vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.11.1/log4j-api-2.11.1.jar +0 -0
  15. data/vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.0.0/logstash-input-beats-6.0.0.jar +0 -0
  16. metadata +14 -13
  17. data/vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.9.9/jackson-annotations-2.9.9.jar +0 -0
  18. data/vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9.jar +0 -0
  19. data/vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.9.9.3/jackson-databind-2.9.9.3.jar +0 -0
  20. data/vendor/jar-dependencies/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.9/jackson-module-afterburner-2.9.9.jar +0 -0
  21. data/vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.17.1/log4j-api-2.17.1.jar +0 -0
  22. data/vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/5.1.11/logstash-input-beats-5.1.11.jar +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 682a8560228eb7e7fed37953b69ed923379927a1bb3bbd1f1297157f6f270f95
4
- data.tar.gz: 2febd5c3806f74544c6643b520d33e216ccb609cf3034a6eb2aef72589419194
3
+ metadata.gz: 39c210ae258ed8bd369c6a346909174ed4e0d85693fdae014579528c00db2f1f
4
+ data.tar.gz: a25a9375c4017fc6adaf197a5da36b3735d29cac64530ee217195f53bc8775ee
5
5
  SHA512:
6
- metadata.gz: 2b8b38a496f34258cd2236da65637120b0ec9aa63402a439a32bf8ff135c5ac6dc4692edb5299787d6390b2cf4bf2be294a3b5b83b399eb397ff473b54610b26
7
- data.tar.gz: '049f4d57c6fc3e5feddff56d60ac08dcff860f3a8f7d27b234fcd83a0d7b0f45383dcd82c880ee29fce39ef692065ef64886c511de612155b737179c88d1bf81'
6
+ metadata.gz: 455af4f09ebb53a032cb2965400b999b9e80928c6e14f1e74a6ea3c7bedf57fbcc8e374136c9f18afaebfb3212ad5314218dafbbd4d772cc439d1075b99a58f7
7
+ data.tar.gz: 9c365edb5417a5f157db1cacd3993a1d9f038a939ad7d59e3927aa42dd537ddad5cdbc303b2ff5015e9db32e5b992076cb8983beaba01da2604abb53b3736f2d
data/CHANGELOG.md CHANGED
@@ -1,11 +1,6 @@
1
- ## 5.1.11
2
- - Update log4j dependency to 2.17.1
3
-
4
- ## 5.1.10
5
- - Update log4j dependency to 2.17.0
6
-
7
- ## 5.1.9
8
- - Backport [#366](https://github.com/logstash-plugins/logstash-input-beats/pull/366) and [#368](https://github.com/logstash-plugins/logstash-input-beats/pull/368) from 6.x
1
+ ## 6.0.0
2
+ - Removed obsolete setting congestion_threshold and target_field_for_codec
3
+ - Changed default value of `add_hostname` to false
9
4
 
10
5
  ## 5.1.8
11
6
  - Loosen jar-dependencies manager gem dependency to allow plugin to work with JRubies that include a later version.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 5.1.11
1
+ 6.0.0
data/docs/index.asciidoc CHANGED
@@ -116,11 +116,10 @@ input plugins.
116
116
  [id="plugins-{type}s-{plugin}-add_hostname"]
117
117
  ===== `add_hostname`
118
118
 
119
- added[5.1.4, Field was added to allow users to control whether or not the `host` field is automatically added to events.]
120
- deprecated[5.1.4, In future versions of this plugin, this setting will be removed, and the 'hosts' field will not be added to events.]
119
+ deprecated[6.0.0, The default value has been changed to `false`. In 7.0.0 this setting will be removed]
121
120
 
122
121
  * Value type is <<boolean,boolean>>
123
- * Default value is `true`
122
+ * Default value is `false`
124
123
 
125
124
  Flag to determine whether to add `host` field to event using the value supplied by the beat in the `hostname` field.
126
125
 
@@ -83,8 +83,7 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
83
83
  config :ssl_certificate_authorities, :validate => :array, :default => []
84
84
 
85
85
  # Flag to determine whether to add host information (provided by the beat in the 'hostname' field) to the event
86
- config :add_hostname, :validate => :boolean, :default => true, :deprecated => 'Host field will not be automatically populated by future version of the Beats input'
87
-
86
+ config :add_hostname, :validate => :boolean, :default => false, :deprecated => 'This option will be removed in the future as beats determine the event schema'
88
87
 
89
88
  # By default the server doesn't do any client verification.
90
89
  #
@@ -106,13 +105,6 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
106
105
  # Time in milliseconds for an incomplete ssl handshake to timeout
107
106
  config :ssl_handshake_timeout, :validate => :number, :default => 10000
108
107
 
109
- # The number of seconds before we raise a timeout.
110
- # This option is useful to control how much time to wait if something is blocking the pipeline.
111
- config :congestion_threshold, :validate => :number, :obsolete => "This option is obsolete since congestion control is done automatically"
112
-
113
- # This is the default field to which the specified codec will be applied.
114
- config :target_field_for_codec, :validate => :string, :obsolete => "This option is obsolete"
115
-
116
108
  # The minimum TLS version allowed for the encrypted connections. The value must be one of the following:
117
109
  # 1.0 for TLS 1.0, 1.1 for TLS 1.1, 1.2 for TLS 1.2
118
110
  config :tls_min_version, :validate => :number, :default => TLS.min.version
@@ -4,9 +4,9 @@ require 'jar_dependencies'
4
4
  require_jar('io.netty', 'netty-all', '4.1.30.Final')
5
5
  require_jar('io.netty', 'netty-tcnative-boringssl-static', '2.0.12.Final')
6
6
  require_jar('org.javassist', 'javassist', '3.24.0-GA')
7
- require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.9.9')
8
- require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.9.9')
9
- require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.9.9.3')
10
- require_jar('com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.9')
11
- require_jar('org.apache.logging.log4j', 'log4j-api', '2.17.1')
12
- require_jar('org.logstash.beats', 'logstash-input-beats', '5.1.11')
7
+ require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.9.7')
8
+ require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.9.7')
9
+ require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.9.7')
10
+ require_jar('com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.7')
11
+ require_jar('org.apache.logging.log4j', 'log4j-api', '2.11.1')
12
+ require_jar('org.logstash.beats', 'logstash-input-beats', '6.0.0')
data/lib/tasks/test.rake CHANGED
@@ -4,9 +4,9 @@ VENDOR_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "ve
4
4
 
5
5
  #TODO: Figure out better means to keep this version in sync
6
6
  if OS_PLATFORM == "linux"
7
- FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-6.0.0-alpha2-linux-x86_64.tar.gz"
7
+ FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-6.5.4-linux-x86_64.tar.gz"
8
8
  elsif OS_PLATFORM == "darwin"
9
- FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-6.0.0-alpha2-darwin-x86_64.tar.gz"
9
+ FILEBEAT_URL = "https://artifacts.elastic.co/downloads/beats/filebeat/filebeat-6.5.4-darwin-x86_64.tar.gz"
10
10
  end
11
11
 
12
12
  LSF_URL = "https://download.elastic.co/logstash-forwarder/binaries/logstash-forwarder_#{OS_PLATFORM}_amd64"
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
33
33
  s.add_development_dependency "stud"
34
34
  s.add_development_dependency "pry"
35
35
  s.add_development_dependency "rspec-wait"
36
- s.add_development_dependency 'logstash-devutils', '~> 1.0'
36
+ s.add_development_dependency "logstash-devutils"
37
37
  s.add_development_dependency "logstash-codec-json"
38
38
  s.add_development_dependency "childprocess" # To make filebeat/LSF integration test easier to write.
39
39
 
@@ -37,14 +37,13 @@ describe "Filebeat", :integration => true do
37
37
  let(:filebeat_config) do
38
38
  {
39
39
  "filebeat" => {
40
- "prospectors" => [{ "paths" => [log_file], "input_type" => "log" }],
41
- "scan_frequency" => "1s",
42
- "idle_timeout" => "1s"
40
+ "prospectors" => [{ "paths" => [log_file], "type" => "log" }],
41
+ "scan_frequency" => "1s"
43
42
  },
44
43
  "output" => {
45
44
  "logstash" => { "hosts" => ["#{host}:#{port}"] },
46
- "logging" => { "level" => "debug" }
47
- }
45
+ },
46
+ "logging" => { "level" => "debug" }
48
47
  }
49
48
  end
50
49
 
@@ -90,9 +89,10 @@ describe "Filebeat", :integration => true do
90
89
  "logstash" => {
91
90
  "hosts" => ["#{host}:#{port}"],
92
91
  "ssl" => { "certificate_authorities" => certificate_authorities }
93
- },
94
- "logging" => { "level" => "debug" }
95
- }})
92
+ }
93
+ },
94
+ "logging" => { "level" => "debug" }
95
+ })
96
96
  end
97
97
 
98
98
  let(:input_config) do
@@ -123,9 +123,10 @@ describe "Filebeat", :integration => true do
123
123
  "versions" => ["TLSv1.2"],
124
124
  "cipher_suites" => [beats_cipher]
125
125
  }
126
- },
127
- "logging" => { "level" => "debug" }
128
- }})
126
+ }
127
+ },
128
+ "logging" => { "level" => "debug" }
129
+ })
129
130
  end
130
131
 
131
132
  let(:input_config) {
@@ -222,9 +223,10 @@ describe "Filebeat", :integration => true do
222
223
  "certificate" => certificate_file,
223
224
  "key" => certificate_key_file
224
225
  }
225
- },
226
- "logging" => { "level" => "debug" }
227
- }})
226
+ }
227
+ },
228
+ "logging" => { "level" => "debug" }
229
+ })
228
230
  end
229
231
 
230
232
  let(:input_config) do
@@ -319,9 +321,10 @@ describe "Filebeat", :integration => true do
319
321
  "certificate" => secondary_client_certificate_file,
320
322
  "key" => secondary_client_certificate_key_file
321
323
  }
322
- },
323
- "logging" => { "level" => "debug" }
324
- }})
324
+ }
325
+ },
326
+ "logging" => { "level" => "debug" }
327
+ })
325
328
  end
326
329
 
327
330
  include_examples "send events"
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: 5.1.11
4
+ version: 6.0.0
5
5
  platform: java
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-01-05 00:00:00.000000000 Z
11
+ date: 2019-02-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -179,17 +179,17 @@ dependencies:
179
179
  - !ruby/object:Gem::Dependency
180
180
  requirement: !ruby/object:Gem::Requirement
181
181
  requirements:
182
- - - "~>"
182
+ - - ">="
183
183
  - !ruby/object:Gem::Version
184
- version: '1.0'
184
+ version: '0'
185
185
  name: logstash-devutils
186
186
  prerelease: false
187
187
  type: :development
188
188
  version_requirements: !ruby/object:Gem::Requirement
189
189
  requirements:
190
- - - "~>"
190
+ - - ">="
191
191
  - !ruby/object:Gem::Version
192
- version: '1.0'
192
+ version: '0'
193
193
  - !ruby/object:Gem::Dependency
194
194
  requirement: !ruby/object:Gem::Requirement
195
195
  requirements:
@@ -264,15 +264,15 @@ files:
264
264
  - spec/support/integration_shared_context.rb
265
265
  - spec/support/logstash_test.rb
266
266
  - spec/support/shared_examples.rb
267
- - vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.9.9/jackson-annotations-2.9.9.jar
268
- - vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.9.9/jackson-core-2.9.9.jar
269
- - vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.9.9.3/jackson-databind-2.9.9.3.jar
270
- - vendor/jar-dependencies/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.9/jackson-module-afterburner-2.9.9.jar
267
+ - vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-annotations/2.9.7/jackson-annotations-2.9.7.jar
268
+ - vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7.jar
269
+ - vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7.jar
270
+ - vendor/jar-dependencies/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.7/jackson-module-afterburner-2.9.7.jar
271
271
  - vendor/jar-dependencies/io/netty/netty-all/4.1.30.Final/netty-all-4.1.30.Final.jar
272
272
  - vendor/jar-dependencies/io/netty/netty-tcnative-boringssl-static/2.0.12.Final/netty-tcnative-boringssl-static-2.0.12.Final.jar
273
- - vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.17.1/log4j-api-2.17.1.jar
273
+ - vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.11.1/log4j-api-2.11.1.jar
274
274
  - vendor/jar-dependencies/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA.jar
275
- - vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/5.1.11/logstash-input-beats-5.1.11.jar
275
+ - vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.0.0/logstash-input-beats-6.0.0.jar
276
276
  homepage: http://www.elastic.co/guide/en/logstash/current/index.html
277
277
  licenses:
278
278
  - Apache License (2.0)
@@ -295,7 +295,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
295
295
  - !ruby/object:Gem::Version
296
296
  version: '0'
297
297
  requirements: []
298
- rubygems_version: 3.1.6
298
+ rubyforge_project:
299
+ rubygems_version: 2.6.13
299
300
  signing_key:
300
301
  specification_version: 4
301
302
  summary: Receives events from the Elastic Beats framework