logstash-input-kinesis 2.2.0-java → 2.2.2-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 +6 -0
- data/lib/logstash/inputs/kinesis.rb +6 -6
- data/spec/inputs/kinesis_spec.rb +1 -1
- metadata +3 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5c6fe5cc0c4abd1197d0aa69926421d0872880190220ee7d77c7e139eda9a991
|
|
4
|
+
data.tar.gz: e22d77b1e46c5f9aac63b5d35328dd08ac714bae8362a56ee8e397006ac23931
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 21ed6d475b1a08f9da10dccba8eee0d00792501712d483d69ce3e6b6ba2f0233f4e317fb5a23f5f1bb59d152061800ff9c69dfbc7670895aa28e6791a4eab4fb
|
|
7
|
+
data.tar.gz: 79398d8bd79a24b90f91e85d69e7b4213733a18bd38fd05250e6bd85af5f7cc61058d51df39ec1d5a8b754bf3343cf8a54175771ea0bf4dd8a636659e22b060c
|
data/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## 2.2.2
|
|
2
|
+
- Change `http_proxy` config type to `password` for better protection from leaks in debug logs [#101](https://github.com/logstash-plugins/logstash-input-kinesis/pull/101)
|
|
3
|
+
|
|
4
|
+
## 2.2.1
|
|
5
|
+
- Fix: Remove usage of `java_kind_of?` to support jruby-9.3.4.0 [#91](https://github.com/logstash-plugins/logstash-input-kinesis/pull/91)
|
|
6
|
+
|
|
1
7
|
## 2.2.0
|
|
2
8
|
- Proxy support for Kinesis, DynamoDB, and CloudWatch clients [#84](https://github.com/logstash-plugins/logstash-input-kinesis/issues/84)
|
|
3
9
|
- Upgrade AWS SDK for WebIdentityTokenCredentialsProvider Support [#82](https://github.com/logstash-plugins/logstash-input-kinesis/issues/82)
|
|
@@ -70,7 +70,7 @@ class LogStash::Inputs::Kinesis < LogStash::Inputs::Base
|
|
|
70
70
|
config :additional_settings, :validate => :hash, :default => {}
|
|
71
71
|
|
|
72
72
|
# Proxy for Kinesis, DynamoDB, and CloudWatch (if enabled)
|
|
73
|
-
config :http_proxy, :validate => :
|
|
73
|
+
config :http_proxy, :validate => :password, :default => nil
|
|
74
74
|
|
|
75
75
|
# Hosts that should be excluded from proxying
|
|
76
76
|
config :non_proxy_hosts, :validate => :string, :default => nil
|
|
@@ -82,14 +82,14 @@ class LogStash::Inputs::Kinesis < LogStash::Inputs::Base
|
|
|
82
82
|
def register
|
|
83
83
|
# the INFO log level is extremely noisy in KCL
|
|
84
84
|
lg = org.apache.commons.logging::LogFactory.getLog("com.amazonaws.services.kinesis")
|
|
85
|
-
if lg.
|
|
85
|
+
if lg.kind_of?(org.apache.commons.logging.impl::Jdk14Logger)
|
|
86
86
|
kinesis_logger = lg.logger
|
|
87
|
-
if kinesis_logger.
|
|
87
|
+
if kinesis_logger.kind_of?(java.util.logging::Logger)
|
|
88
88
|
kinesis_logger.setLevel(java.util.logging::Level::WARNING)
|
|
89
89
|
else
|
|
90
90
|
kinesis_logger.setLevel(org.apache.log4j::Level::WARN)
|
|
91
91
|
end
|
|
92
|
-
elsif lg.
|
|
92
|
+
elsif lg.kind_of?(org.apache.logging.log4jJcl::Log4jLog)
|
|
93
93
|
logContext = org.apache.logging.log4j::LogManager.getContext(false)
|
|
94
94
|
config = logContext.getConfiguration()
|
|
95
95
|
config.getLoggerConfig("com.amazonaws.services.kinesis").setLevel(org.apache.logging.log4j::Level::WARN)
|
|
@@ -139,8 +139,8 @@ class LogStash::Inputs::Kinesis < LogStash::Inputs::Base
|
|
|
139
139
|
@kcl_config.send(fn, value)
|
|
140
140
|
end
|
|
141
141
|
|
|
142
|
-
|
|
143
|
-
proxy_uri = URI(@http_proxy)
|
|
142
|
+
if @http_proxy && !@http_proxy.value.to_s.strip.empty?
|
|
143
|
+
proxy_uri = URI(@http_proxy.value)
|
|
144
144
|
@logger.info("Using proxy #{proxy_uri.scheme}://#{proxy_uri.user}:*****@#{proxy_uri.host}:#{proxy_uri.port}")
|
|
145
145
|
clnt_cfg = @kcl_config.get_kinesis_client_configuration
|
|
146
146
|
set_client_proxy_settings(clnt_cfg, proxy_uri)
|
data/spec/inputs/kinesis_spec.rb
CHANGED
|
@@ -74,7 +74,7 @@ RSpec.describe "inputs/kinesis" do
|
|
|
74
74
|
"checkpoint_interval_seconds" => 120,
|
|
75
75
|
"region" => "ap-southeast-1",
|
|
76
76
|
"profile" => nil,
|
|
77
|
-
"http_proxy" => "http://user1:pwd1@proxy.example.com:3128/",
|
|
77
|
+
"http_proxy" => ::LogStash::Util::Password.new("http://user1:pwd1@proxy.example.com:3128/"),
|
|
78
78
|
"non_proxy_hosts" => "127.0.0.5",
|
|
79
79
|
}}
|
|
80
80
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: logstash-input-kinesis
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.2.
|
|
4
|
+
version: 2.2.2
|
|
5
5
|
platform: java
|
|
6
6
|
authors:
|
|
7
7
|
- Brian Palmer
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2023-05-30 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -145,8 +145,7 @@ requirements:
|
|
|
145
145
|
- jar 'com.amazonaws:amazon-kinesis-client', '1.13.3'
|
|
146
146
|
- jar 'com.amazonaws:aws-java-sdk-core', '1.11.1034'
|
|
147
147
|
- jar 'com.amazonaws:aws-java-sdk-sts', '1.11.1034'
|
|
148
|
-
|
|
149
|
-
rubygems_version: 2.6.13
|
|
148
|
+
rubygems_version: 3.2.33
|
|
150
149
|
signing_key:
|
|
151
150
|
specification_version: 4
|
|
152
151
|
summary: Receives events through an AWS Kinesis stream
|