logstash-input-s3 3.1.6 → 3.1.7
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 +3 -0
- data/lib/logstash/inputs/s3.rb +4 -0
- data/logstash-input-s3.gemspec +2 -2
- data/spec/fixtures/multiline.log +6 -0
- data/spec/inputs/s3_spec.rb +15 -0
- metadata +18 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6af41687100e05c78cfab5ea671249a77224997a
|
|
4
|
+
data.tar.gz: 85a9bc14307938a9208030e3b4fb4940dadb7a0d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 133d8b4444db4af22ace661b2cc70995b633420ceaebd1a123739119ce9acf26f3ef3846234c4d57cdcf9f66545aaccd0e9fdc76ee346d5b4513abdbe749b202
|
|
7
|
+
data.tar.gz: 0a5fd6ec63e8277bcf6e1a723c2b2201031637f75e92bd96f4fadfb8f60b4ab594a85b663e58e01f2ba6f6179c3a6ceede8dc771d60ad8ea4809004a70b6f155
|
data/CHANGELOG.md
CHANGED
data/lib/logstash/inputs/s3.rb
CHANGED
|
@@ -196,6 +196,10 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
|
|
|
196
196
|
end
|
|
197
197
|
end
|
|
198
198
|
end
|
|
199
|
+
# #ensure any stateful codecs (such as multi-line ) are flushed to the queue
|
|
200
|
+
@codec.flush do |event|
|
|
201
|
+
queue << event
|
|
202
|
+
end
|
|
199
203
|
|
|
200
204
|
return true
|
|
201
205
|
end # def process_local_log
|
data/logstash-input-s3.gemspec
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
|
|
3
3
|
s.name = 'logstash-input-s3'
|
|
4
|
-
s.version = '3.1.
|
|
4
|
+
s.version = '3.1.7'
|
|
5
5
|
s.licenses = ['Apache License (2.0)']
|
|
6
6
|
s.summary = "Stream events from files from a S3 bucket."
|
|
7
7
|
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"
|
|
@@ -26,5 +26,5 @@ Gem::Specification.new do |s|
|
|
|
26
26
|
# s.add_runtime_dependency 'aws-sdk-resources', '>= 2.0.33'
|
|
27
27
|
s.add_development_dependency 'logstash-devutils'
|
|
28
28
|
s.add_development_dependency "logstash-codec-json"
|
|
29
|
+
s.add_development_dependency "logstash-codec-multiline"
|
|
29
30
|
end
|
|
30
|
-
|
data/spec/inputs/s3_spec.rb
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
# encoding: utf-8
|
|
2
2
|
require "logstash/devutils/rspec/spec_helper"
|
|
3
3
|
require "logstash/inputs/s3"
|
|
4
|
+
require "logstash/codecs/multiline"
|
|
4
5
|
require "logstash/errors"
|
|
5
6
|
require "aws-sdk-resources"
|
|
6
7
|
require_relative "../support/helpers"
|
|
@@ -290,6 +291,20 @@ describe LogStash::Inputs::S3 do
|
|
|
290
291
|
include_examples "generated events"
|
|
291
292
|
end
|
|
292
293
|
|
|
294
|
+
context 'multi-line' do
|
|
295
|
+
let(:log_file) { File.join(File.dirname(__FILE__), '..', 'fixtures', 'multiline.log') }
|
|
296
|
+
let(:config) {
|
|
297
|
+
{
|
|
298
|
+
"access_key_id" => "1234",
|
|
299
|
+
"secret_access_key" => "secret",
|
|
300
|
+
"bucket" => "logstash-test",
|
|
301
|
+
"codec" => LogStash::Codecs::Multiline.new( {"pattern" => "__SEPARATOR__", "negate" => "true", "what" => "previous"})
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
|
|
305
|
+
include_examples "generated events"
|
|
306
|
+
end
|
|
307
|
+
|
|
293
308
|
context 'encoded' do
|
|
294
309
|
let(:log_file) { File.join(File.dirname(__FILE__), '..', 'fixtures', 'invalid_utf8.log') }
|
|
295
310
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: logstash-input-s3
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.1.
|
|
4
|
+
version: 3.1.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Elastic
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-
|
|
11
|
+
date: 2017-10-03 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -86,6 +86,20 @@ dependencies:
|
|
|
86
86
|
- - ">="
|
|
87
87
|
- !ruby/object:Gem::Version
|
|
88
88
|
version: '0'
|
|
89
|
+
- !ruby/object:Gem::Dependency
|
|
90
|
+
requirement: !ruby/object:Gem::Requirement
|
|
91
|
+
requirements:
|
|
92
|
+
- - ">="
|
|
93
|
+
- !ruby/object:Gem::Version
|
|
94
|
+
version: '0'
|
|
95
|
+
name: logstash-codec-multiline
|
|
96
|
+
prerelease: false
|
|
97
|
+
type: :development
|
|
98
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
99
|
+
requirements:
|
|
100
|
+
- - ">="
|
|
101
|
+
- !ruby/object:Gem::Version
|
|
102
|
+
version: '0'
|
|
89
103
|
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
|
|
90
104
|
email: info@elastic.co
|
|
91
105
|
executables: []
|
|
@@ -107,6 +121,7 @@ files:
|
|
|
107
121
|
- spec/fixtures/invalid_utf8.log
|
|
108
122
|
- spec/fixtures/json.log
|
|
109
123
|
- spec/fixtures/json_with_message.log
|
|
124
|
+
- spec/fixtures/multiline.log
|
|
110
125
|
- spec/fixtures/multiple_compressed_streams.gz
|
|
111
126
|
- spec/fixtures/uncompressed.log
|
|
112
127
|
- spec/inputs/s3_spec.rb
|
|
@@ -145,6 +160,7 @@ test_files:
|
|
|
145
160
|
- spec/fixtures/invalid_utf8.log
|
|
146
161
|
- spec/fixtures/json.log
|
|
147
162
|
- spec/fixtures/json_with_message.log
|
|
163
|
+
- spec/fixtures/multiline.log
|
|
148
164
|
- spec/fixtures/multiple_compressed_streams.gz
|
|
149
165
|
- spec/fixtures/uncompressed.log
|
|
150
166
|
- spec/inputs/s3_spec.rb
|