logstash-integration-aws 7.0.1 → 7.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +3 -0
- data/README.md +1 -1
- data/VERSION +1 -0
- data/lib/logstash/outputs/s3/size_rotation_policy.rb +1 -1
- data/lib/logstash/outputs/s3/temporary_file.rb +49 -6
- data/lib/logstash/outputs/s3/temporary_file_factory.rb +1 -4
- data/lib/logstash/outputs/s3/time_rotation_policy.rb +1 -1
- data/lib/logstash/outputs/s3/uploader.rb +2 -0
- data/lib/logstash/outputs/s3.rb +61 -23
- data/lib/logstash-integration-aws_jars.rb +4 -0
- data/lib/tasks/build.rake +15 -0
- data/logstash-integration-aws.gemspec +4 -2
- data/spec/integration/restore_from_crash_spec.rb +70 -4
- data/spec/outputs/s3/size_rotation_policy_spec.rb +2 -2
- data/spec/outputs/s3/time_rotation_policy_spec.rb +2 -2
- data/spec/support/helpers.rb +3 -1
- metadata +6 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cee9f1de988917319a825f2297f67e3c436cf887eaea605b0ae0a863e7b9a2b8
|
4
|
+
data.tar.gz: 357432106dd5710a0c8a4addda66922c5d7f66c4c6fbf82bba638ad71f595ab2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e3b500c0b652a50498c85f204bee216965b04b8468cb2a1b798d82e08bd1d1b6d73876521770c6bacc956786bb749342316d06bd7254af140b11f3660922a2ec
|
7
|
+
data.tar.gz: ff157154dc10816d86a035cac58b85a8cf13841e9948026113386a66c941bf6b9256f882d1811cd18824fda7348ae9c9dd66e9ab390ef6438f4021845521e849
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,6 @@
|
|
1
|
+
## 7.1.0
|
2
|
+
- Plugin restores and uploads corrupted GZIP files (caused by abnormal termination) to AWS S3 [#20](https://github.com/logstash-plugins/logstash-integration-aws/pull/20)
|
3
|
+
|
1
4
|
## 7.0.1
|
2
5
|
- resolves two closely-related race conditions in the S3 Output plugin's handling of stale temporary files that could cause plugin crashes or data-loss [#19](https://github.com/logstash-plugins/logstash-integration-aws/pull/19)
|
3
6
|
- prevents a `No such file or directory` crash that could occur when a temporary file is accessed after it has been detected as stale (empty+old) and deleted.
|
data/README.md
CHANGED
@@ -19,7 +19,7 @@ Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/log
|
|
19
19
|
|
20
20
|
## Developing
|
21
21
|
|
22
|
-
### 1. Plugin
|
22
|
+
### 1. Plugin Development and Testing
|
23
23
|
|
24
24
|
#### Code
|
25
25
|
- To get started, you'll need JRuby with the Bundler gem installed.
|
data/VERSION
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
7.1.0
|
@@ -2,15 +2,23 @@
|
|
2
2
|
require "thread"
|
3
3
|
require "forwardable"
|
4
4
|
require "fileutils"
|
5
|
+
require "logstash-integration-aws_jars"
|
5
6
|
|
6
7
|
module LogStash
|
7
8
|
module Outputs
|
8
9
|
class S3
|
9
|
-
|
10
|
-
|
10
|
+
|
11
|
+
java_import 'org.logstash.plugins.integration.outputs.s3.GzipUtil'
|
12
|
+
|
13
|
+
# Wrap the actual file descriptor into an utility class
|
14
|
+
# Make it more OOP and easier to reason with the paths.
|
11
15
|
class TemporaryFile
|
12
16
|
extend Forwardable
|
13
17
|
|
18
|
+
GZIP_EXTENSION = "txt.gz"
|
19
|
+
TXT_EXTENSION = "txt"
|
20
|
+
RECOVERED_FILE_NAME_TAG = "-recovered"
|
21
|
+
|
14
22
|
def_delegators :@fd, :path, :write, :close, :fsync
|
15
23
|
|
16
24
|
attr_reader :fd
|
@@ -33,8 +41,10 @@ module LogStash
|
|
33
41
|
def size
|
34
42
|
# Use the fd size to get the accurate result,
|
35
43
|
# so we dont have to deal with fsync
|
36
|
-
# if the file is close we
|
44
|
+
# if the file is close, fd.size raises an IO exception so we use the File::size
|
37
45
|
begin
|
46
|
+
# fd is nil when LS tries to recover gzip file but fails
|
47
|
+
return 0 unless @fd != nil
|
38
48
|
@fd.size
|
39
49
|
rescue IOError
|
40
50
|
::File.size(path)
|
@@ -45,7 +55,7 @@ module LogStash
|
|
45
55
|
@key.gsub(/^\//, "")
|
46
56
|
end
|
47
57
|
|
48
|
-
# Each temporary file is
|
58
|
+
# Each temporary file is created inside a directory named with an UUID,
|
49
59
|
# instead of deleting the file directly and having the risk of deleting other files
|
50
60
|
# we delete the root of the UUID, using a UUID also remove the risk of deleting unwanted file, it acts as
|
51
61
|
# a sandbox.
|
@@ -58,12 +68,45 @@ module LogStash
|
|
58
68
|
size == 0
|
59
69
|
end
|
60
70
|
|
71
|
+
# only to cover the case where LS cannot restore corrupted file, file is not exist
|
72
|
+
def recoverable?
|
73
|
+
!@fd.nil?
|
74
|
+
end
|
75
|
+
|
61
76
|
def self.create_from_existing_file(file_path, temporary_folder)
|
62
77
|
key_parts = Pathname.new(file_path).relative_path_from(temporary_folder).to_s.split(::File::SEPARATOR)
|
63
78
|
|
79
|
+
# recover gzip file and compress back before uploading to S3
|
80
|
+
if file_path.end_with?("." + GZIP_EXTENSION)
|
81
|
+
file_path = self.recover(file_path)
|
82
|
+
end
|
64
83
|
TemporaryFile.new(key_parts.slice(1, key_parts.size).join("/"),
|
65
|
-
|
66
|
-
|
84
|
+
::File.exist?(file_path) ? ::File.open(file_path, "r") : nil, # for the nil case, file size will be 0 and upload will be ignored.
|
85
|
+
::File.join(temporary_folder, key_parts.slice(0, 1)))
|
86
|
+
end
|
87
|
+
|
88
|
+
def self.gzip_extension
|
89
|
+
GZIP_EXTENSION
|
90
|
+
end
|
91
|
+
|
92
|
+
def self.text_extension
|
93
|
+
TXT_EXTENSION
|
94
|
+
end
|
95
|
+
|
96
|
+
def self.recovery_file_name_tag
|
97
|
+
RECOVERED_FILE_NAME_TAG
|
98
|
+
end
|
99
|
+
|
100
|
+
private
|
101
|
+
def self.recover(file_path)
|
102
|
+
full_gzip_extension = "." + GZIP_EXTENSION
|
103
|
+
recovered_txt_file_path = file_path.gsub(full_gzip_extension, RECOVERED_FILE_NAME_TAG + "." + TXT_EXTENSION)
|
104
|
+
recovered_gzip_file_path = file_path.gsub(full_gzip_extension, RECOVERED_FILE_NAME_TAG + full_gzip_extension)
|
105
|
+
GzipUtil.recover(file_path, recovered_txt_file_path)
|
106
|
+
if ::File.exist?(recovered_txt_file_path) && !::File.zero?(recovered_txt_file_path)
|
107
|
+
GzipUtil.compress(recovered_txt_file_path, recovered_gzip_file_path)
|
108
|
+
end
|
109
|
+
recovered_gzip_file_path
|
67
110
|
end
|
68
111
|
end
|
69
112
|
end
|
@@ -19,9 +19,6 @@ module LogStash
|
|
19
19
|
# I do not have to mess around to check if the other directory have file in it before destroying them.
|
20
20
|
class TemporaryFileFactory
|
21
21
|
FILE_MODE = "a"
|
22
|
-
GZIP_ENCODING = "gzip"
|
23
|
-
GZIP_EXTENSION = "txt.gz"
|
24
|
-
TXT_EXTENSION = "txt"
|
25
22
|
STRFTIME = "%Y-%m-%dT%H.%M"
|
26
23
|
|
27
24
|
attr_accessor :counter, :tags, :prefix, :encoding, :temporary_directory, :current
|
@@ -48,7 +45,7 @@ module LogStash
|
|
48
45
|
|
49
46
|
private
|
50
47
|
def extension
|
51
|
-
gzip? ?
|
48
|
+
gzip? ? TemporaryFile.gzip_extension : TemporaryFile.text_extension
|
52
49
|
end
|
53
50
|
|
54
51
|
def gzip?
|
@@ -7,7 +7,7 @@ module LogStash
|
|
7
7
|
|
8
8
|
def initialize(time_file)
|
9
9
|
if time_file <= 0
|
10
|
-
raise LogStash::ConfigurationError, "`time_file` need to be
|
10
|
+
raise LogStash::ConfigurationError, "`time_file` need to be greater than 0"
|
11
11
|
end
|
12
12
|
|
13
13
|
@time_file = time_file * 60
|
@@ -31,6 +31,7 @@ module LogStash
|
|
31
31
|
end
|
32
32
|
end
|
33
33
|
|
34
|
+
# uploads a TemporaryFile to S3
|
34
35
|
def upload(file, options = {})
|
35
36
|
upload_options = options.fetch(:upload_options, {})
|
36
37
|
|
@@ -68,6 +69,7 @@ module LogStash
|
|
68
69
|
@workers_pool.shutdown
|
69
70
|
@workers_pool.wait_for_termination(nil) # block until its done
|
70
71
|
end
|
72
|
+
|
71
73
|
end
|
72
74
|
end
|
73
75
|
end
|
data/lib/logstash/outputs/s3.rb
CHANGED
@@ -94,6 +94,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
|
|
94
94
|
:fallback_policy => :caller_runs
|
95
95
|
})
|
96
96
|
|
97
|
+
GZIP_ENCODING = "gzip"
|
97
98
|
|
98
99
|
config_name "s3"
|
99
100
|
default :codec, "line"
|
@@ -107,7 +108,8 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
|
|
107
108
|
|
108
109
|
# Set the size of file in bytes, this means that files on bucket when have dimension > file_size, they are stored in two or more file.
|
109
110
|
# If you have tags then it will generate a specific size file for every tags
|
110
|
-
|
111
|
+
#
|
112
|
+
# NOTE: define size of file is the better thing, because generate a local temporary file on disk and then put it in bucket.
|
111
113
|
config :size_file, :validate => :number, :default => 1024 * 1024 * 5
|
112
114
|
|
113
115
|
# Set the time, in MINUTES, to close the current sub_time_section of bucket.
|
@@ -115,10 +117,10 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
|
|
115
117
|
# If it's valued 0 and rotation_strategy is 'time' or 'size_and_time' then the plugin reaise a configuration error.
|
116
118
|
config :time_file, :validate => :number, :default => 15
|
117
119
|
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
120
|
+
# If `restore => false` is specified and Logstash crashes, the unprocessed files are not sent into the bucket.
|
121
|
+
#
|
122
|
+
# NOTE: that the `recovery => true` default assumes multiple S3 outputs would set a unique `temporary_directory => ...`
|
123
|
+
# if they do not than only a single S3 output is safe to recover (since let-over files are processed and deleted).
|
122
124
|
config :restore, :validate => :boolean, :default => true
|
123
125
|
|
124
126
|
# The S3 canned ACL to use when putting the file. Defaults to "private".
|
@@ -144,6 +146,9 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
|
|
144
146
|
|
145
147
|
# Set the directory where logstash will store the tmp files before sending it to S3
|
146
148
|
# default to the current OS temporary directory in linux /tmp/logstash
|
149
|
+
#
|
150
|
+
# NOTE: the reason we do not have a unique (isolated) temporary directory as a default, to support multiple plugin instances,
|
151
|
+
# is that we would have to rely on something static that does not change between restarts (e.g. a user set id => ...).
|
147
152
|
config :temporary_directory, :validate => :string, :default => File.join(Dir.tmpdir, "logstash")
|
148
153
|
|
149
154
|
# Specify a prefix to the uploaded filename, this can simulate directories on S3. Prefix does not require leading slash.
|
@@ -174,7 +179,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
|
|
174
179
|
config :tags, :validate => :array, :default => []
|
175
180
|
|
176
181
|
# Specify the content encoding. Supports ("gzip"). Defaults to "none"
|
177
|
-
config :encoding, :validate => ["none",
|
182
|
+
config :encoding, :validate => ["none", GZIP_ENCODING], :default => "none"
|
178
183
|
|
179
184
|
# Define the strategy to use to decide when we need to rotate the file and push it to S3,
|
180
185
|
# The default strategy is to check for both size and time, the first one to match will rotate the file.
|
@@ -308,7 +313,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
|
|
308
313
|
:server_side_encryption => @server_side_encryption ? @server_side_encryption_algorithm : nil,
|
309
314
|
:ssekms_key_id => @server_side_encryption_algorithm == "aws:kms" ? @ssekms_key_id : nil,
|
310
315
|
:storage_class => @storage_class,
|
311
|
-
:content_encoding => @encoding ==
|
316
|
+
:content_encoding => @encoding == GZIP_ENCODING ? GZIP_ENCODING : nil,
|
312
317
|
:multipart_threshold => @upload_multipart_threshold
|
313
318
|
}
|
314
319
|
end
|
@@ -336,27 +341,28 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
|
|
336
341
|
end
|
337
342
|
|
338
343
|
def rotate_if_needed(prefixes)
|
339
|
-
|
340
344
|
# Each file access is thread safe,
|
341
345
|
# until the rotation is done then only
|
342
346
|
# one thread has access to the resource.
|
343
347
|
@file_repository.each_factory(prefixes) do |factory|
|
348
|
+
# we have exclusive access to the one-and-only
|
349
|
+
# prefix WRAPPER for this factory.
|
344
350
|
temp_file = factory.current
|
345
351
|
|
346
352
|
if @rotation.rotate?(temp_file)
|
347
|
-
@logger.debug("Rotate file",
|
348
|
-
|
349
|
-
|
350
|
-
|
353
|
+
@logger.debug? && @logger.debug("Rotate file",
|
354
|
+
:key => temp_file.key,
|
355
|
+
:path => temp_file.path,
|
356
|
+
:strategy => @rotation.class.name)
|
351
357
|
|
352
|
-
upload_file(temp_file)
|
358
|
+
upload_file(temp_file) # may be async or blocking
|
353
359
|
factory.rotate!
|
354
360
|
end
|
355
361
|
end
|
356
362
|
end
|
357
363
|
|
358
364
|
def upload_file(temp_file)
|
359
|
-
@logger.debug("Queue for upload", :path => temp_file.path)
|
365
|
+
@logger.debug? && @logger.debug("Queue for upload", :path => temp_file.path)
|
360
366
|
|
361
367
|
# if the queue is full the calling thread will be used to upload
|
362
368
|
temp_file.close # make sure the content is on disk
|
@@ -379,7 +385,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
|
|
379
385
|
end
|
380
386
|
|
381
387
|
def clean_temporary_file(file)
|
382
|
-
@logger.debug("Removing temporary file", :
|
388
|
+
@logger.debug? && @logger.debug("Removing temporary file", :path => file.path)
|
383
389
|
file.delete!
|
384
390
|
end
|
385
391
|
|
@@ -389,16 +395,48 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
|
|
389
395
|
@crash_uploader = Uploader.new(bucket_resource, @logger, CRASH_RECOVERY_THREADPOOL)
|
390
396
|
|
391
397
|
temp_folder_path = Pathname.new(@temporary_directory)
|
392
|
-
Dir.glob(::File.join(@temporary_directory, "**/*"))
|
393
|
-
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
398
|
+
files = Dir.glob(::File.join(@temporary_directory, "**/*"))
|
399
|
+
.select { |file_path| ::File.file?(file_path) }
|
400
|
+
under_recovery_files = get_under_recovery_files(files)
|
401
|
+
|
402
|
+
files.each do |file_path|
|
403
|
+
# when encoding is GZIP, if file is already recovering or recovered and uploading to S3, log and skip
|
404
|
+
if under_recovery_files.include?(file_path)
|
405
|
+
unless file_path.include?(TemporaryFile.gzip_extension)
|
406
|
+
@logger.warn("The #{file_path} file either under recover process or failed to recover before.")
|
407
|
+
end
|
399
408
|
else
|
400
|
-
|
409
|
+
temp_file = TemporaryFile.create_from_existing_file(file_path, temp_folder_path)
|
410
|
+
# do not remove or upload if Logstash tries to recover file but fails
|
411
|
+
if temp_file.recoverable?
|
412
|
+
if temp_file.size > 0
|
413
|
+
@logger.debug? && @logger.debug("Recovering from crash and uploading", :path => temp_file.path)
|
414
|
+
@crash_uploader.upload_async(temp_file,
|
415
|
+
:on_complete => method(:clean_temporary_file),
|
416
|
+
:upload_options => upload_options)
|
417
|
+
else
|
418
|
+
clean_temporary_file(temp_file)
|
419
|
+
end
|
420
|
+
end
|
421
|
+
end
|
422
|
+
end
|
423
|
+
end
|
424
|
+
|
425
|
+
# figures out the recovering files and
|
426
|
+
# creates a skip list to ignore for the rest of processes
|
427
|
+
def get_under_recovery_files(files)
|
428
|
+
skip_files = Set.new
|
429
|
+
return skip_files unless @encoding == GZIP_ENCODING
|
430
|
+
|
431
|
+
files.each do |file_path|
|
432
|
+
if file_path.include?(TemporaryFile.recovery_file_name_tag)
|
433
|
+
skip_files << file_path
|
434
|
+
if file_path.include?(TemporaryFile.gzip_extension)
|
435
|
+
# also include the original corrupted gzip file
|
436
|
+
skip_files << file_path.gsub(TemporaryFile.recovery_file_name_tag, "")
|
437
|
+
end
|
401
438
|
end
|
402
439
|
end
|
440
|
+
skip_files
|
403
441
|
end
|
404
442
|
end
|
@@ -0,0 +1,15 @@
|
|
1
|
+
# encoding: utf-8
|
2
|
+
require "jars/installer"
|
3
|
+
require "fileutils"
|
4
|
+
|
5
|
+
task :vendor do
|
6
|
+
exit(1) unless system './gradlew vendor'
|
7
|
+
version = File.read("VERSION").strip
|
8
|
+
end
|
9
|
+
|
10
|
+
desc "clean"
|
11
|
+
task :clean do
|
12
|
+
["build", "vendor/jar-dependencies", "Gemfile.lock"].each do |p|
|
13
|
+
FileUtils.rm_rf(p)
|
14
|
+
end
|
15
|
+
end
|
@@ -1,6 +1,8 @@
|
|
1
|
+
INTEGRATION_AWS_VERSION = File.read(File.expand_path(File.join(File.dirname(__FILE__), "VERSION"))).strip unless defined?(INTEGRATION_AWS_VERSION)
|
2
|
+
|
1
3
|
Gem::Specification.new do |s|
|
2
4
|
s.name = "logstash-integration-aws"
|
3
|
-
s.version =
|
5
|
+
s.version = INTEGRATION_AWS_VERSION
|
4
6
|
s.licenses = ["Apache-2.0"]
|
5
7
|
s.summary = "Collection of Logstash plugins that integrate with AWS"
|
6
8
|
s.description = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
|
@@ -23,7 +25,7 @@ Gem::Specification.new do |s|
|
|
23
25
|
}
|
24
26
|
|
25
27
|
|
26
|
-
s.require_paths = ["lib"]
|
28
|
+
s.require_paths = ["lib", "vendor/jar-dependencies"]
|
27
29
|
s.files = Dir["lib/**/*","spec/**/*","*.gemspec","*.md","CONTRIBUTORS","Gemfile","LICENSE","NOTICE.TXT", "VERSION", "docs/**/*"]
|
28
30
|
s.test_files = s.files.grep(%r{^(test|spec|features)/})
|
29
31
|
|
@@ -7,18 +7,17 @@ require "stud/temporary"
|
|
7
7
|
describe "Restore from crash", :integration => true do
|
8
8
|
include_context "setup plugin"
|
9
9
|
|
10
|
-
let(:options) { main_options.merge({ "restore" => true, "canned_acl" => "public-read-write" }) }
|
11
|
-
|
12
10
|
let(:number_of_files) { 5 }
|
13
11
|
let(:dummy_content) { "foobar\n" * 100 }
|
14
|
-
let(:factory) { LogStash::Outputs::S3::TemporaryFileFactory.new(prefix, tags, "none", temporary_directory)}
|
15
12
|
|
16
13
|
before do
|
17
14
|
clean_remote_files(prefix)
|
18
15
|
end
|
19
16
|
|
20
|
-
|
21
17
|
context 'with a non-empty tempfile' do
|
18
|
+
let(:options) { main_options.merge({ "restore" => true, "canned_acl" => "public-read-write" }) }
|
19
|
+
let(:factory) { LogStash::Outputs::S3::TemporaryFileFactory.new(prefix, tags, "none", temporary_directory)}
|
20
|
+
|
22
21
|
before do
|
23
22
|
# Creating a factory always create a file
|
24
23
|
factory.current.write(dummy_content)
|
@@ -30,6 +29,7 @@ describe "Restore from crash", :integration => true do
|
|
30
29
|
factory.current.fsync
|
31
30
|
end
|
32
31
|
end
|
32
|
+
|
33
33
|
it "uploads the file to the bucket" do
|
34
34
|
subject.register
|
35
35
|
try(20) do
|
@@ -41,6 +41,9 @@ describe "Restore from crash", :integration => true do
|
|
41
41
|
end
|
42
42
|
|
43
43
|
context 'with an empty tempfile' do
|
44
|
+
let(:options) { main_options.merge({ "restore" => true, "canned_acl" => "public-read-write" }) }
|
45
|
+
let(:factory) { LogStash::Outputs::S3::TemporaryFileFactory.new(prefix, tags, "none", temporary_directory)}
|
46
|
+
|
44
47
|
before do
|
45
48
|
factory.current
|
46
49
|
factory.rotate!
|
@@ -63,5 +66,68 @@ describe "Restore from crash", :integration => true do
|
|
63
66
|
expect(bucket_resource.objects(:prefix => prefix).count).to eq(0)
|
64
67
|
end
|
65
68
|
end
|
69
|
+
|
70
|
+
context "#gzip encoding" do
|
71
|
+
let(:options) { main_options.merge({ "restore" => true, "canned_acl" => "public-read-write", "encoding" => "gzip" }) }
|
72
|
+
let(:factory) { LogStash::Outputs::S3::TemporaryFileFactory.new(prefix, tags, "gzip", temporary_directory)}
|
73
|
+
describe "with empty recovered file" do
|
74
|
+
before do
|
75
|
+
# Creating a factory always create a file
|
76
|
+
factory.current.write('')
|
77
|
+
factory.current.fsync
|
78
|
+
factory.current.close
|
79
|
+
end
|
80
|
+
|
81
|
+
it 'should not upload and not remove temp file' do
|
82
|
+
subject.register
|
83
|
+
try(20) do
|
84
|
+
expect(bucket_resource.objects(:prefix => prefix).count).to eq(0)
|
85
|
+
expect(Dir.glob(File.join(temporary_directory, "*")).size).to eq(1)
|
86
|
+
end
|
87
|
+
end
|
88
|
+
end
|
89
|
+
|
90
|
+
describe "with healthy recovered, size is greater than zero file" do
|
91
|
+
before do
|
92
|
+
# Creating a factory always create a file
|
93
|
+
factory.current.write(dummy_content)
|
94
|
+
factory.current.fsync
|
95
|
+
factory.current.close
|
96
|
+
|
97
|
+
(number_of_files - 1).times do
|
98
|
+
factory.rotate!
|
99
|
+
factory.current.write(dummy_content)
|
100
|
+
factory.current.fsync
|
101
|
+
factory.current.close
|
102
|
+
end
|
103
|
+
end
|
104
|
+
|
105
|
+
it 'should recover, upload to S3 and remove temp file' do
|
106
|
+
subject.register
|
107
|
+
try(20) do
|
108
|
+
expect(bucket_resource.objects(:prefix => prefix).count).to eq(number_of_files)
|
109
|
+
expect(Dir.glob(File.join(temporary_directory, "*")).size).to eq(0)
|
110
|
+
expect(bucket_resource.objects(:prefix => prefix).first.acl.grants.collect(&:permission)).to include("READ", "WRITE")
|
111
|
+
end
|
112
|
+
end
|
113
|
+
end
|
114
|
+
|
115
|
+
describe "with failure when recovering" do
|
116
|
+
before do
|
117
|
+
# Creating a factory always create a file
|
118
|
+
factory.current.write(dummy_content)
|
119
|
+
factory.current.fsync
|
120
|
+
end
|
121
|
+
|
122
|
+
it 'should not upload to S3 and not remove temp file' do
|
123
|
+
subject.register
|
124
|
+
try(20) do
|
125
|
+
expect(bucket_resource.objects(:prefix => prefix).count).to eq(0)
|
126
|
+
expect(Dir.glob(File.join(temporary_directory, "*")).size).to eq(1)
|
127
|
+
end
|
128
|
+
end
|
129
|
+
end
|
130
|
+
end
|
131
|
+
|
66
132
|
end
|
67
133
|
|
@@ -25,11 +25,11 @@ describe LogStash::Outputs::S3::SizeRotationPolicy do
|
|
25
25
|
end
|
26
26
|
|
27
27
|
it "raises an exception if the `size_file` is 0" do
|
28
|
-
expect { described_class.new(0) }.to raise_error(LogStash::ConfigurationError, /need to be
|
28
|
+
expect { described_class.new(0) }.to raise_error(LogStash::ConfigurationError, /need to be greater than 0/)
|
29
29
|
end
|
30
30
|
|
31
31
|
it "raises an exception if the `size_file` is < 0" do
|
32
|
-
expect { described_class.new(-100) }.to raise_error(LogStash::ConfigurationError, /need to be
|
32
|
+
expect { described_class.new(-100) }.to raise_error(LogStash::ConfigurationError, /need to be greater than 0/)
|
33
33
|
end
|
34
34
|
|
35
35
|
context "#needs_periodic?" do
|
@@ -14,11 +14,11 @@ describe LogStash::Outputs::S3::TimeRotationPolicy do
|
|
14
14
|
let(:file) { LogStash::Outputs::S3::TemporaryFile.new(name, temporary_file, temporary_directory) }
|
15
15
|
|
16
16
|
it "raises an exception if the `file_time` is set to 0" do
|
17
|
-
expect { described_class.new(0) }.to raise_error(LogStash::ConfigurationError, /`time_file` need to be
|
17
|
+
expect { described_class.new(0) }.to raise_error(LogStash::ConfigurationError, /`time_file` need to be greater than 0/)
|
18
18
|
end
|
19
19
|
|
20
20
|
it "raises an exception if the `file_time` is < 0" do
|
21
|
-
expect { described_class.new(-100) }.to raise_error(LogStash::ConfigurationError, /`time_file` need to be
|
21
|
+
expect { described_class.new(-100) }.to raise_error(LogStash::ConfigurationError, /`time_file` need to be greater than 0/)
|
22
22
|
end
|
23
23
|
|
24
24
|
context "when the size of the file is superior to 0" do
|
data/spec/support/helpers.rb
CHANGED
@@ -67,6 +67,7 @@ shared_context "setup plugin" do
|
|
67
67
|
let(:bucket) { ENV["AWS_LOGSTASH_TEST_BUCKET"] }
|
68
68
|
let(:access_key_id) { ENV["AWS_ACCESS_KEY_ID"] }
|
69
69
|
let(:secret_access_key) { ENV["AWS_SECRET_ACCESS_KEY"] }
|
70
|
+
let(:session_token) { ENV["AWS_SESSION_TOKEN"] }
|
70
71
|
let(:size_file) { 100 }
|
71
72
|
let(:time_file) { 100 }
|
72
73
|
let(:tags) { [] }
|
@@ -80,6 +81,7 @@ shared_context "setup plugin" do
|
|
80
81
|
"temporary_directory" => temporary_directory,
|
81
82
|
"access_key_id" => access_key_id,
|
82
83
|
"secret_access_key" => secret_access_key,
|
84
|
+
"session_token" => session_token,
|
83
85
|
"size_file" => size_file,
|
84
86
|
"time_file" => time_file,
|
85
87
|
"region" => region,
|
@@ -87,7 +89,7 @@ shared_context "setup plugin" do
|
|
87
89
|
}
|
88
90
|
end
|
89
91
|
|
90
|
-
let(:client_credentials) { Aws::Credentials.new(access_key_id, secret_access_key) }
|
92
|
+
let(:client_credentials) { Aws::Credentials.new(access_key_id, secret_access_key, session_token) }
|
91
93
|
let(:bucket_resource) { Aws::S3::Bucket.new(bucket, { :credentials => client_credentials, :region => region }) }
|
92
94
|
|
93
95
|
subject { LogStash::Outputs::S3.new(options) }
|
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.0
|
4
|
+
version: 7.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Elastic
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2023-01-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
@@ -311,6 +311,7 @@ files:
|
|
311
311
|
- LICENSE
|
312
312
|
- NOTICE.TXT
|
313
313
|
- README.md
|
314
|
+
- VERSION
|
314
315
|
- docs/codec-cloudfront.asciidoc
|
315
316
|
- docs/codec-cloudtrail.asciidoc
|
316
317
|
- docs/index.asciidoc
|
@@ -321,6 +322,7 @@ files:
|
|
321
322
|
- docs/output-s3.asciidoc
|
322
323
|
- docs/output-sns.asciidoc
|
323
324
|
- docs/output-sqs.asciidoc
|
325
|
+
- lib/logstash-integration-aws_jars.rb
|
324
326
|
- lib/logstash/codecs/cloudfront.rb
|
325
327
|
- lib/logstash/codecs/cloudtrail.rb
|
326
328
|
- lib/logstash/inputs/cloudwatch.rb
|
@@ -343,6 +345,7 @@ files:
|
|
343
345
|
- lib/logstash/plugin_mixins/aws_config.rb
|
344
346
|
- lib/logstash/plugin_mixins/aws_config/generic.rb
|
345
347
|
- lib/logstash/plugin_mixins/aws_config/v2.rb
|
348
|
+
- lib/tasks/build.rake
|
346
349
|
- logstash-integration-aws.gemspec
|
347
350
|
- spec/codecs/cloudfront_spec.rb
|
348
351
|
- spec/codecs/cloudtrail_spec.rb
|
@@ -402,6 +405,7 @@ post_install_message:
|
|
402
405
|
rdoc_options: []
|
403
406
|
require_paths:
|
404
407
|
- lib
|
408
|
+
- vendor/jar-dependencies
|
405
409
|
required_ruby_version: !ruby/object:Gem::Requirement
|
406
410
|
requirements:
|
407
411
|
- - ">="
|