logstash-input-file 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 883903a03fd855b756f8a7b077cc41379e29081d
-  data.tar.gz: 950e3e9103fca2c1e9124c68572de98b3d0635b1
+  metadata.gz: c00455f8bb65b9d802f81ac12c095d0bc1454136
+  data.tar.gz: dd80537404262d563d574e2062fd429364b466f2
 SHA512:
-  metadata.gz: 6a6d8381d79610e31777f9b806572a871c2474902535cc77839a9a89704fc1bf9e5ce75b671324399b4158cf9c85aec7391081e7b8e14b5800f8c2e1755b0e3c
-  data.tar.gz: 409a59b340a74a05c7695898478d5f5eb218165589a7ecd9bc922c032928380980ae85ee812d2e90f9f2560cac5d41c564c9149ea88229d5e1abdb80ea473a43
+  metadata.gz: 605811dd4d4fda955593aeafaab43f5a6a7da1be23f27b8623d9b7db82a2aa0a4c0a8f87123e0223a62247e9e358fe6984e8e78e4e6199ea78426f53f9e005c7
+  data.tar.gz: eae72cf60f9e4608a27351df34e083714a72cf56ba97fd0aeddc61785bd05652ed12fce58fd61109a2bcfa4308a352ff993db9ce97264ad46c1e466118bcf5e8

data/README.md

@@ -13,7 +13,7 @@ Logstash provides infrastructure to automatically generate documentation for thi
 
 ## Need Help?
 
-Need help? Try #logstash on freenode IRC or the logstash-users@googlegroups.com mailing list.
+Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/logstash discussion forum.
 
 ## Developing
 

data/lib/logstash/inputs/file.rb

@@ -25,7 +25,7 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
   # Paths must be absolute and cannot be relative.
   #
   # You may also configure multiple paths. See an example
-  # on the [Logstash configuration page](configuration#array).
+  # on the <<array,Logstash configuration page>>.
   config :path, :validate => :array, :required => true
 
   # Exclusions (matched against the filename, not full path). Globs
@@ -74,6 +74,7 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
     require "filewatch/tail"
     require "digest/md5"
     @logger.info("Registering file input", :path => @path)
+    @host = Socket.gethostname.force_encoding(Encoding::UTF_8)
 
     @tail_config = {
       :exclude => @exclude,
@@ -131,14 +132,14 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
     @tail = FileWatch::Tail.new(@tail_config)
     @tail.logger = @logger
     @path.each { |path| @tail.tail(path) }
-    hostname = Socket.gethostname
 
     @tail.subscribe do |path, line|
       @logger.debug? && @logger.debug("Received line", :path => path, :text => line)
       @codec.decode(line) do |event|
+        event["[@metadata][path]"] = path
+        event["host"] = @host if !event.include?("host")
+        event["path"] = path if !event.include?("path")
         decorate(event)
-        event["host"] = hostname if !event.include?("host")
-        event["path"] = path
         queue << event
       end
     end

data/logstash-input-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-file'
-  s.version         = '0.1.10'
+  s.version         = '0.1.11'
   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"
@@ -24,9 +24,10 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'logstash-codec-plain'
   s.add_runtime_dependency 'addressable'
-  s.add_runtime_dependency 'filewatch', ['>= 0.6.2', '~> 0.6']
+  s.add_runtime_dependency 'filewatch', ['>= 0.6.4', '~> 0.6']
 
   s.add_development_dependency 'stud', ['~> 0.0.19']
   s.add_development_dependency 'logstash-devutils'
+  s.add_development_dependency 'logstash-codec-json'
 end
 

data/spec/inputs/file_spec.rb

@@ -132,4 +132,37 @@ describe "inputs/file" do
     insist { events[1]["message"] } == "bar"
     insist { events[2]["message"] } == "baz"
   end
+
+  it "should not overwrite existing path and host fields" do
+    tmpfile_path = Stud::Temporary.pathname
+    sincedb_path = Stud::Temporary.pathname
+
+    conf = <<-CONFIG
+      input {
+        file {
+          type => "blah"
+          path => "#{tmpfile_path}"
+          start_position => "beginning"
+          sincedb_path => "#{sincedb_path}"
+          delimiter => "#{delimiter}"
+          codec => "json"
+        }
+      }
+    CONFIG
+
+    File.open(tmpfile_path, "w") do |fd|
+      fd.puts('{"path": "my_path", "host": "my_host"}')
+      fd.puts('{"my_field": "my_val"}')
+    end
+
+    events = input(conf) do |pipeline, queue|
+      2.times.collect { queue.pop }
+    end
+
+    insist { events[0]["path"] } == "my_path"
+    insist { events[0]["host"] } == "my_host"
+
+    insist { events[1]["path"] } == "#{tmpfile_path}"
+    insist { events[1]["host"] } == "#{Socket.gethostname.force_encoding(Encoding::UTF_8)}"
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core
@@ -64,7 +64,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.4
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
@@ -72,7 +72,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.6.4
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
@@ -106,6 +106,20 @@ dependencies:
         version: '0'
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: logstash-codec-json
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 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: []
@@ -113,6 +127,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE