logstash-input-beats 6.1.6-java → 6.2.0-java
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +6 -0
- data/VERSION +1 -1
- data/docs/index.asciidoc +4 -12
- data/lib/logstash-input-beats_jars.rb +1 -1
- data/lib/logstash/inputs/beats.rb +4 -1
- data/lib/logstash/inputs/beats/message_listener.rb +4 -1
- data/logstash-input-beats.gemspec +2 -1
- data/spec/inputs/beats/decoded_event_transform_spec.rb +1 -0
- data/spec/inputs/beats/event_transform_common_spec.rb +1 -0
- data/spec/inputs/beats/message_listener_spec.rb +1 -0
- data/spec/inputs/beats/raw_event_transform_spec.rb +1 -0
- data/vendor/jar-dependencies/io/netty/netty-all/4.1.49.Final/netty-all-4.1.49.Final.jar +0 -0
- data/vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.1.3/logstash-input-beats-6.1.3.jar +0 -0
- data/vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.2.0/logstash-input-beats-6.2.0.jar +0 -0
- metadata +36 -20
- data/vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.1.6/logstash-input-beats-6.1.6.jar +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 16a55f0a53247ed30b7110d9f60dce425288fdd68c1bf936283698028bdfd421
|
4
|
+
data.tar.gz: d8cda82e3d3a8fb3ceef48a96f52674eb04496e7a0957043b34d5c5e741484fa
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e2869c6c573223e979f411c430ce1ddb6f65f6c967930b469c617a03b6a4fb0417a7eecfc23e2c8061599a72a07f656490bb76c9ceb5576f00613be0cdfde688
|
7
|
+
data.tar.gz: 38dd3f7bfb548565ecc047bc0e044e89796f2fcbdf8187f2b3a37fc1bb822a00d73c759713996dd69471fbaa1e334fd3a4b1e730adcb0093ccf6956f14f4549e
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,9 @@
|
|
1
|
+
## 6.2.0
|
2
|
+
- ECS compatibility enablement: Adds alias to support upcoming ECS v8 with the existing ECS v1 implementation
|
3
|
+
|
4
|
+
## 6.1.7
|
5
|
+
- [DOC] Remove limitations topic and link [#428](https://github.com/logstash-plugins/logstash-input-http/pull/428)
|
6
|
+
|
1
7
|
## 6.1.6
|
2
8
|
- [DOC] Applied more attributes to manage plugin name in doc content, and implemented conditional text processing. [#423](https://github.com/logstash-plugins/logstash-input-http/pull/423)
|
3
9
|
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
6.
|
1
|
+
6.2.0
|
data/docs/index.asciidoc
CHANGED
@@ -101,15 +101,6 @@ plugin] to handle multiline events. Doing so will result in the failure to start
|
|
101
101
|
Logstash.
|
102
102
|
endif::[]
|
103
103
|
|
104
|
-
//Content for Elastic Agent
|
105
|
-
ifeval::["{plugin}"!="beats"]
|
106
|
-
[id="plugins-{type}s-{plugin}-limitations"]
|
107
|
-
===== Elastic Agent and Fleet limitations
|
108
|
-
|
109
|
-
Early releases of Elastic Agent and Fleet have some limitations, including support for advanced Beats settings like multiline, processors, and so forth.
|
110
|
-
For more information, see {fleet-guide}/fleet-limitations.html[Limitations of this release].
|
111
|
-
endif::[]
|
112
|
-
|
113
104
|
//Content for Beats
|
114
105
|
ifeval::["{plugin}"=="beats"]
|
115
106
|
[id="plugins-{type}s-{plugin}-versioned-indexes"]
|
@@ -150,11 +141,11 @@ output.
|
|
150
141
|
|
151
142
|
[cols="<l,<l,e,<e"]
|
152
143
|
|=======================================================================
|
153
|
-
|ECS disabled |ECS v1 |Availability |Description
|
144
|
+
|ECS `disabled` |ECS `v1`, `v8` |Availability |Description
|
154
145
|
|
155
146
|
|[host] |[@metadata][input][beats][host][name] |Always |Name or address of the {plugin-singular} host
|
156
147
|
|[@metadata][ip_address] |[@metadata][input][beats][host][ip] |Always |IP address of the {plugin-uc} client
|
157
|
-
|[@metadata][tls_peer][status] | [@metadata][tls_peer][status] | When SSL related fields are populated | Contains "verified"/"unverified" labels in `disabled`, `true`/`false` in `v1`
|
148
|
+
|[@metadata][tls_peer][status] | [@metadata][tls_peer][status] | When SSL related fields are populated | Contains "verified"/"unverified" labels in `disabled`, `true`/`false` in `v1`/`v8`
|
158
149
|
|[@metadata][tls_peer][protocol] | [@metadata][input][beats][tls][version_protocol] | When SSL status is "verified" | Contains the TLS version used (e.g. `TLSv1.2`)
|
159
150
|
|[@metadata][tls_peer][subject] | [@metadata][input][beats][tls][client][subject] | When SSL status is "verified" | Contains the identity name of the remote end (e.g. `CN=artifacts-no-kpi.elastic.co`)
|
160
151
|
|[@metadata][tls_peer][cipher_suite] | [@metadata][input][beats][tls][cipher] | When SSL status is "verified" | Contains the name of cipher suite used (e.g. `TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256`)
|
@@ -225,7 +216,8 @@ Close Idle clients after X seconds of inactivity.
|
|
225
216
|
* Value type is <<string,string>>
|
226
217
|
* Supported values are:
|
227
218
|
** `disabled`: unstructured connection metadata added at root level
|
228
|
-
** `v1`: structured connection metadata added under ECS compliant namespaces
|
219
|
+
** `v1`: structured connection metadata added under ECS v1 compliant namespaces
|
220
|
+
** `v8`: structured connection metadata added under ECS v8 compliant namespaces
|
229
221
|
* Default value depends on which version of Logstash is running:
|
230
222
|
** When Logstash provides a `pipeline.ecs_compatibility` setting, its value is used as the default
|
231
223
|
** Otherwise, the default value is `disabled`.
|
@@ -8,4 +8,4 @@ require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.9.10')
|
|
8
8
|
require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.9.10.8')
|
9
9
|
require_jar('com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.10')
|
10
10
|
require_jar('org.apache.logging.log4j', 'log4j-api', '2.11.1')
|
11
|
-
require_jar('org.logstash.beats', 'logstash-input-beats', '6.
|
11
|
+
require_jar('org.logstash.beats', 'logstash-input-beats', '6.2.0')
|
@@ -6,6 +6,7 @@ require "logstash/codecs/multiline"
|
|
6
6
|
require "logstash/util"
|
7
7
|
require "logstash-input-beats_jars"
|
8
8
|
require "logstash/plugin_mixins/ecs_compatibility_support"
|
9
|
+
require 'logstash/plugin_mixins/event_support/event_factory_adapter'
|
9
10
|
require_relative "beats/patch"
|
10
11
|
|
11
12
|
# This input plugin enables Logstash to receive events from the
|
@@ -51,7 +52,9 @@ class LogStash::Inputs::Beats < LogStash::Inputs::Base
|
|
51
52
|
require "logstash/inputs/beats/tls"
|
52
53
|
|
53
54
|
# adds ecs_compatibility config which could be :disabled or :v1
|
54
|
-
include LogStash::PluginMixins::ECSCompatibilitySupport(:disabled,:v1)
|
55
|
+
include LogStash::PluginMixins::ECSCompatibilitySupport(:disabled,:v1, :v8 => :v1)
|
56
|
+
|
57
|
+
include LogStash::PluginMixins::EventSupport::EventFactoryAdapter
|
55
58
|
|
56
59
|
config_name "beats"
|
57
60
|
|
@@ -15,6 +15,8 @@ module LogStash module Inputs class Beats
|
|
15
15
|
|
16
16
|
attr_reader :logger, :input, :connections_list
|
17
17
|
|
18
|
+
attr_reader :event_factory
|
19
|
+
|
18
20
|
def initialize(queue, input)
|
19
21
|
@connections_list = ThreadSafe::Hash.new
|
20
22
|
@queue = queue
|
@@ -25,6 +27,7 @@ module LogStash module Inputs class Beats
|
|
25
27
|
|
26
28
|
@nocodec_transformer = RawEventTransform.new(@input)
|
27
29
|
@codec_transformer = DecodedEventTransform.new(@input)
|
30
|
+
@event_factory = input.event_factory
|
28
31
|
end
|
29
32
|
|
30
33
|
def onNewMessage(ctx, message)
|
@@ -39,7 +42,7 @@ module LogStash module Inputs class Beats
|
|
39
42
|
extract_tls_peer(hash, ctx)
|
40
43
|
|
41
44
|
if target_field.nil?
|
42
|
-
event =
|
45
|
+
event = event_factory.new_event(hash)
|
43
46
|
@nocodec_transformer.transform(event)
|
44
47
|
@queue << event
|
45
48
|
else
|
@@ -27,7 +27,8 @@ Gem::Specification.new do |s|
|
|
27
27
|
s.add_runtime_dependency "thread_safe", "~> 0.3.5"
|
28
28
|
s.add_runtime_dependency "logstash-codec-multiline", ">= 2.0.5"
|
29
29
|
s.add_runtime_dependency 'jar-dependencies', '~> 0.3', '>= 0.3.4'
|
30
|
-
s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~>1.
|
30
|
+
s.add_runtime_dependency 'logstash-mixin-ecs_compatibility_support', '~>1.3'
|
31
|
+
s.add_runtime_dependency 'logstash-mixin-event_support', '~>1.0'
|
31
32
|
|
32
33
|
s.add_development_dependency "flores", "~>0.0.6"
|
33
34
|
s.add_development_dependency "rspec"
|
@@ -31,6 +31,7 @@ describe LogStash::Inputs::Beats::DecodedEventTransform do
|
|
31
31
|
|
32
32
|
include_examples "Common Event Transformation", :disabled, "host"
|
33
33
|
include_examples "Common Event Transformation", :v1, "[@metadata][input][beats][host][name]"
|
34
|
+
include_examples "Common Event Transformation", :v8, "[@metadata][input][beats][host][name]"
|
34
35
|
|
35
36
|
it "tags the event" do
|
36
37
|
expect(subject.get("tags")).to include("beats_input_codec_plain_applied")
|
@@ -9,4 +9,5 @@ describe LogStash::Inputs::Beats::EventTransformCommon do
|
|
9
9
|
|
10
10
|
include_examples "Common Event Transformation", :disabled, "host"
|
11
11
|
include_examples "Common Event Transformation", :v1, "[@metadata][input][beats][host][name]"
|
12
|
+
include_examples "Common Event Transformation", :v8, "[@metadata][input][beats][host][name]"
|
12
13
|
end
|
@@ -211,6 +211,7 @@ describe LogStash::Inputs::Beats::MessageListener do
|
|
211
211
|
|
212
212
|
it_behaves_like "when the message is from any libbeat", :disabled, "[@metadata][ip_address]"
|
213
213
|
it_behaves_like "when the message is from any libbeat", :v1, "[@metadata][input][beats][host][ip]"
|
214
|
+
it_behaves_like "when the message is from any libbeat", :v8, "[@metadata][input][beats][host][ip]"
|
214
215
|
end
|
215
216
|
|
216
217
|
context "onException" do
|
@@ -20,6 +20,7 @@ describe LogStash::Inputs::Beats::RawEventTransform do
|
|
20
20
|
|
21
21
|
include_examples "Common Event Transformation", :disabled, "host"
|
22
22
|
include_examples "Common Event Transformation", :v1, "[@metadata][input][beats][host][name]"
|
23
|
+
include_examples "Common Event Transformation", :v8, "[@metadata][input][beats][host][name]"
|
23
24
|
|
24
25
|
it "tags the event" do
|
25
26
|
expect(subject.get("tags")).to include("beats_input_raw_event")
|
Binary file
|
Binary file
|
Binary file
|
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: 6.
|
4
|
+
version: 6.2.0
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Elastic
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-08-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -20,8 +20,8 @@ dependencies:
|
|
20
20
|
- !ruby/object:Gem::Version
|
21
21
|
version: '2.99'
|
22
22
|
name: logstash-core-plugin-api
|
23
|
-
type: :runtime
|
24
23
|
prerelease: false
|
24
|
+
type: :runtime
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
26
26
|
requirements:
|
27
27
|
- - ">="
|
@@ -37,8 +37,8 @@ dependencies:
|
|
37
37
|
- !ruby/object:Gem::Version
|
38
38
|
version: '0'
|
39
39
|
name: logstash-codec-plain
|
40
|
-
type: :runtime
|
41
40
|
prerelease: false
|
41
|
+
type: :runtime
|
42
42
|
version_requirements: !ruby/object:Gem::Requirement
|
43
43
|
requirements:
|
44
44
|
- - ">="
|
@@ -51,8 +51,8 @@ dependencies:
|
|
51
51
|
- !ruby/object:Gem::Version
|
52
52
|
version: '1.0'
|
53
53
|
name: concurrent-ruby
|
54
|
-
type: :runtime
|
55
54
|
prerelease: false
|
55
|
+
type: :runtime
|
56
56
|
version_requirements: !ruby/object:Gem::Requirement
|
57
57
|
requirements:
|
58
58
|
- - "~>"
|
@@ -65,8 +65,8 @@ dependencies:
|
|
65
65
|
- !ruby/object:Gem::Version
|
66
66
|
version: 0.3.5
|
67
67
|
name: thread_safe
|
68
|
-
type: :runtime
|
69
68
|
prerelease: false
|
69
|
+
type: :runtime
|
70
70
|
version_requirements: !ruby/object:Gem::Requirement
|
71
71
|
requirements:
|
72
72
|
- - "~>"
|
@@ -79,8 +79,8 @@ dependencies:
|
|
79
79
|
- !ruby/object:Gem::Version
|
80
80
|
version: 2.0.5
|
81
81
|
name: logstash-codec-multiline
|
82
|
-
type: :runtime
|
83
82
|
prerelease: false
|
83
|
+
type: :runtime
|
84
84
|
version_requirements: !ruby/object:Gem::Requirement
|
85
85
|
requirements:
|
86
86
|
- - ">="
|
@@ -96,8 +96,8 @@ dependencies:
|
|
96
96
|
- !ruby/object:Gem::Version
|
97
97
|
version: 0.3.4
|
98
98
|
name: jar-dependencies
|
99
|
-
type: :runtime
|
100
99
|
prerelease: false
|
100
|
+
type: :runtime
|
101
101
|
version_requirements: !ruby/object:Gem::Requirement
|
102
102
|
requirements:
|
103
103
|
- - "~>"
|
@@ -111,15 +111,29 @@ dependencies:
|
|
111
111
|
requirements:
|
112
112
|
- - "~>"
|
113
113
|
- !ruby/object:Gem::Version
|
114
|
-
version: '1.
|
114
|
+
version: '1.3'
|
115
115
|
name: logstash-mixin-ecs_compatibility_support
|
116
|
+
prerelease: false
|
116
117
|
type: :runtime
|
118
|
+
version_requirements: !ruby/object:Gem::Requirement
|
119
|
+
requirements:
|
120
|
+
- - "~>"
|
121
|
+
- !ruby/object:Gem::Version
|
122
|
+
version: '1.3'
|
123
|
+
- !ruby/object:Gem::Dependency
|
124
|
+
requirement: !ruby/object:Gem::Requirement
|
125
|
+
requirements:
|
126
|
+
- - "~>"
|
127
|
+
- !ruby/object:Gem::Version
|
128
|
+
version: '1.0'
|
129
|
+
name: logstash-mixin-event_support
|
117
130
|
prerelease: false
|
131
|
+
type: :runtime
|
118
132
|
version_requirements: !ruby/object:Gem::Requirement
|
119
133
|
requirements:
|
120
134
|
- - "~>"
|
121
135
|
- !ruby/object:Gem::Version
|
122
|
-
version: '1.
|
136
|
+
version: '1.0'
|
123
137
|
- !ruby/object:Gem::Dependency
|
124
138
|
requirement: !ruby/object:Gem::Requirement
|
125
139
|
requirements:
|
@@ -127,8 +141,8 @@ dependencies:
|
|
127
141
|
- !ruby/object:Gem::Version
|
128
142
|
version: 0.0.6
|
129
143
|
name: flores
|
130
|
-
type: :development
|
131
144
|
prerelease: false
|
145
|
+
type: :development
|
132
146
|
version_requirements: !ruby/object:Gem::Requirement
|
133
147
|
requirements:
|
134
148
|
- - "~>"
|
@@ -141,8 +155,8 @@ dependencies:
|
|
141
155
|
- !ruby/object:Gem::Version
|
142
156
|
version: '0'
|
143
157
|
name: rspec
|
144
|
-
type: :development
|
145
158
|
prerelease: false
|
159
|
+
type: :development
|
146
160
|
version_requirements: !ruby/object:Gem::Requirement
|
147
161
|
requirements:
|
148
162
|
- - ">="
|
@@ -155,8 +169,8 @@ dependencies:
|
|
155
169
|
- !ruby/object:Gem::Version
|
156
170
|
version: '0'
|
157
171
|
name: stud
|
158
|
-
type: :development
|
159
172
|
prerelease: false
|
173
|
+
type: :development
|
160
174
|
version_requirements: !ruby/object:Gem::Requirement
|
161
175
|
requirements:
|
162
176
|
- - ">="
|
@@ -169,8 +183,8 @@ dependencies:
|
|
169
183
|
- !ruby/object:Gem::Version
|
170
184
|
version: '0'
|
171
185
|
name: pry
|
172
|
-
type: :development
|
173
186
|
prerelease: false
|
187
|
+
type: :development
|
174
188
|
version_requirements: !ruby/object:Gem::Requirement
|
175
189
|
requirements:
|
176
190
|
- - ">="
|
@@ -183,8 +197,8 @@ dependencies:
|
|
183
197
|
- !ruby/object:Gem::Version
|
184
198
|
version: '0'
|
185
199
|
name: rspec-wait
|
186
|
-
type: :development
|
187
200
|
prerelease: false
|
201
|
+
type: :development
|
188
202
|
version_requirements: !ruby/object:Gem::Requirement
|
189
203
|
requirements:
|
190
204
|
- - ">="
|
@@ -197,8 +211,8 @@ dependencies:
|
|
197
211
|
- !ruby/object:Gem::Version
|
198
212
|
version: '0'
|
199
213
|
name: logstash-devutils
|
200
|
-
type: :development
|
201
214
|
prerelease: false
|
215
|
+
type: :development
|
202
216
|
version_requirements: !ruby/object:Gem::Requirement
|
203
217
|
requirements:
|
204
218
|
- - ">="
|
@@ -211,8 +225,8 @@ dependencies:
|
|
211
225
|
- !ruby/object:Gem::Version
|
212
226
|
version: '0'
|
213
227
|
name: logstash-codec-json
|
214
|
-
type: :development
|
215
228
|
prerelease: false
|
229
|
+
type: :development
|
216
230
|
version_requirements: !ruby/object:Gem::Requirement
|
217
231
|
requirements:
|
218
232
|
- - ">="
|
@@ -225,8 +239,8 @@ dependencies:
|
|
225
239
|
- !ruby/object:Gem::Version
|
226
240
|
version: '0'
|
227
241
|
name: childprocess
|
228
|
-
type: :development
|
229
242
|
prerelease: false
|
243
|
+
type: :development
|
230
244
|
version_requirements: !ruby/object:Gem::Requirement
|
231
245
|
requirements:
|
232
246
|
- - ">="
|
@@ -282,10 +296,12 @@ files:
|
|
282
296
|
- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.9.10/jackson-core-2.9.10.jar
|
283
297
|
- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.9.10.8/jackson-databind-2.9.10.8.jar
|
284
298
|
- vendor/jar-dependencies/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.10/jackson-module-afterburner-2.9.10.jar
|
299
|
+
- vendor/jar-dependencies/io/netty/netty-all/4.1.49.Final/netty-all-4.1.49.Final.jar
|
285
300
|
- vendor/jar-dependencies/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final.jar
|
286
301
|
- vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.11.1/log4j-api-2.11.1.jar
|
287
302
|
- vendor/jar-dependencies/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA.jar
|
288
|
-
- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.1.
|
303
|
+
- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.1.3/logstash-input-beats-6.1.3.jar
|
304
|
+
- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.2.0/logstash-input-beats-6.2.0.jar
|
289
305
|
homepage: http://www.elastic.co/guide/en/logstash/current/index.html
|
290
306
|
licenses:
|
291
307
|
- Apache License (2.0)
|
@@ -308,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
308
324
|
- !ruby/object:Gem::Version
|
309
325
|
version: '0'
|
310
326
|
requirements: []
|
311
|
-
rubygems_version: 3.
|
327
|
+
rubygems_version: 3.1.6
|
312
328
|
signing_key:
|
313
329
|
specification_version: 4
|
314
330
|
summary: Receives events from the Elastic Beats framework
|