logstash-input-file 2.2.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b08ba5dcdcb6b7695331850fe4c478d3089f5276
-  data.tar.gz: 459dcf5f4560dd3b615053e01ef41f58843f41d9
+  metadata.gz: 48cd489f4a3acfa558adc96df81f70df1cac3dfa
+  data.tar.gz: 1565a08c4319d90e7131defaf9e7e8587417dd40
 SHA512:
-  metadata.gz: 8b9de83e83db04bdada20cbcda87b70684c415265be0ace34459d84cbe7d98ab69e742455e6c6d3a9ab3485ec46ea0f4d46d270bb95e2e42979fac90032727b2
-  data.tar.gz: f7cf50850949e25db1044402159446fdd410a57fb318c111308aa4171d3d7d9899612a0f5fc8d749ed204a0f3819295178ec9ae3a98067a0266923125913afe1
+  metadata.gz: c47a692eed6fb0b76a8934069fc5fc5a9876999be0e65ac5327cdd233a2053ee114d041002444c63fc1a35df6c08db1145336633a4cec509121220ec599f2887
+  data.tar.gz: 2bfd9936dbe9c65e13846d25eb418e0a8b3d1d2060ad64f2e81ebe9bcbfa7b5e843409e6ae04f9a6e14e5045d723143237d97a8df56a72a1c316fc85499dcd1c

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

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
+
+# 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

@@ -3,7 +3,7 @@ Travis Build
 [![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-file.svg)](https://travis-ci.org/logstash-plugins/logstash-input-file)
 
 Jenkins Build
-[![Build Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-file-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-file-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-file.svg)](https://travis-ci.org/logstash-plugins/logstash-input-file)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -58,7 +58,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
@@ -76,7 +81,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/inputs/file.rb

@@ -251,8 +251,8 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
     end
 
     def process_event(event)
-      event["[@metadata][path]"] = path
-      event["path"] = path if !event.include?("path")
+      event.set("[@metadata][path]", path)
+      event.set("path", path) if !event.include?("path")
       input.post_process_this(event)
     end
 
@@ -296,7 +296,7 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
   end # def run
 
   def post_process_this(event)
-    event["host"] = @host if !event.include?("host")
+    event.set("host", @host) if !event.include?("host")
     decorate(event)
     @queue << event
   end

data/logstash-input-file.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-file'
-  s.version         = '2.2.5'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Stream events from files."
-  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" => "input" }
 
   # 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-codec-plain'
   s.add_runtime_dependency 'addressable'

data/spec/inputs/file_spec.rb

@@ -45,8 +45,8 @@ describe LogStash::Inputs::File do
         2.times.collect { queue.pop }
       end
 
-      insist { events[0]["message"] } == "hello"
-      insist { events[1]["message"] } == "world"
+      insist { events[0].get("message") } == "hello"
+      insist { events[1].get("message") } == "world"
     end
 
     it "should restarts at the sincedb value" do
@@ -74,8 +74,8 @@ describe LogStash::Inputs::File do
         2.times.collect { queue.pop }
       end
 
-      insist { events[0]["message"] } == "hello3"
-      insist { events[1]["message"] } == "world3"
+      insist { events[0].get("message") } == "hello3"
+      insist { events[1].get("message") } == "world3"
 
       File.open(tmpfile_path, "a") do |fd|
         fd.puts("foo")
@@ -88,9 +88,9 @@ describe LogStash::Inputs::File do
         3.times.collect { queue.pop }
       end
 
-      insist { events[0]["message"] } == "foo"
-      insist { events[1]["message"] } == "bar"
-      insist { events[2]["message"] } == "baz"
+      insist { events[0].get("message") } == "foo"
+      insist { events[1].get("message") } == "bar"
+      insist { events[2].get("message") } == "baz"
     end
 
     it "should not overwrite existing path and host fields" do
@@ -120,11 +120,11 @@ describe LogStash::Inputs::File do
         2.times.collect { queue.pop }
       end
 
-      insist { events[0]["path"] } == "my_path"
-      insist { events[0]["host"] } == "my_host"
+      insist { events[0].get("path") } == "my_path"
+      insist { events[0].get("host") } == "my_host"
 
-      insist { events[1]["path"] } == "#{tmpfile_path}"
-      insist { events[1]["host"] } == "#{Socket.gethostname.force_encoding(Encoding::UTF_8)}"
+      insist { events[1].get("path") } == "#{tmpfile_path}"
+      insist { events[1].get("host") } == "#{Socket.gethostname.force_encoding(Encoding::UTF_8)}"
     end
 
     context "when sincedb_path is an existing directory" do
@@ -189,15 +189,15 @@ describe LogStash::Inputs::File do
 
         event1 = events[0]
         expect(event1).not_to be_nil
-        expect(event1["path"]).to eq tmpfile_path
-        expect(event1["@metadata"]["path"]).to eq tmpfile_path
-        expect(event1["message"]).to eq "hello"
+        expect(event1.get("path")).to eq tmpfile_path
+        expect(event1.get("[@metadata][path]")).to eq tmpfile_path
+        expect(event1.get("message")).to eq "hello"
 
         event2 = events[1]
         expect(event2).not_to be_nil
-        expect(event2["path"]).to eq tmpfile_path
-        expect(event2["@metadata"]["path"]).to eq tmpfile_path
-        expect(event2["message"]).to eq "world"
+        expect(event2.get("path")).to eq tmpfile_path
+        expect(event2.get("[@metadata][path]")).to eq tmpfile_path
+        expect(event2.get("message")).to eq "world"
       end
     end
 
@@ -312,18 +312,18 @@ describe LogStash::Inputs::File do
           .then_after(0.2 , "stop flushes both events") do
             expect(events.size).to eq(2)
             e1, e2 = events
-            e1_message = e1["message"]
-            e2_message = e2["message"]
+            e1_message = e1.get("message")
+            e2_message = e2.get("message")
 
             # can't assume File A will be read first
             if e1_message.start_with?('line1.1-of-z')
-              expect(e1["path"]).to match(/z.log/)
-              expect(e2["path"]).to match(/A.log/)
+              expect(e1.get("path")).to match(/z.log/)
+              expect(e2.get("path")).to match(/A.log/)
               expect(e1_message).to eq("line1.1-of-z#{FILE_DELIMITER}  line1.2-of-z#{FILE_DELIMITER}  line1.3-of-z")
               expect(e2_message).to eq("line1.1-of-a#{FILE_DELIMITER}  line1.2-of-a#{FILE_DELIMITER}  line1.3-of-a")
             else
-              expect(e1["path"]).to match(/A.log/)
-              expect(e2["path"]).to match(/z.log/)
+              expect(e1.get("path")).to match(/A.log/)
+              expect(e2.get("path")).to match(/z.log/)
               expect(e1_message).to eq("line1.1-of-a#{FILE_DELIMITER}  line1.2-of-a#{FILE_DELIMITER}  line1.3-of-a")
               expect(e2_message).to eq("line1.1-of-z#{FILE_DELIMITER}  line1.2-of-z#{FILE_DELIMITER}  line1.3-of-z")
             end
@@ -347,7 +347,7 @@ describe LogStash::Inputs::File do
             end
             .then_after(0.75, "wait for auto_flush") do
               e1 = events.first
-              e1_message = e1["message"]
+              e1_message = e1.get("message")
               expect(e1["path"]).to match(/a.log/)
               expect(e1_message).to eq("line1.1-of-a#{FILE_DELIMITER}  line1.2-of-a#{FILE_DELIMITER}  line1.3-of-a")
             end
@@ -443,11 +443,11 @@ describe LogStash::Inputs::File do
               e1, e2 = events
               if Dir.glob("#{tmpdir_path}/*.log").first =~ %r{a\.log}
                 #linux and OSX have different retrieval order
-                expect(e1["message"]).to eq("line1-of-a")
-                expect(e2["message"]).to eq("line2-of-a")
+                expect(e1.get("message")).to eq("line1-of-a")
+                expect(e2.get("message")).to eq("line2-of-a")
               else
-                expect(e1["message"]).to eq("line1-of-z")
-                expect(e2["message"]).to eq("line2-of-z")
+                expect(e1.get("message")).to eq("line1-of-z")
+                expect(e2.get("message")).to eq("line2-of-z")
               end
             end
           subject.run(events)
@@ -484,10 +484,10 @@ describe LogStash::Inputs::File do
               else
                 e3, e4, e1, e2 = events
               end
-              expect(e1["message"]).to eq("line1-of-a")
-              expect(e2["message"]).to eq("line2-of-a")
-              expect(e3["message"]).to eq("line1-of-z")
-              expect(e4["message"]).to eq("line2-of-z")
+              expect(e1.get("message")).to eq("line1-of-a")
+              expect(e2.get("message")).to eq("line2-of-a")
+              expect(e3.get("message")).to eq("line1-of-z")
+              expect(e4.get("message")).to eq("line2-of-z")
             end
             .then_after(0.1, "stop") do
               subject.stop
@@ -497,7 +497,6 @@ describe LogStash::Inputs::File do
           actions.value
         end
       end
-
     end
   end
 end

metadata

@@ -1,58 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 2.2.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-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: addressable
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: filewatch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -61,9 +62,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-  name: filewatch
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,76 +73,78 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-multiline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.7
-  name: logstash-codec-multiline
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.7
 - !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.19
-  name: stud
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.19
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.18
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.18
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rspec-sequencing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rspec-sequencing
-  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: []
@@ -164,7 +166,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -179,9 +181,9 @@ 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: Stream events from files.
 test_files: