logstash-input-s3 3.1.6 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3525fa8ada4e81e89bcec92b097a9b49cff294d5
-  data.tar.gz: 02cb93d68b78ef928fdc36e3810823410f0b93c4
+  metadata.gz: 6af41687100e05c78cfab5ea671249a77224997a
+  data.tar.gz: 85a9bc14307938a9208030e3b4fb4940dadb7a0d
 SHA512:
-  metadata.gz: e47c2021b0218a3bdcd7e142ed911e0a354c4518c7ad66707ee6a817dc1936c89749061b7739fc141abec8f1f09ddbd215c1026be639c3403b4a14b833334773
-  data.tar.gz: d232385d492aab3e51729369420d3338710341b4a984df959bc7a149dbaaacbe1448505d6a3800baf7597fbe882c15d5492eac2fb70dc39d79495b2e014d36b4
+  metadata.gz: 133d8b4444db4af22ace661b2cc70995b633420ceaebd1a123739119ce9acf26f3ef3846234c4d57cdcf9f66545aaccd0e9fdc76ee346d5b4513abdbe749b202
+  data.tar.gz: 0a5fd6ec63e8277bcf6e1a723c2b2201031637f75e92bd96f4fadfb8f60b4ab594a85b663e58e01f2ba6f6179c3a6ceede8dc771d60ad8ea4809004a70b6f155

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.1.7
+  - Fix missing last multi-line entry #120
+
 ## 3.1.6
   - Fix some documentation issues
 

data/lib/logstash/inputs/s3.rb

@@ -196,6 +196,10 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
         end
       end
     end
+    # #ensure any stateful codecs (such as multi-line ) are flushed to the queue
+    @codec.flush do |event|
+      queue << event
+    end
 
     return true
   end # def process_local_log

data/logstash-input-s3.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-s3'
-  s.version         = '3.1.6'
+  s.version         = '3.1.7'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Stream events from files from a S3 bucket."
   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|
  # s.add_runtime_dependency 'aws-sdk-resources', '>= 2.0.33'
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency "logstash-codec-json"
+  s.add_development_dependency "logstash-codec-multiline"
 end
-

data/spec/fixtures/multiline.log

@@ -0,0 +1,6 @@
+__SEPARATOR__
+file:1 record:1 line:1
+file:1 record:1 line:2
+__SEPARATOR__
+file:1 record:2 line:1
+file:1 record:2 line:2

data/spec/inputs/s3_spec.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/inputs/s3"
+require "logstash/codecs/multiline"
 require "logstash/errors"
 require "aws-sdk-resources"
 require_relative "../support/helpers"
@@ -290,6 +291,20 @@ describe LogStash::Inputs::S3 do
       include_examples "generated events"
     end
 
+    context 'multi-line' do
+      let(:log_file) { File.join(File.dirname(__FILE__), '..', 'fixtures', 'multiline.log') }
+       let(:config) {
+           {
+              "access_key_id" => "1234",
+              "secret_access_key" => "secret",
+              "bucket" => "logstash-test",
+              "codec" => LogStash::Codecs::Multiline.new( {"pattern" => "__SEPARATOR__", "negate" => "true",  "what" => "previous"})
+           }
+        }
+
+      include_examples "generated events"
+    end
+
     context 'encoded' do
       let(:log_file) { File.join(File.dirname(__FILE__), '..', 'fixtures', 'invalid_utf8.log') }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-s3
 version: !ruby/object:Gem::Version
-  version: 3.1.6
+  version: 3.1.7
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +86,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  name: logstash-codec-multiline
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 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
 email: info@elastic.co
 executables: []
@@ -107,6 +121,7 @@ files:
 - spec/fixtures/invalid_utf8.log
 - spec/fixtures/json.log
 - spec/fixtures/json_with_message.log
+- spec/fixtures/multiline.log
 - spec/fixtures/multiple_compressed_streams.gz
 - spec/fixtures/uncompressed.log
 - spec/inputs/s3_spec.rb
@@ -145,6 +160,7 @@ test_files:
 - spec/fixtures/invalid_utf8.log
 - spec/fixtures/json.log
 - spec/fixtures/json_with_message.log
+- spec/fixtures/multiline.log
 - spec/fixtures/multiple_compressed_streams.gz
 - spec/fixtures/uncompressed.log
 - spec/inputs/s3_spec.rb