logstash-input-beats 6.2.4-java → 6.2.5-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 +4 -0
- data/VERSION +1 -1
- data/lib/logstash-input-beats_jars.rb +1 -2
- data/spec/inputs/beats_spec.rb +8 -1
- data/spec/integration/filebeat_spec.rb +28 -21
- data/spec/support/integration_shared_context.rb +1 -0
- data/vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.2.5/logstash-input-beats-6.2.5.jar +0 -0
- metadata +3 -4
- data/vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar +0 -0
- data/vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.2.4/logstash-input-beats-6.2.4.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: 1194016e06023182858402e9c736cd075fea8511aeb62cd5ad97a54049b71e87
|
4
|
+
data.tar.gz: 71b169152965ed6be439ed2649f5258911c6e1b7488152ede740f30993014497
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 2b38f167c9f56b47eb08425aac7327633ec2c5a49d349a49d391a87a5a4a54fb76366a0ad533f8aa574d621bdded4bcffabffeba45209b590b505ee83941183e
|
7
|
+
data.tar.gz: ecc52f6de5714201deb29a1bb8793c64a7d07c2d0adb47d0542ae0e2b29b74ee2dfcb341185cec8937af5954f85865e9f55a7ceb9889d6a0a83b536b36541a14
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,7 @@
|
|
1
|
+
## 6.2.5
|
2
|
+
- Build: do not package log4j-api dependency [#441](https://github.com/logstash-plugins/logstash-input-beats/pull/441).
|
3
|
+
Logstash provides the log4j framework and the dependency is not needed except testing and compiling.
|
4
|
+
|
1
5
|
## 6.2.4
|
2
6
|
- Updated log4j dependency to 2.17.0
|
3
7
|
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
6.2.
|
1
|
+
6.2.5
|
@@ -7,5 +7,4 @@ require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.9.10')
|
|
7
7
|
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
|
-
require_jar('org.
|
11
|
-
require_jar('org.logstash.beats', 'logstash-input-beats', '6.2.4')
|
10
|
+
require_jar('org.logstash.beats', 'logstash-input-beats', '6.2.5')
|
data/spec/inputs/beats_spec.rb
CHANGED
@@ -166,7 +166,14 @@ describe LogStash::Inputs::Beats do
|
|
166
166
|
end
|
167
167
|
|
168
168
|
context "tls meta-data" do
|
169
|
-
let(:config)
|
169
|
+
let(:config) do
|
170
|
+
super().merge(
|
171
|
+
"host" => host,
|
172
|
+
"ssl_peer_metadata" => true,
|
173
|
+
"ssl_certificate_authorities" => [ certificate.ssl_cert ],
|
174
|
+
"ecs_compatibility" => 'disabled'
|
175
|
+
)
|
176
|
+
end
|
170
177
|
let(:host) { "192.168.1.20" }
|
171
178
|
let(:port) { 9002 }
|
172
179
|
|
@@ -177,27 +177,34 @@ describe "Filebeat", :integration => true do
|
|
177
177
|
# Refactor this to use Flores's PKI instead of openssl command line
|
178
178
|
# see: https://github.com/jordansissel/ruby-flores/issues/7
|
179
179
|
context "with a passphrase" do
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
180
|
+
|
181
|
+
before(:all) do
|
182
|
+
@passphrase = "foobar".freeze
|
183
|
+
|
184
|
+
FileUtils.mkdir_p temporary_directory = Stud::Temporary.pathname
|
185
|
+
|
186
|
+
cert_key = ::File.join(temporary_directory, "certificate.key")
|
187
|
+
@cert_pub = ::File.join(temporary_directory, "certificate.crt")
|
188
|
+
@cert_key_pkcs8 = ::File.join(temporary_directory, "certificate.key.pkcs8")
|
189
|
+
|
190
|
+
cmd = "openssl req -x509 -batch -newkey rsa:2048 -keyout #{cert_key} -out #{@cert_pub} -passout pass:#{@passphrase} -subj \"/C=EU/O=Logstash/CN=localhost\""
|
191
|
+
unless system(cmd)
|
192
|
+
fail "failed to run openssl command: #{$?} \n#{cmd}"
|
193
|
+
end
|
194
|
+
|
195
|
+
# NOTE: CentOS 7 base image (LS < 7.17) uses OpenSSL 1.0 while later is using Ubuntu 20.04 with OpenSSL 1.1.1
|
196
|
+
# the default algorithm for `openssl pkcs8 -topk8` changed to -v2 which Java does not support (see GH-443)
|
197
|
+
cmd = "openssl pkcs8 -topk8 -in #{cert_key} -out #{@cert_key_pkcs8} -v1 PBE-SHA1-RC2-128 -passin pass:#{@passphrase} -passout pass:#{@passphrase}"
|
198
|
+
unless system(cmd)
|
199
|
+
fail "failed to run openssl command: #{$?} \n#{cmd}"
|
200
|
+
end
|
201
|
+
end
|
202
|
+
|
203
|
+
let(:certificate_authorities) { [ @cert_pub ] }
|
204
|
+
|
205
|
+
let(:input_config) do
|
206
|
+
super().merge("ssl_key_passphrase" => @passphrase, "ssl_key" => @cert_key_pkcs8, "ssl_certificate" => @cert_pub)
|
207
|
+
end
|
201
208
|
|
202
209
|
include_examples "send events"
|
203
210
|
end
|
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.2.
|
4
|
+
version: 6.2.5
|
5
5
|
platform: java
|
6
6
|
authors:
|
7
7
|
- Elastic
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2022-01-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -297,9 +297,8 @@ files:
|
|
297
297
|
- vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.9.10.8/jackson-databind-2.9.10.8.jar
|
298
298
|
- vendor/jar-dependencies/com/fasterxml/jackson/module/jackson-module-afterburner/2.9.10/jackson-module-afterburner-2.9.10.jar
|
299
299
|
- vendor/jar-dependencies/io/netty/netty-all/4.1.65.Final/netty-all-4.1.65.Final.jar
|
300
|
-
- vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.17.0/log4j-api-2.17.0.jar
|
301
300
|
- vendor/jar-dependencies/org/javassist/javassist/3.24.0-GA/javassist-3.24.0-GA.jar
|
302
|
-
- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.2.
|
301
|
+
- vendor/jar-dependencies/org/logstash/beats/logstash-input-beats/6.2.5/logstash-input-beats-6.2.5.jar
|
303
302
|
homepage: http://www.elastic.co/guide/en/logstash/current/index.html
|
304
303
|
licenses:
|
305
304
|
- Apache License (2.0)
|
Binary file
|