logstash-codec-multiline 2.0.11 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fa091e50351d0e7fb46e32ec8803dd0905f7f50
-  data.tar.gz: b1c57cbd3a6769b7273902a81db670b4e510d261
+  metadata.gz: 38784ad7511d623d2bd6987582d81e62ecd9ab6f
+  data.tar.gz: d4333af39a5b897b3cc8cad99cf3d8d1c0b98cfb
 SHA512:
-  metadata.gz: e479d0549e35acd7518e9b2645e513d2380918e747a1ec164a5013fba0ca085cd4f97064c851ec3aeb9f988e4ebcd0cfe1863d5a31a9bc48bc1ed88e1b04992f
-  data.tar.gz: c0df158f95ee6722185a58c6684b0bdaa77c3353bde2b2a77b70f32d2cc708b5c463812bab6e8e7cba622c81f5ef3ea58939e746ad3cd79ae385124d7fc09392
+  metadata.gz: 285ec4be2b5d46f4a572f35a9fe827945d5e6f7377f838ad7294d92b60bb7f9227f363c435e1ca92c17e250359312e61ddcfbf5c38597dc2d1eb2cb870613bc6
+  data.tar.gz: ff644bc901b1753fe612763b711d1c810d781ef1b4f48ebea91d83f9f3d123f38d6da22f68d0fed124ca578bc85e2a70a7b4000a9db91f6987a7c0e7b6bc65b9

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.11
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
 # 2.0.10

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%20Codecs/job/logstash-plugin-codec-multiline-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Codecs/job/logstash-plugin-codec-multiline-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-codec-multiline.svg)](https://travis-ci.org/logstash-plugins/logstash-codec-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/logstash-codec-multiline.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-codec-multiline'
-  s.version         = '2.0.11'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "The multiline codec will collapse multiline messages and merge them into a single 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,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "codec" }
 
   # 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_runtime_dependency 'jls-grok', '~> 0.11.1'

data/spec/codecs/identity_map_codec_spec.rb

@@ -237,14 +237,14 @@ describe LogStash::Codecs::IdentityMapCodec do
           sleep 0.6 # wait for auto_flush - in multiples of 0.5 plus 0.1
           expect(queue.size).to eq(3)
           e1, e2, e3 = queue
-          expect(e1["path"]).to eq("stream1")
-          expect(e1["message"]).to eq("foo")
+          expect(e1.get("path")).to eq("stream1")
+          expect(e1.get("message")).to eq("foo")
 
-          expect(e2["path"]).to eq("stream2")
-          expect(e2["message"]).to eq("bar")
+          expect(e2.get("path")).to eq("stream2")
+          expect(e2.get("message")).to eq("bar")
 
-          expect(e3["path"]).to eq("stream3")
-          expect(e3["message"]).to eq("baz")
+          expect(e3.get("path")).to eq("stream3")
+          expect(e3.get("message")).to eq("baz")
           expect(imc.identity_count).to eq(3)
         end
       end
@@ -255,7 +255,7 @@ describe LogStash::Codecs::IdentityMapCodec do
         it "flushes and removes the identity" do
           expect(imc.identity_count).to eq(1)
           imc.evict(identity)
-          expect(queue[0]["message"]).to eq("foo")
+          expect(queue[0].get("message")).to eq("foo")
           expect(imc.identity_count).to eq(0)
         end
       end

data/spec/codecs/multiline_spec.rb

@@ -29,10 +29,10 @@ describe LogStash::Codecs::Multiline do
       codec.flush { |e| events << e }
 
       expect(events.size).to eq(2)
-      expect(events[0]["message"]).to eq "hello world\n   second line"
-      expect(events[0]["tags"]).to include("multiline")
-      expect(events[1]["message"]).to eq "another first line"
-      expect(events[1]["tags"]).to be_nil
+      expect(events[0].get("message")).to eq "hello world\n   second line"
+      expect(events[0].get("tags")).to include("multiline")
+      expect(events[1].get("message")).to eq "another first line"
+      expect(events[1].get("tags")).to be_nil
     end
 
     it "should allow custom tag added to multiline events" do
@@ -42,8 +42,8 @@ describe LogStash::Codecs::Multiline do
       codec.flush { |e| events << e }
 
       expect(events.size).to eq 2
-      expect(events[0]["tags"]).to include("hurray")
-      expect(events[1]["tags"]).to be_nil
+      expect(events[0].get("tags")).to include("hurray")
+      expect(events[1].get("tags")).to be_nil
     end
 
     it "should handle new lines in messages" do
@@ -54,8 +54,8 @@ describe LogStash::Codecs::Multiline do
         codec.decode(line) {|evt| events.push(evt)}
       end
       codec.flush { |e| events << e }
-      expect(events[0]["message"]).to eq "1234567890\nA234567890\nB234567890"
-      expect(events[1]["message"]).to eq "0987654321"
+      expect(events[0].get("message")).to eq "1234567890\nA234567890\nB234567890"
+      expect(events[1].get("message")).to eq "0987654321"
     end
 
     it "should allow grok patterns to be used" do
@@ -71,7 +71,7 @@ describe LogStash::Codecs::Multiline do
       codec.flush { |e| events << e }
 
       insist { events.size } == 1
-      insist { events.first["message"] } == lines.join("\n")
+      insist { events.first.get("message") } == lines.join("\n")
     end
 
     context "using default UTF-8 charset" do
@@ -88,8 +88,8 @@ describe LogStash::Codecs::Multiline do
         expect(events.size).to eq 2
 
         events.zip(lines).each do |tuple|
-          expect(tuple[0]["message"]).to eq tuple[1]
-          expect(tuple[0]["message"].encoding.name).to eq "UTF-8"
+          expect(tuple[0].get("message")).to eq tuple[1]
+          expect(tuple[0].get("message").encoding.name).to eq "UTF-8"
         end
       end
 
@@ -106,8 +106,8 @@ describe LogStash::Codecs::Multiline do
         expect(events.size).to eq 2
 
         events.zip(lines).each do |tuple|
-          expect(tuple[0]["message"]).to eq tuple[1].inspect[1..-2]
-          expect(tuple[0]["message"].encoding.name).to eq "UTF-8"
+          expect(tuple[0].get("message")).to eq tuple[1].inspect[1..-2]
+          expect(tuple[0].get("message").encoding.name).to eq "UTF-8"
         end
       end
     end
@@ -134,8 +134,8 @@ describe LogStash::Codecs::Multiline do
 
         events.zip(samples.map{|(a, b)| b}).each do |tuple|
           expect(tuple[1].encoding.name).to eq "UTF-8"
-          expect(tuple[0]["message"]).to eq tuple[1]
-          expect(tuple[0]["message"].encoding.name).to eq "UTF-8"
+          expect(tuple[0].get("message")).to eq tuple[1]
+          expect(tuple[0].get("message").encoding.name).to eq "UTF-8"
         end
       end
     end
@@ -160,8 +160,8 @@ describe LogStash::Codecs::Multiline do
 
         events.zip(samples.map{|(a, b)| b}).each do |tuple|
           expect(tuple[1].encoding.name).to eq "UTF-8"
-          expect(tuple[0]["message"]).to eq tuple[1]
-          expect(tuple[0]["message"].encoding.name).to eq "UTF-8"
+          expect(tuple[0].get("message")).to eq tuple[1]
+          expect(tuple[0].get("message").encoding.name).to eq "UTF-8"
         end
       end
 
@@ -172,7 +172,7 @@ describe LogStash::Codecs::Multiline do
     let(:random_number_of_events) { rand(300..1000) }
     let(:sample_event) { "- Sample event" }
     let(:events) { decode_events }
-    let(:unmerged_events_count) { events.collect { |event| event["message"].split(LogStash::Codecs::Multiline::NL).size }.inject(&:+) }
+    let(:unmerged_events_count) { events.collect { |event| event.get("message").split(LogStash::Codecs::Multiline::NL).size }.inject(&:+) }
 
     context "break on maximum_lines" do
       let(:max_lines) { rand(10..100) }
@@ -190,7 +190,7 @@ describe LogStash::Codecs::Multiline do
       end
 
       it "tags the event" do
-        expect(events.first["tags"]).to include("multiline_codec_max_lines_reached")
+        expect(events.first.get("tags")).to include("multiline_codec_max_lines_reached")
       end
     end
 
@@ -210,7 +210,7 @@ describe LogStash::Codecs::Multiline do
       end
 
       it "tags the event" do
-        expect(events.first["tags"]).to include("multiline_codec_max_bytes_reached")
+        expect(events.first.get("tags")).to include("multiline_codec_max_bytes_reached")
       end
     end
   end

data/spec/supports/helpers.rb

@@ -33,7 +33,7 @@ module Mlc
     end
 
     def process_event(event)
-      event["path"] = path
+      event.set("path", path)
       @queue << event
     end
 
@@ -129,10 +129,10 @@ end
 
 RSpec::Matchers.define(:match_path_and_line) do |path, line|
   match do |actual|
-    actual["path"] == path && actual["message"] == line.join($/)
+    actual.get("path") == path && actual.get("message") == line.join($/)
   end
 
   failure_message do
-    "Expecting #{actual['path']} to equal `#{path}` and #{actual["message"]} to equal #{line.join($/)}"
+    "Expecting #{actual.get('path')} to equal `#{path}` and #{actual.get("message")} to equal #{line.join($/)}"
   end
 end

metadata

@@ -1,72 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: logstash-codec-multiline
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  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.11.1
-  name: jls-grok
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.1
 - !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: []
@@ -93,7 +95,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: codec
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -108,11 +110,12 @@ 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: The multiline codec will collapse multiline messages and merge them into a single event.
+summary: The multiline codec will collapse multiline messages and merge them into
+  a single event.
 test_files:
 - spec/codecs/auto_flush_spec.rb
 - spec/codecs/identity_map_codec_spec.rb