logstash-input-beats 6.8.4-java → 6.9.1-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 +4 -4
- data/CHANGELOG.md +8 -0
- data/VERSION +1 -1
- data/lib/logstash/inputs/beats/codec_callback_listener.rb +2 -2
- data/lib/logstash/inputs/beats/message_listener.rb +12 -5
- data/lib/logstash-input-beats_jars.rb +7 -7
- data/spec/inputs/beats/message_listener_spec.rb +18 -0
- data/vendor/jar-dependencies/io/netty/netty-buffer/{4.1.109.Final/netty-buffer-4.1.109.Final.jar → 4.1.115.Final/netty-buffer-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/io/netty/netty-codec/{4.1.109.Final/netty-codec-4.1.109.Final.jar → 4.1.115.Final/netty-codec-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/io/netty/netty-common/{4.1.109.Final/netty-common-4.1.109.Final.jar → 4.1.115.Final/netty-common-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/io/netty/netty-handler/{4.1.109.Final/netty-handler-4.1.109.Final.jar → 4.1.115.Final/netty-handler-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/io/netty/netty-transport/{4.1.109.Final/netty-transport-4.1.109.Final.jar → 4.1.115.Final/netty-transport-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/{4.1.109.Final/netty-transport-native-unix-common-4.1.109.Final.jar → 4.1.115.Final/netty-transport-native-unix-common-4.1.115.Final.jar} +0 -0
- data/vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/{6.8.4/logstash-input-beats-6.8.4.jar → 6.9.1/logstash-input-beats-6.9.1.jar} +0 -0
- metadata +28 -28
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 765bfc357e5f8f71d8b2ca407a57c5d3ab1bdc0df052477f0997c5318f694f54
|
|
4
|
+
data.tar.gz: 55f75fac1f6afc9777eb7068f8326544e855d1ee69982a9c811f6207dcac9293
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 205d378bb2482f9b29dadd2115a5dcd126644a69f75ebaa60c9092707cdc0ca34f66dd3ed37996fdbd07570b515d95bc1169778c67bc717718d5a1633728ce7e
|
|
7
|
+
data.tar.gz: 2e8abb74a6297423f6a5240072b6d8f332f69f8c83d8abc5babe69abea2c5c1f3207ad212be5d745f1c8b8ad50841e8dcbf2692f533d7335a39b4fdaffedfff8
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
## 6.9.1
|
|
2
|
+
- Upgrade netty to 4.1.115 [#507](https://github.com/logstash-plugins/logstash-input-beats/pull/507)
|
|
3
|
+
|
|
4
|
+
## 6.9.0
|
|
5
|
+
- Improvements on plugin's shutdown [#500](https://github.com/logstash-plugins/logstash-input-beats/pull/500)
|
|
6
|
+
- Fix: avoid plugin crash when connection terminated but processing the message
|
|
7
|
+
- Graceful shutdown: close acceptor group (incoming socket handler) first, ask and wait for the executors which have pending tasks, better message handling when executors terminated
|
|
8
|
+
|
|
1
9
|
## 6.8.4
|
|
2
10
|
- Fixed to populate the `@metadata` fields even if the source's metadata value is `nil` [#502](https://github.com/logstash-plugins/logstash-input-beats/pull/502)
|
|
3
11
|
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
6.
|
|
1
|
+
6.9.1
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
require "logstash/inputs/beats"
|
|
3
3
|
|
|
4
4
|
module LogStash module Inputs class Beats
|
|
5
|
-
# Use the new callback based
|
|
5
|
+
# Use the new callback based approach instead of using blocks
|
|
6
6
|
# so we can retain some context of the execution, and make it easier to test
|
|
7
7
|
class CodecCallbackListener
|
|
8
8
|
attr_accessor :data
|
|
9
9
|
# The path acts as the `stream_identity`,
|
|
10
|
-
#
|
|
10
|
+
# useful when the clients is reading multiples files
|
|
11
11
|
attr_accessor :path
|
|
12
12
|
|
|
13
13
|
def initialize(data, hash, path, transformer, queue)
|
|
@@ -49,11 +49,18 @@ module LogStash module Inputs class Beats
|
|
|
49
49
|
@nocodec_transformer.transform(event)
|
|
50
50
|
@queue << event
|
|
51
51
|
else
|
|
52
|
-
codec(ctx)
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
52
|
+
current_codec = codec(ctx)
|
|
53
|
+
if current_codec
|
|
54
|
+
current_codec.accept(CodecCallbackListener.new(target_field,
|
|
55
|
+
hash,
|
|
56
|
+
message.getIdentityStream(),
|
|
57
|
+
@codec_transformer,
|
|
58
|
+
@queue))
|
|
59
|
+
else
|
|
60
|
+
# the possible cases: connection closed or exception with a connection
|
|
61
|
+
# let client retry
|
|
62
|
+
input.logger.warn("No codec available to process the message. This may due to connection termination and message was being processed.")
|
|
63
|
+
end
|
|
57
64
|
end
|
|
58
65
|
end
|
|
59
66
|
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
|
|
2
2
|
|
|
3
3
|
require 'jar_dependencies'
|
|
4
|
-
require_jar('io.netty', 'netty-buffer', '4.1.
|
|
5
|
-
require_jar('io.netty', 'netty-codec', '4.1.
|
|
6
|
-
require_jar('io.netty', 'netty-common', '4.1.
|
|
7
|
-
require_jar('io.netty', 'netty-transport', '4.1.
|
|
8
|
-
require_jar('io.netty', 'netty-handler', '4.1.
|
|
9
|
-
require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.
|
|
4
|
+
require_jar('io.netty', 'netty-buffer', '4.1.115.Final')
|
|
5
|
+
require_jar('io.netty', 'netty-codec', '4.1.115.Final')
|
|
6
|
+
require_jar('io.netty', 'netty-common', '4.1.115.Final')
|
|
7
|
+
require_jar('io.netty', 'netty-transport', '4.1.115.Final')
|
|
8
|
+
require_jar('io.netty', 'netty-handler', '4.1.115.Final')
|
|
9
|
+
require_jar('io.netty', 'netty-transport-native-unix-common', '4.1.115.Final')
|
|
10
10
|
require_jar('org.javassist', 'javassist', '3.24.0-GA')
|
|
11
|
-
require_jar('org.logstash.beats', 'logstash-input-beats', '6.
|
|
11
|
+
require_jar('org.logstash.beats', 'logstash-input-beats', '6.9.1')
|
|
@@ -218,6 +218,24 @@ describe LogStash::Inputs::Beats::MessageListener do
|
|
|
218
218
|
end
|
|
219
219
|
end
|
|
220
220
|
|
|
221
|
+
context "when connection is terminated" do
|
|
222
|
+
let(:message) { MockMessage.new("message from Mars", { "message" => "hello world", "@metadata" => {} } )}
|
|
223
|
+
|
|
224
|
+
it "handles without crashing" do
|
|
225
|
+
subject.onConnectionClose(ctx)
|
|
226
|
+
expect(subject.connections_list[ctx]).to be nil
|
|
227
|
+
|
|
228
|
+
expect( input.logger ).to receive(:warn) do |message |
|
|
229
|
+
expect( message ).to match /No codec available to process the message. This may due to connection termination and message was being processed./
|
|
230
|
+
end
|
|
231
|
+
|
|
232
|
+
subject.onNewMessage(ctx, message)
|
|
233
|
+
# doesn't push to queue, so should be nil
|
|
234
|
+
event = queue.pop
|
|
235
|
+
expect(event.get("message")).to be nil
|
|
236
|
+
end
|
|
237
|
+
end
|
|
238
|
+
|
|
221
239
|
it_behaves_like "when the message is from any libbeat", :disabled, "[@metadata][ip_address]"
|
|
222
240
|
it_behaves_like "when the message is from any libbeat", :v1, "[@metadata][input][beats][host][ip]"
|
|
223
241
|
it_behaves_like "when the message is from any libbeat", :v8, "[@metadata][input][beats][host][ip]"
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
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.9.1
|
|
5
5
|
platform: java
|
|
6
6
|
authors:
|
|
7
7
|
- Elastic
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2024-
|
|
11
|
+
date: 2024-11-18 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
|
-
prerelease: false
|
|
24
23
|
type: :runtime
|
|
24
|
+
prerelease: false
|
|
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
|
-
prerelease: false
|
|
41
40
|
type: :runtime
|
|
41
|
+
prerelease: false
|
|
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
|
-
prerelease: false
|
|
55
54
|
type: :runtime
|
|
55
|
+
prerelease: false
|
|
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
|
-
prerelease: false
|
|
69
68
|
type: :runtime
|
|
69
|
+
prerelease: false
|
|
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
|
-
prerelease: false
|
|
83
82
|
type: :runtime
|
|
83
|
+
prerelease: false
|
|
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
|
-
prerelease: false
|
|
100
99
|
type: :runtime
|
|
100
|
+
prerelease: false
|
|
101
101
|
version_requirements: !ruby/object:Gem::Requirement
|
|
102
102
|
requirements:
|
|
103
103
|
- - "~>"
|
|
@@ -113,8 +113,8 @@ dependencies:
|
|
|
113
113
|
- !ruby/object:Gem::Version
|
|
114
114
|
version: '1.3'
|
|
115
115
|
name: logstash-mixin-ecs_compatibility_support
|
|
116
|
-
prerelease: false
|
|
117
116
|
type: :runtime
|
|
117
|
+
prerelease: false
|
|
118
118
|
version_requirements: !ruby/object:Gem::Requirement
|
|
119
119
|
requirements:
|
|
120
120
|
- - "~>"
|
|
@@ -127,8 +127,8 @@ dependencies:
|
|
|
127
127
|
- !ruby/object:Gem::Version
|
|
128
128
|
version: '1.0'
|
|
129
129
|
name: logstash-mixin-event_support
|
|
130
|
-
prerelease: false
|
|
131
130
|
type: :runtime
|
|
131
|
+
prerelease: false
|
|
132
132
|
version_requirements: !ruby/object:Gem::Requirement
|
|
133
133
|
requirements:
|
|
134
134
|
- - "~>"
|
|
@@ -141,8 +141,8 @@ dependencies:
|
|
|
141
141
|
- !ruby/object:Gem::Version
|
|
142
142
|
version: '1.0'
|
|
143
143
|
name: logstash-mixin-plugin_factory_support
|
|
144
|
-
prerelease: false
|
|
145
144
|
type: :runtime
|
|
145
|
+
prerelease: false
|
|
146
146
|
version_requirements: !ruby/object:Gem::Requirement
|
|
147
147
|
requirements:
|
|
148
148
|
- - "~>"
|
|
@@ -155,8 +155,8 @@ dependencies:
|
|
|
155
155
|
- !ruby/object:Gem::Version
|
|
156
156
|
version: '1.0'
|
|
157
157
|
name: logstash-mixin-normalize_config_support
|
|
158
|
-
prerelease: false
|
|
159
158
|
type: :runtime
|
|
159
|
+
prerelease: false
|
|
160
160
|
version_requirements: !ruby/object:Gem::Requirement
|
|
161
161
|
requirements:
|
|
162
162
|
- - "~>"
|
|
@@ -169,8 +169,8 @@ dependencies:
|
|
|
169
169
|
- !ruby/object:Gem::Version
|
|
170
170
|
version: 0.0.6
|
|
171
171
|
name: flores
|
|
172
|
-
prerelease: false
|
|
173
172
|
type: :development
|
|
173
|
+
prerelease: false
|
|
174
174
|
version_requirements: !ruby/object:Gem::Requirement
|
|
175
175
|
requirements:
|
|
176
176
|
- - "~>"
|
|
@@ -183,8 +183,8 @@ dependencies:
|
|
|
183
183
|
- !ruby/object:Gem::Version
|
|
184
184
|
version: '0'
|
|
185
185
|
name: rspec
|
|
186
|
-
prerelease: false
|
|
187
186
|
type: :development
|
|
187
|
+
prerelease: false
|
|
188
188
|
version_requirements: !ruby/object:Gem::Requirement
|
|
189
189
|
requirements:
|
|
190
190
|
- - ">="
|
|
@@ -197,8 +197,8 @@ dependencies:
|
|
|
197
197
|
- !ruby/object:Gem::Version
|
|
198
198
|
version: '0'
|
|
199
199
|
name: stud
|
|
200
|
-
prerelease: false
|
|
201
200
|
type: :development
|
|
201
|
+
prerelease: false
|
|
202
202
|
version_requirements: !ruby/object:Gem::Requirement
|
|
203
203
|
requirements:
|
|
204
204
|
- - ">="
|
|
@@ -211,8 +211,8 @@ dependencies:
|
|
|
211
211
|
- !ruby/object:Gem::Version
|
|
212
212
|
version: '0'
|
|
213
213
|
name: pry
|
|
214
|
-
prerelease: false
|
|
215
214
|
type: :development
|
|
215
|
+
prerelease: false
|
|
216
216
|
version_requirements: !ruby/object:Gem::Requirement
|
|
217
217
|
requirements:
|
|
218
218
|
- - ">="
|
|
@@ -225,8 +225,8 @@ dependencies:
|
|
|
225
225
|
- !ruby/object:Gem::Version
|
|
226
226
|
version: '0'
|
|
227
227
|
name: rspec-wait
|
|
228
|
-
prerelease: false
|
|
229
228
|
type: :development
|
|
229
|
+
prerelease: false
|
|
230
230
|
version_requirements: !ruby/object:Gem::Requirement
|
|
231
231
|
requirements:
|
|
232
232
|
- - ">="
|
|
@@ -239,8 +239,8 @@ dependencies:
|
|
|
239
239
|
- !ruby/object:Gem::Version
|
|
240
240
|
version: '0'
|
|
241
241
|
name: logstash-devutils
|
|
242
|
-
prerelease: false
|
|
243
242
|
type: :development
|
|
243
|
+
prerelease: false
|
|
244
244
|
version_requirements: !ruby/object:Gem::Requirement
|
|
245
245
|
requirements:
|
|
246
246
|
- - ">="
|
|
@@ -253,8 +253,8 @@ dependencies:
|
|
|
253
253
|
- !ruby/object:Gem::Version
|
|
254
254
|
version: '0'
|
|
255
255
|
name: logstash-codec-json
|
|
256
|
-
prerelease: false
|
|
257
256
|
type: :development
|
|
257
|
+
prerelease: false
|
|
258
258
|
version_requirements: !ruby/object:Gem::Requirement
|
|
259
259
|
requirements:
|
|
260
260
|
- - ">="
|
|
@@ -267,8 +267,8 @@ dependencies:
|
|
|
267
267
|
- !ruby/object:Gem::Version
|
|
268
268
|
version: '0'
|
|
269
269
|
name: childprocess
|
|
270
|
-
prerelease: false
|
|
271
270
|
type: :development
|
|
271
|
+
prerelease: false
|
|
272
272
|
version_requirements: !ruby/object:Gem::Requirement
|
|
273
273
|
requirements:
|
|
274
274
|
- - ">="
|
|
@@ -319,14 +319,14 @@ files:
|
|
|
319
319
|
- spec/support/integration_shared_context.rb
|
|
320
320
|
- spec/support/logstash_test.rb
|
|
321
321
|
- spec/support/shared_examples.rb
|
|
322
|
-
- vendor/jar-dependencies/io/netty/netty-buffer/4.1.
|
|
323
|
-
- vendor/jar-dependencies/io/netty/netty-codec/4.1.
|
|
324
|
-
- vendor/jar-dependencies/io/netty/netty-common/4.1.
|
|
325
|
-
- vendor/jar-dependencies/io/netty/netty-handler/4.1.
|
|
326
|
-
- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.
|
|
327
|
-
- vendor/jar-dependencies/io/netty/netty-transport/4.1.
|
|
322
|
+
- vendor/jar-dependencies/io/netty/netty-buffer/4.1.115.Final/netty-buffer-4.1.115.Final.jar
|
|
323
|
+
- vendor/jar-dependencies/io/netty/netty-codec/4.1.115.Final/netty-codec-4.1.115.Final.jar
|
|
324
|
+
- vendor/jar-dependencies/io/netty/netty-common/4.1.115.Final/netty-common-4.1.115.Final.jar
|
|
325
|
+
- vendor/jar-dependencies/io/netty/netty-handler/4.1.115.Final/netty-handler-4.1.115.Final.jar
|
|
326
|
+
- vendor/jar-dependencies/io/netty/netty-transport-native-unix-common/4.1.115.Final/netty-transport-native-unix-common-4.1.115.Final.jar
|
|
327
|
+
- vendor/jar-dependencies/io/netty/netty-transport/4.1.115.Final/netty-transport-4.1.115.Final.jar
|
|
328
328
|
- vendor/jar-dependencies/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA.jar
|
|
329
|
-
- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.
|
|
329
|
+
- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.9.1/logstash-input-beats-6.9.1.jar
|
|
330
330
|
homepage: http://www.elastic.co/guide/en/logstash/current/index.html
|
|
331
331
|
licenses:
|
|
332
332
|
- Apache License (2.0)
|
|
@@ -349,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
349
349
|
- !ruby/object:Gem::Version
|
|
350
350
|
version: '0'
|
|
351
351
|
requirements: []
|
|
352
|
-
rubygems_version: 3.
|
|
352
|
+
rubygems_version: 3.3.26
|
|
353
353
|
signing_key:
|
|
354
354
|
specification_version: 4
|
|
355
355
|
summary: Receives events from the Elastic Beats framework
|