logstash-integration-aws 7.1.1-java → 7.1.3-java

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7ae1556993dc8a6fbc1fb4211549cc04616518cc118a8b3b54df13a622a9e1a4
4
- data.tar.gz: 0f37ba79cffcddcdce9e34736cfc8642376ab855f662284350ba5031267294a4
3
+ metadata.gz: f4cbe08b7343729fa42923adec2223fef762443a605affa60a7cee5dd4f6bd6c
4
+ data.tar.gz: 01b5095d1534b0527573fae1c29c7eba3be667754d7162f5122a1cc21d3e8f70
5
5
  SHA512:
6
- metadata.gz: b9ed124fc48228a13d59b7ed0388ae8a596e1348158c2617401aba52a4b606bb79b74a196a618813fdf8d0aea853c7be71290a855c50c458c64965f3e83b744e
7
- data.tar.gz: 5666f0fb46c999012af521713dc992872c77341eb3821fc5396588ec51f9f39d678339b9642a9c3ce023541b4a0c99e7f8139ca249a89b62522d0a86e8e34c9d
6
+ metadata.gz: 30b3e667cdbaf3ecd4fdf6768c8ea3740ac9935b2761b42370e459162c7cc38075d41c6501bc4499d25b377a70911f9733ed51a636e019075db3e8bd512e35aa
7
+ data.tar.gz: 7eefe2ea51c7b2b84a20148b7fcf55316818fd0b84ec2cd94e54a055abd542ff58c1143a78e1c7685ac3ca07993e2d2f8f44d4902495387749b12985175d8e7d
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ ## 7.1.3
2
+ - Added an option `use_aws_bundled_ca` to use bundled ca certs that ships with AWS SDK to verify SSL peer certificates [#32](https://github.com/logstash-plugins/logstash-integration-aws/pull/32)
3
+
4
+ ## 7.1.2
5
+ - Fix: adaptations to run with JRuby 9.4 [#29](https://github.com/logstash-plugins/logstash-integration-aws/pull/29)
6
+
1
7
  ## 7.1.1
2
8
  - Fix: Plugin cannot load Java dependencies [#24](https://github.com/logstash-plugins/logstash-integration-aws/pull/24)
3
9
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 7.1.1
1
+ 7.1.3
@@ -125,6 +125,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
125
125
  | <<plugins-{type}s-{plugin}-secret_access_key>> |<<string,string>>|No
126
126
  | <<plugins-{type}s-{plugin}-session_token>> |<<string,string>>|No
127
127
  | <<plugins-{type}s-{plugin}-statistics>> |<<array,array>>|No
128
+ | <<plugins-{type}s-{plugin}-use_aws_bundled_ca>> |<<boolean,boolean>>|No
128
129
  | <<plugins-{type}s-{plugin}-use_ssl>> |<<boolean,boolean>>|No
129
130
  |=======================================================================
130
131
 
@@ -301,6 +302,16 @@ The AWS Session token for temporary credential
301
302
 
302
303
  Specify the statistics to fetch for each namespace
303
304
 
305
+ [id="plugins-{type}s-{plugin}-use_aws_bundled_ca"]
306
+ ===== `use_aws_bundled_ca`
307
+
308
+ * Value type is <<boolean,boolean>>
309
+ * Default value is `false`
310
+
311
+ Use bundled CA certificates that ship with AWS SDK to verify SSL peer certificates.
312
+ For cases where the default certificates are unavailable, e.g. Windows,
313
+ you can set this to `true`.
314
+
304
315
  [id="plugins-{type}s-{plugin}-use_ssl"]
305
316
  ===== `use_ssl`
306
317
 
@@ -313,7 +324,6 @@ Should we require (true) or disable (false) using SSL for communicating with the
313
324
  The AWS SDK for Ruby defaults to SSL so we preserve that
314
325
 
315
326
 
316
-
317
327
  [id="plugins-{type}s-{plugin}-common-options"]
318
328
  include::{include_path}/{type}.asciidoc[]
319
329
 
@@ -78,6 +78,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
78
78
  | <<plugins-{type}s-{plugin}-session_token>> |<<string,string>>|No
79
79
  | <<plugins-{type}s-{plugin}-sincedb_path>> |<<string,string>>|No
80
80
  | <<plugins-{type}s-{plugin}-temporary_directory>> |<<string,string>>|No
81
+ | <<plugins-{type}s-{plugin}-use_aws_bundled_ca>> |<<boolean,boolean>>|No
81
82
  | <<plugins-{type}s-{plugin}-watch_for_new_files>> |<<boolean,boolean>>|No
82
83
  |=======================================================================
83
84
 
@@ -331,6 +332,16 @@ If specified, this setting must be a filename path and not just a directory.
331
332
 
332
333
  Set the directory where logstash will store the tmp files before processing them.
333
334
 
335
+ [id="plugins-{type}s-{plugin}-use_aws_bundled_ca"]
336
+ ===== `use_aws_bundled_ca`
337
+
338
+ * Value type is <<boolean,boolean>>
339
+ * Default value is `false`
340
+
341
+ Use bundled CA certificates that ship with AWS SDK to verify SSL peer certificates.
342
+ For cases where the default certificates are unavailable, e.g. Windows,
343
+ you can set this to `true`.
344
+
334
345
  [id="plugins-{type}s-{plugin}-watch_for_new_files"]
335
346
  ===== `watch_for_new_files`
336
347
 
@@ -102,6 +102,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
102
102
  | <<plugins-{type}s-{plugin}-sent_timestamp_field>> |<<string,string>>|No
103
103
  | <<plugins-{type}s-{plugin}-session_token>> |<<string,string>>|No
104
104
  | <<plugins-{type}s-{plugin}-threads>> |<<number,number>>|No
105
+ | <<plugins-{type}s-{plugin}-use_aws_bundled_ca>> |<<boolean,boolean>>|No
105
106
  |=======================================================================
106
107
 
107
108
  Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
@@ -278,7 +279,15 @@ The AWS Session token for temporary credential
278
279
  * Default value is `1`
279
280
 
280
281
 
282
+ [id="plugins-{type}s-{plugin}-use_aws_bundled_ca"]
283
+ ===== `use_aws_bundled_ca`
281
284
 
285
+ * Value type is <<boolean,boolean>>
286
+ * Default value is `false`
287
+
288
+ Use bundled CA certificates that ship with AWS SDK to verify SSL peer certificates.
289
+ For cases where the default certificates are unavailable, e.g. Windows,
290
+ you can set this to `true`.
282
291
 
283
292
 
284
293
  [id="plugins-{type}s-{plugin}-common-options"]
@@ -106,6 +106,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
106
106
  | <<plugins-{type}s-{plugin}-session_token>> |<<string,string>>|No
107
107
  | <<plugins-{type}s-{plugin}-timeframe>> |<<string,string>>|No
108
108
  | <<plugins-{type}s-{plugin}-unit>> |<<string,string>>, one of `["Seconds", "Microseconds", "Milliseconds", "Bytes", "Kilobytes", "Megabytes", "Gigabytes", "Terabytes", "Bits", "Kilobits", "Megabits", "Gigabits", "Terabits", "Percent", "Count", "Bytes/Second", "Kilobytes/Second", "Megabytes/Second", "Gigabytes/Second", "Terabytes/Second", "Bits/Second", "Kilobits/Second", "Megabits/Second", "Gigabits/Second", "Terabits/Second", "Count/Second", "None"]`|No
109
+ | <<plugins-{type}s-{plugin}-use_aws_bundled_ca>> |<<boolean,boolean>>|No
109
110
  | <<plugins-{type}s-{plugin}-value>> |<<string,string>>|No
110
111
  |=======================================================================
111
112
 
@@ -302,6 +303,16 @@ See the Rufus Scheduler docs for an https://github.com/jmettraux/rufus-scheduler
302
303
  The default unit to use for events which do not have a `CW_unit` field
303
304
  If you set this option you should probably set the "value" option along with it
304
305
 
306
+ [id="plugins-{type}s-{plugin}-use_aws_bundled_ca"]
307
+ ===== `use_aws_bundled_ca`
308
+
309
+ * Value type is <<boolean,boolean>>
310
+ * Default value is `false`
311
+
312
+ Use bundled CA certificates that ship with AWS SDK to verify SSL peer certificates.
313
+ For cases where the default certificates are unavailable, e.g. Windows,
314
+ you can set this to `true`.
315
+
305
316
  [id="plugins-{type}s-{plugin}-value"]
306
317
  ===== `value`
307
318
 
@@ -113,6 +113,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
113
113
  | <<plugins-{type}s-{plugin}-upload_multipart_threshold>> |<<number,number>>|No
114
114
  | <<plugins-{type}s-{plugin}-upload_queue_size>> |<<number,number>>|No
115
115
  | <<plugins-{type}s-{plugin}-upload_workers_count>> |<<number,number>>|No
116
+ | <<plugins-{type}s-{plugin}-use_aws_bundled_ca>> |<<boolean,boolean>>|No
116
117
  | <<plugins-{type}s-{plugin}-validate_credentials_on_root_bucket>> |<<boolean,boolean>>|No
117
118
  |=======================================================================
118
119
 
@@ -425,6 +426,16 @@ Number of items we can keep in the local queue before uploading them
425
426
 
426
427
  Specify how many workers to use to upload the files to S3
427
428
 
429
+ [id="plugins-{type}s-{plugin}-use_aws_bundled_ca"]
430
+ ===== `use_aws_bundled_ca`
431
+
432
+ * Value type is <<boolean,boolean>>
433
+ * Default value is `false`
434
+
435
+ Use bundled CA certificates that ship with AWS SDK to verify SSL peer certificates.
436
+ For cases where the default certificates are unavailable, e.g. Windows,
437
+ you can set this to `true`.
438
+
428
439
  [id="plugins-{type}s-{plugin}-validate_credentials_on_root_bucket"]
429
440
  ===== `validate_credentials_on_root_bucket`
430
441
 
@@ -65,6 +65,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
65
65
  | <<plugins-{type}s-{plugin}-region>> |<<string,string>>, one of `["us-east-1", "us-east-2", "us-west-1", "us-west-2", "eu-central-1", "eu-west-1", "eu-west-2", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1", "ap-northeast-2", "sa-east-1", "us-gov-west-1", "cn-north-1", "ap-south-1", "ca-central-1"]`|No
66
66
  | <<plugins-{type}s-{plugin}-secret_access_key>> |<<string,string>>|No
67
67
  | <<plugins-{type}s-{plugin}-session_token>> |<<string,string>>|No
68
+ | <<plugins-{type}s-{plugin}-use_aws_bundled_ca>> |<<boolean,boolean>>|No
68
69
  |=======================================================================
69
70
 
70
71
  Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
@@ -158,6 +159,15 @@ The AWS Secret Access Key
158
159
 
159
160
  The AWS Session token for temporary credential
160
161
 
162
+ [id="plugins-{type}s-{plugin}-use_aws_bundled_ca"]
163
+ ===== `use_aws_bundled_ca`
164
+
165
+ * Value type is <<boolean,boolean>>
166
+ * Default value is `false`
167
+
168
+ Use bundled CA certificates that ship with AWS SDK to verify SSL peer certificates.
169
+ For cases where the default certificates are unavailable, e.g. Windows,
170
+ you can set this to `true`.
161
171
 
162
172
 
163
173
  [id="plugins-{type}s-{plugin}-common-options"]
@@ -97,6 +97,7 @@ This plugin supports the following configuration options plus the <<plugins-{typ
97
97
  | <<plugins-{type}s-{plugin}-role_session_name>> |<<string,string>>|No
98
98
  | <<plugins-{type}s-{plugin}-secret_access_key>> |<<string,string>>|No
99
99
  | <<plugins-{type}s-{plugin}-session_token>> |<<string,string>>|No
100
+ | <<plugins-{type}s-{plugin}-use_aws_bundled_ca>> |<<boolean,boolean>>|No
100
101
  |=======================================================================
101
102
 
102
103
  Also see <<plugins-{type}s-{plugin}-common-options>> for a list of options supported by all
@@ -234,7 +235,15 @@ The AWS Secret Access Key
234
235
 
235
236
  The AWS Session token for temporary credential
236
237
 
238
+ [id="plugins-{type}s-{plugin}-use_aws_bundled_ca"]
239
+ ===== `use_aws_bundled_ca`
237
240
 
241
+ * Value type is <<boolean,boolean>>
242
+ * Default value is `false`
243
+
244
+ Use bundled CA certificates that ship with AWS SDK to verify SSL peer certificates.
245
+ For cases where the default certificates are unavailable, e.g. Windows,
246
+ you can set this to `true`.
238
247
 
239
248
  [id="plugins-{type}s-{plugin}-common-options"]
240
249
  include::{include_path}/{type}.asciidoc[]
@@ -130,6 +130,8 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
130
130
  raise 'Interval must be divisible by period' unless @interval % @period == 0
131
131
  raise "Filters must be defined for when using #{@namespace} namespace" if @filters.nil? && filters_required?(@namespace)
132
132
 
133
+ setup_aws_client_config
134
+
133
135
  @last_check = Time.now
134
136
  end # def register
135
137
 
@@ -100,6 +100,7 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
100
100
 
101
101
  @logger.info("Registering", :bucket => @bucket, :region => @region)
102
102
 
103
+ setup_aws_client_config
103
104
  s3 = get_s3object
104
105
 
105
106
  @s3bucket = s3.bucket(@bucket)
@@ -99,6 +99,7 @@ class LogStash::Inputs::SQS < LogStash::Inputs::Threadable
99
99
  require "aws-sdk-sqs"
100
100
  @logger.info("Registering SQS input", :queue => @queue, :queue_owner_aws_account_id => @queue_owner_aws_account_id)
101
101
 
102
+ setup_aws_client_config
102
103
  setup_queue
103
104
  end
104
105
 
@@ -163,6 +163,7 @@ class LogStash::Outputs::CloudWatch < LogStash::Outputs::Base
163
163
  require "thread"
164
164
  require "aws-sdk-cloudwatch"
165
165
 
166
+ setup_aws_client_config
166
167
  @cw = Aws::CloudWatch::Client.new(aws_options_hash)
167
168
 
168
169
  @event_queue = SizedQueue.new(@queue_size)
@@ -209,6 +209,8 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
209
209
  raise LogStash::ConfigurationError, "Logstash must have the permissions to write to the temporary directory: #{@temporary_directory}"
210
210
  end
211
211
 
212
+ setup_aws_client_config
213
+
212
214
  if @validate_credentials_on_root_bucket && !WriteBucketPermissionValidator.new(@logger).valid?(bucket_resource, upload_options)
213
215
  raise LogStash::ConfigurationError, "Logstash must have the privileges to write to root bucket `#{@bucket}`, check your credentials or your permissions."
214
216
  end
@@ -58,6 +58,7 @@ class LogStash::Outputs::Sns < LogStash::Outputs::Base
58
58
  def register
59
59
  require "aws-sdk-sns"
60
60
 
61
+ setup_aws_client_config
61
62
  @sns = Aws::SNS::Client.new(aws_options_hash)
62
63
 
63
64
  publish_boot_message_arn()
@@ -86,6 +86,7 @@ class LogStash::Outputs::SQS < LogStash::Outputs::Base
86
86
 
87
87
  public
88
88
  def register
89
+ setup_aws_client_config
89
90
  @sqs = Aws::SQS::Client.new(aws_options_hash)
90
91
 
91
92
  if @batch_events > 10
@@ -50,5 +50,12 @@ module LogStash::PluginMixins::AwsConfig::Generic
50
50
  # ----------------------------------
51
51
  #
52
52
  config :aws_credentials_file, :validate => :string
53
+
54
+ # By default, this plugin uses cert available to OpenSSL provided by OS
55
+ # when verifying SSL peer certificates.
56
+ # For cases where the default cert is unavailable, e.g. Windows,
57
+ # you can use the bundled ca certificate provided by AWS SDK
58
+ # by setting `use_aws_bundled_ca` to true
59
+ config :use_aws_bundled_ca, :validate => :boolean, :default => false
53
60
  end
54
61
  end
@@ -38,6 +38,10 @@ module LogStash::PluginMixins::AwsConfig::V2
38
38
  return opts
39
39
  end
40
40
 
41
+ def setup_aws_client_config
42
+ Aws.use_bundled_cert! if @use_aws_bundled_ca
43
+ end
44
+
41
45
  private
42
46
 
43
47
  def aws_credentials
@@ -1,4 +1,4 @@
1
1
  # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
2
2
 
3
3
  require 'jar_dependencies'
4
- require_jar('org.logstash.plugins.integration.aws', 'logstash-integration-aws', '7.1.1')
4
+ require_jar('org.logstash.plugins.integration.aws', 'logstash-integration-aws', '7.1.3')
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
37
37
  s.add_runtime_dependency "logstash-codec-plain"
38
38
  s.add_runtime_dependency "rufus-scheduler", ">= 3.0.9"
39
39
  s.add_runtime_dependency "stud", "~> 0.0.22"
40
+ s.add_runtime_dependency "rexml"
40
41
  s.add_runtime_dependency "aws-sdk-core", "~> 3"
41
42
  s.add_runtime_dependency "aws-sdk-s3"
42
43
  s.add_runtime_dependency "aws-sdk-sqs"
@@ -55,7 +55,7 @@ describe LogStash::Outputs::SQS do
55
55
  context 'with a nonexistent queue' do
56
56
  before do
57
57
  expect(Aws::SQS::Client).to receive(:new).and_return(sqs)
58
- expect(sqs).to receive(:get_queue_url).with(:queue_name => queue_name) do
58
+ expect(sqs).to receive(:get_queue_url).with({:queue_name => queue_name}) do
59
59
  raise Aws::SQS::Errors::NonExistentQueue.new(nil, 'The specified queue does not exist for this wsdl version.')
60
60
  end
61
61
  end
@@ -68,7 +68,7 @@ describe LogStash::Outputs::SQS do
68
68
  context 'with a valid queue' do
69
69
  before do
70
70
  expect(Aws::SQS::Client).to receive(:new).and_return(sqs)
71
- expect(sqs).to receive(:get_queue_url).with(:queue_name => queue_name).and_return(:queue_url => queue_url)
71
+ expect(sqs).to receive(:get_queue_url).with({:queue_name => queue_name}).and_return({:queue_url => queue_url})
72
72
  end
73
73
 
74
74
  it 'does not raise an error' do
@@ -80,7 +80,7 @@ describe LogStash::Outputs::SQS do
80
80
  describe '#multi_receive_encoded' do
81
81
  before do
82
82
  expect(Aws::SQS::Client).to receive(:new).and_return(sqs)
83
- expect(sqs).to receive(:get_queue_url).with(:queue_name => queue_name).and_return(:queue_url => queue_url)
83
+ expect(sqs).to receive(:get_queue_url).with({:queue_name => queue_name}).and_return({:queue_url => queue_url})
84
84
  subject.register
85
85
  end
86
86
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-integration-aws
3
3
  version: !ruby/object:Gem::Version
4
- version: 7.1.1
4
+ version: 7.1.3
5
5
  platform: java
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-04-11 00:00:00.000000000 Z
11
+ date: 2023-06-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
@@ -100,6 +100,20 @@ dependencies:
100
100
  - - "~>"
101
101
  - !ruby/object:Gem::Version
102
102
  version: 0.0.22
103
+ - !ruby/object:Gem::Dependency
104
+ requirement: !ruby/object:Gem::Requirement
105
+ requirements:
106
+ - - ">="
107
+ - !ruby/object:Gem::Version
108
+ version: '0'
109
+ name: rexml
110
+ prerelease: false
111
+ type: :runtime
112
+ version_requirements: !ruby/object:Gem::Requirement
113
+ requirements:
114
+ - - ">="
115
+ - !ruby/object:Gem::Version
116
+ version: '0'
103
117
  - !ruby/object:Gem::Dependency
104
118
  requirement: !ruby/object:Gem::Requirement
105
119
  requirements:
@@ -394,7 +408,7 @@ files:
394
408
  - spec/spec_helper.rb
395
409
  - spec/support/helpers.rb
396
410
  - spec/unit/outputs/sqs_spec.rb
397
- - vendor/jar-dependencies/org/logstash/plugins/integration/aws/logstash-integration-aws/7.1.1/logstash-integration-aws-7.1.1.jar
411
+ - vendor/jar-dependencies/org/logstash/plugins/integration/aws/logstash-integration-aws/7.1.3/logstash-integration-aws-7.1.3.jar
398
412
  homepage: http://www.elastic.co/guide/en/logstash/current/index.html
399
413
  licenses:
400
414
  - Apache-2.0
@@ -418,7 +432,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
418
432
  - !ruby/object:Gem::Version
419
433
  version: '0'
420
434
  requirements: []
421
- rubygems_version: 3.1.6
435
+ rubygems_version: 3.2.33
422
436
  signing_key:
423
437
  specification_version: 4
424
438
  summary: Collection of Logstash plugins that integrate with AWS