logstash-filter-multiline 2.0.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d3942a224915ed389c4721e9ee08e19fb003c9c
-  data.tar.gz: d7de154ee6524ac0596637dcc42f1ed8e02d175c
+  metadata.gz: ed2f76cf601f2f8f263288c27f38e52f2b5ec28f
+  data.tar.gz: 5d4a58a07ad04120b05d337215edc6210cdf3308
 SHA512:
-  metadata.gz: edc3b6d50f2ad70bd17f9e10ee67dbd3a74a2c9d4a0340b47226bf32f464abe6dbaa1e6b630e642191702cd07c775fe8dc8023ac02ba43e5f5b2004c0949b30d
-  data.tar.gz: a476b6e57bc1ee2085f5a85b90158bf4855d5059ad47ea6a50324f67d02ba7ed7561504cd6e2f53b7393acade5a6d781bb4dea892bde7e065712d0359791569d
+  metadata.gz: 38995d4ec870df55106bc52230e16eeb3d08f213e6961e7fed0c7cac0a449560e061e8a7b8bb6284ea04b7cb1e9c18b3178a5a555d5961adf310ac17cd974dd9
+  data.tar.gz: e681f7c127697c711032a208f835a0262ec325990943faa3650b9d5501b2e0fc21ba6ca619ee34b297732ba893e6331951efb03658232ca50495d3f031ea21a2

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 3.0.0
+  - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
 # 2.0.5
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
 # 2.0.4

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
-gemspec
+
+# Specify your gem's dependencies in logstash-mass_effect.gemspec
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -1,7 +1,6 @@
 # Logstash Plugin
 
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-multiline-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Filters/job/logstash-plugin-filter-multiline-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-filter-multiline.svg)](https://travis-ci.org/logstash-plugins/logstash-filter-multiline)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -56,7 +55,12 @@ gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
 - Install plugin
 ```sh
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
 bin/plugin install --no-verify
+
 ```
 - Run Logstash with your plugin
 ```sh
@@ -74,7 +78,12 @@ gem build logstash-filter-awesome.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
+bin/plugin install --no-verify
+
 ```
 - Start Logstash and proceed to test the plugin
 

data/lib/logstash/filters/multiline.rb

@@ -165,12 +165,10 @@ class LogStash::Filters::Multiline < LogStash::Filters::Base
 
   public
   def filter(event)
-    
-
-    match = event[@source].is_a?(Array) ? @grok.match(event[@source].first) : @grok.match(event[@source])
+    match = event.get(@source).is_a?(Array) ? @grok.match(event.get(@source).first) : @grok.match(event.get(@source))
     match = (match && !@negate) || (!match && @negate) # add negate option
 
-    @logger.debug? && @logger.debug("Multiline", :pattern => @pattern, :message => event[@source], :match => match, :negate => @negate)
+    @logger.debug? && @logger.debug("Multiline", :pattern => @pattern, :message => event.get(@source), :match => match, :negate => @negate)
 
     multiline_filter!(event, match)
 
@@ -192,7 +190,7 @@ class LogStash::Filters::Multiline < LogStash::Filters::Base
     # if :final flush then select all events
     expired = @pending.inject({}) do |result, (key, events)|
       unless events.empty?
-        age = Time.now - events.first["@timestamp"].time
+        age = Time.now - events.first.get("@timestamp").time
         result[key] = events if (age >= @max_age) || options[:final]
       end
       result
@@ -231,7 +229,7 @@ class LogStash::Filters::Multiline < LogStash::Filters::Base
         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
+        event.set("@metadata", merged_events.get("@metadata")) # Override does not copy the metadata
         pending.clear # avoid array creation
         pending << LogStash::Event.new(tmp)
       else
@@ -257,7 +255,7 @@ class LogStash::Filters::Multiline < LogStash::Filters::Base
       unless pending.empty?
         merged_events = merge(pending << event)
         event.overwrite(merged_events)
-        event["@metadata"] = merged_events["@metadata"] # Override does not copy the metadata
+        event.set("@metadata", merged_events.get("@metadata")) # Override does not copy the metadata
         pending.clear
       end
     end # if match

data/logstash-filter-multiline.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-filter-multiline'
-  s.version         = '2.0.5'
+  s.version         = '3.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"
+  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"
   s.authors         = ["Elastic"]
   s.email           = 'info@elastic.co'
   s.homepage        = "http://www.elastic.co/guide/en/logstash/current/index.html"
@@ -20,11 +20,11 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "filter" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
   s.add_runtime_dependency 'logstash-patterns-core'
-  s.add_development_dependency 'logstash-filter-mutate'
   s.add_runtime_dependency 'jls-grok', '~> 0.11.0'
 
+  s.add_development_dependency 'logstash-filter-mutate'
   s.add_development_dependency 'logstash-devutils'
 end
 

data/spec/filters/multiline_spec.rb

@@ -19,8 +19,8 @@ describe LogStash::Filters::Multiline do
     sample [ "hello world", "   second line", "another first line" ] do
       expect(subject).to be_a(Array)
       insist { subject.size } == 2
-      insist { subject[0]["message"] } == "hello world\n   second line"
-      insist { subject[1]["message"] } == "another first line"
+      insist { subject[0].get("message") } == "hello world\n   second line"
+      insist { subject[1].get("message") } == "another first line"
     end
   end
 
@@ -36,7 +36,7 @@ describe LogStash::Filters::Multiline do
     CONFIG
 
     sample [ "120913 12:04:33 first line", "second line", "third line" ] do
-      insist { subject["message"] } ==  "120913 12:04:33 first line\nsecond line\nthird line"
+      insist { subject.get("message") } ==  "120913 12:04:33 first line\nsecond line\nthird line"
     end
   end
 
@@ -79,10 +79,10 @@ describe LogStash::Filters::Multiline do
       insist { subject.size } == count
 
       subject.each_with_index do |event, i|
-        insist { event["type"] == event["host"] } == true
-        stream = event["type"]
-        insist { event["message"].split("\n").first } =~ /hello world /
-        insist { event["message"].scan(/stream\d/).all?{|word| word == stream} } == true
+        insist { event.get("type") == event.get("host") } == true
+        stream = event.get("type")
+        insist { event.get("message").split("\n").first } =~ /hello world /
+        insist { event.get("message").scan(/stream\d/).all?{|word| word == stream} } == true
       end
     end
   end
@@ -109,8 +109,8 @@ describe LogStash::Filters::Multiline do
       insist { subject.size } == 2
 
       subject.each do |s|
-        insist { s["tags"].include?("nope")  } == true
-        insist { s["tags"].include?("dummy") } == false
+        insist { s.get("tags").include?("nope")  } == true
+        insist { s.get("tags").include?("dummy") } == false
         insist { s.include?("dummy2") } == true
       end
     end
@@ -128,7 +128,7 @@ describe LogStash::Filters::Multiline do
 
     sample [ "  match", "nomatch" ] do
       expect(subject).to be_a(LogStash::Event)
-      insist { subject["message"] } == "  match\nnomatch"
+      insist { subject.get("message") } == "  match\nnomatch"
     end
   end
 
@@ -145,8 +145,8 @@ describe LogStash::Filters::Multiline do
     sample ["  match1", "nomatch1", "  match2", "nomatch2"] do
       expect(subject).to be_a(Array)
       insist { subject.size } == 2
-      insist { subject[0]["message"] } == "  match1\nnomatch1"
-      insist { subject[1]["message"] } == "  match2\nnomatch2"
+      insist { subject[0].get("message") } == "  match1\nnomatch1"
+      insist { subject[1].get("message") } == "  match2\nnomatch2"
     end
   end
 
@@ -163,8 +163,8 @@ describe LogStash::Filters::Multiline do
     sample ["  match1", "  match1", "nomatch1", "  1match2", "  2match2", "  1match2", "nomatch2"] do
       expect(subject).to be_a(Array)
       insist { subject.size } == 2
-      insist { subject[0]["message"] } == "  match1\n  match1\nnomatch1"
-      insist { subject[1]["message"] } == "  1match2\n  2match2\n  1match2\nnomatch2"
+      insist { subject[0].get("message") } == "  match1\n  match1\nnomatch1"
+      insist { subject[1].get("message") } == "  1match2\n  2match2\n  1match2\nnomatch2"
     end
   end
 
@@ -182,8 +182,8 @@ describe LogStash::Filters::Multiline do
     sample ["  match1", "  match1", "nomatch1", "  1match2", "  2match2", "  1match2", "nomatch2"] do
       expect(subject).to be_a(Array)
       insist { subject.size } == 2
-      insist { subject[0]["message"] } == "  match1\nnomatch1"
-      insist { subject[1]["message"] } == "  1match2\n  2match2\nnomatch2"
+      insist { subject[0].get("message") } == "  match1\nnomatch1"
+      insist { subject[1].get("message") } == "  1match2\n  2match2\nnomatch2"
     end
   end
 
@@ -209,9 +209,9 @@ describe LogStash::Filters::Multiline do
     ] do
       expect(subject).to be_a(Array)
       insist { subject.size } == 2
-      insist { subject[0]["foo"] } == "  match1\n  match1\nnomatch1"
-      insist { subject[0]["message"] } == ["bar", "baz"]
-      insist { subject[1]["foo"] } == "  1match2\n  2match2\n  1match2\nnomatch2"
+      insist { subject[0].get("foo") } == "  match1\n  match1\nnomatch1"
+      insist { subject[0].get("message") } == ["bar", "baz"]
+      insist { subject[1].get("foo") } == "  1match2\n  2match2\n  1match2\nnomatch2"
     end
   end
 
@@ -241,7 +241,7 @@ describe LogStash::Filters::Multiline do
     sample messages do
       expect(subject).to be_a(Array)
       insist { subject.size } == 2
-      insist { subject[0]["message"] } == messages[0..-2].join("\n")
+      insist { subject[0].get("message") } == messages[0..-2].join("\n")
     end
   end
 
@@ -260,10 +260,10 @@ describe LogStash::Filters::Multiline do
 
     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")
+      expect(subject[0].get("@metadata")).to include("index"=>"logstash-2015.11.19")
+      expect(subject[1].get("@metadata")).to include("index"=>"logstash-2015.11.19")
+      expect(subject[0].get("@metadata")).to include("type"=>"foo")
+      expect(subject[1].get("@metadata")).to include("type"=>"foo")
     end
   end
 
@@ -281,10 +281,10 @@ describe LogStash::Filters::Multiline do
 
     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")
+      expect(subject[0].get("@metadata")).to include("index"=>"logstash-2015.11.19")
+      expect(subject[1].get("@metadata")).to include("index"=>"logstash-2015.11.19")
+      expect(subject[0].get("@metadata")).to include("type"=>"foo")
+      expect(subject[1].get("@metadata")).to include("type"=>"foo")
     end
   end
 

metadata

@@ -1,86 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: logstash-filter-multiline
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  name: logstash-core-plugin-api
-  prerelease: false
+        version: '2.0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-patterns-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-patterns-core
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: jls-grok
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  name: logstash-filter-mutate
+        version: 0.11.0
+  type: :runtime
   prerelease: false
-  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
+  name: logstash-filter-mutate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
-  name: jls-grok
+        version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   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
+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: []
 extensions: []
@@ -101,7 +103,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: filter
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -116,10 +118,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
-summary: This filter will collapse multiline messages from a single source into one Logstash event.
+summary: This filter will collapse multiline messages from a single source into one
+  Logstash event.
 test_files:
 - spec/filters/multiline_spec.rb