logstash-filter-multiline 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df182f44556a48d76c7f81b2f17c48ea58e5b561
-  data.tar.gz: 88a66ec2683dc519251713821db75d76c8a26f57
+  metadata.gz: 5c2f9b96b2a529c7707d35c8e0c7a9bff1588941
+  data.tar.gz: 8ab08111a3a970210a51df95aad6d1d54c04d261
 SHA512:
-  metadata.gz: 0221738244d7cf9ce35954fcfd90c0efddd861e84258203d4b35e6674187de9ccd02321d74c9022d2fff9c998867799a749414c5449b7dda5cdbca0076cbc350
-  data.tar.gz: c343454ea138b676862b5e5fb05befffd8db3ebcf5561c438af440161c78b0e98afdd7c35dea7dab77fab6d983ef6e461b73853f05e21f15ac3846662621b71a
+  metadata.gz: b117b8443aeeb1b1b8f6f4c09d12c0a88cef5a56a1dd15552ad35f9cce928c0f56f58531fd25e95bff073c0eceec3dd38fc55a0499c9eeb0ea15c3ba8570280c
+  data.tar.gz: 4c177d9f33439f8979ec162cc0544e35be1b8a35ccc719c7e781c27fdba21fc5c49780c56ed08cfabeb29632017d216c176be2e1cf81fe4f28038e9e8693e4b8

data/CHANGELOG.md

@@ -1,2 +0,0 @@
-## 1.1.0
- - Fix metadata handling, fixes #19 and #22

data/Gemfile

@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gemspec
+gemspec

data/lib/logstash/filters/multiline.rb

@@ -209,7 +209,7 @@ class LogStash::Filters::Multiline < LogStash::Filters::Base
   end # def flush
 
   public
-  def teardown
+  def close
     # nothing to do
   end
 
@@ -228,10 +228,8 @@ class LogStash::Filters::Multiline < LogStash::Filters::Base
       # this line is not part of the previous event if we have a pending event, it's done, send it.
       # put the current event into pending
       unless pending.empty?
-        tmp           = event.to_hash_with_metadata
-        merged_events = merge(pending)
-        event.overwrite(merged_events)
-        event["@metadata"] = merged_events["@metadata"] # Override does not copy the metadata
+        tmp = event.to_hash
+        event.overwrite(merge(pending))
         pending.clear # avoid array creation
         pending << LogStash::Event.new(tmp)
       else
@@ -255,9 +253,7 @@ class LogStash::Filters::Multiline < LogStash::Filters::Base
       # if we have something in pending, join it with this message and send it.
       # otherwise, this is a new message and not part of multiline, send it.
       unless pending.empty?
-        merged_events = merge(pending << event)
-        event.overwrite(merged_events)
-        event["@metadata"] = merged_events["@metadata"] # Override does not copy the metadata
+        event.overwrite(merge(pending << event))
         pending.clear
       end
     end # if match

data/logstash-filter-multiline.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-multiline'
-  s.version         = '1.1.0'
+  s.version         = '2.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This filter will collapse multiline messages from a single source into one Logstash event."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0.alpha0'
+  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
   s.add_runtime_dependency 'logstash-patterns-core'
   s.add_runtime_dependency 'logstash-filter-mutate'
   s.add_runtime_dependency 'jls-grok', '~> 0.11.0'

data/spec/filters/multiline_spec.rb

@@ -245,47 +245,4 @@ describe LogStash::Filters::Multiline do
     end
   end
 
-
-  describe "keeps metadata fields after two consecutive non multline lines" do
-    config <<-CONFIG
-    filter {
-       mutate { add_field => { "[@metadata][index]" => "logstash-2015.11.19" } }
-       multiline {
-          pattern => "^%{NUMBER}"
-          what => "previous"
-      }
-       mutate { add_field => { "[@metadata][type]" => "foo" } }
-    }
-    CONFIG
-
-    sample ["line1", "line2"] do
-      expect(subject).to be_a(Array)
-      expect(subject[0]["@metadata"]).to include("index"=>"logstash-2015.11.19")
-      expect(subject[1]["@metadata"]).to include("index"=>"logstash-2015.11.19")
-      expect(subject[0]["@metadata"]).to include("type"=>"foo")
-      expect(subject[1]["@metadata"]).to include("type"=>"foo")
-    end
-  end
-
-  describe "keeps metadata fields after two consecutive non multline lines" do
-    config <<-CONFIG
-    filter {
-       mutate { add_field => { "[@metadata][index]" => "logstash-2015.11.19" } }
-       multiline {
-          pattern => "^%{NUMBER}"
-          what => "next"
-      }
-       mutate { add_field => { "[@metadata][type]" => "foo" } }
-    }
-    CONFIG
-
-    sample ["line1", "line2"] do
-      expect(subject).to be_a(Array)
-      expect(subject[0]["@metadata"]).to include("index"=>"logstash-2015.11.19")
-      expect(subject[1]["@metadata"]).to include("index"=>"logstash-2015.11.19")
-      expect(subject[0]["@metadata"]).to include("type"=>"foo")
-      expect(subject[1]["@metadata"]).to include("type"=>"foo")
-    end
-  end
-
 end

metadata

@@ -1,105 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-multiline
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-07 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: logstash-core
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0.alpha0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0.alpha0
+        version: 2.0.0.snapshot
+  name: logstash-core
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-patterns-core
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.snapshot
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-patterns-core
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-filter-mutate
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-filter-mutate
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jls-grok
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.0
+  name: jls-grok
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   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/plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/filters/multiline.rb
 - logstash-filter-multiline.gemspec
 - spec/filters/multiline_spec.rb
@@ -125,10 +117,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: This filter will collapse multiline messages from a single source into one Logstash event.
 test_files:
 - spec/filters/multiline_spec.rb
-has_rdoc:

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"