logstash-input-file 3.0.3 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1a1da31999fd39eae3af8288cd69e1b5ec8e298
-  data.tar.gz: b30ffb01fc3683e589c45439cf554e8098c4837b
+  metadata.gz: 16127b68cf7693ca7dc65af0aa126132e81737f7
+  data.tar.gz: 666f96258b9f7aa55396faa30b9da87a854de1a1
 SHA512:
-  metadata.gz: 3e183f58570e3396f7b47bd617e14f897d578898e318b92193116180f29d9e64b8bd0c0310512933e8f60a30c3f6911100778b07fff2fbcc663bfd978e92650e
-  data.tar.gz: 4e395a687436bbc34eee41e5443c702156dab002345bb9bf62a389e60cbd92298ebacd183748b53912c4f86e447f4b0b30bdc24b9487126b8e883d222f03d99b
+  metadata.gz: 33b14b46466bf49bf5c1b93e2a4aa1fc641f222e1028306fbc05dc50ebf81d6f923383cc354991e13e009f8ef811995c983ccfec8ed9d52a60e2df09d5ae9736
+  data.tar.gz: 970228356e309ad40e870edaa05942a4c71d0128dda511120a284ea4b2e824bc61168939e434dd06eb94e69ba861009ff4e07ec58ff88b52f1ebed695bbdf621

data/CHANGELOG.md

@@ -1,6 +1,9 @@
+## 3.1.1
+  - Add host to @metadata
+## 3.1.0
+  - Use native `--path.data` for Logstash 5.0 for sincedb files.
 ## 3.0.3
   - Relax constraint on logstash-core-plugin-api to >= 1.60 <= 2.99
-
 ## 3.0.2
   - relax constrains of `logstash-devutils` see https://github.com/elastic/logstash-devutils/issues/48
 ## 3.0.1

data/CONTRIBUTORS

@@ -18,6 +18,7 @@ Contributors:
 * elliot moore (em295)
 * yjpa7145
 * Guy Boertje (guyboertje)
+* Aaron Mildenstein (untergeek)
 
 Note: If you've sent us patches, bug reports, or otherwise contributed to
 Logstash, and you aren't on the list above and want to be, please let us know

data/lib/logstash/inputs/file.rb

@@ -5,14 +5,18 @@ require "logstash/codecs/identity_map_codec"
 
 require "pathname"
 require "socket" # for Socket.gethostname
+require "fileutils"
 
 # Stream events from files, normally by tailing them in a manner
 # similar to `tail -0F` but optionally reading them from the
 # beginning.
 #
-# By default, each event is assumed to be one line. If you would like
-# to join multiple log lines into one event, you'll want to use the
-# multiline codec or filter.
+# By default, each event is assumed to be one line and a line is
+# taken to be the text before a newline character.
+# Normally, logging will add a newline to the end of each line written.
+
+# If you would like to join multiple log lines into one event,
+# you'll want to use the multiline codec or filter.
 #
 # The plugin aims to track changing files and emit new content as it's
 # appended to each file. It's not well-suited for reading a file from
@@ -170,6 +174,9 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
     require "digest/md5"
     @logger.info("Registering file input", :path => @path)
     @host = Socket.gethostname.force_encoding(Encoding::UTF_8)
+    # This check is Logstash 5 specific.  If the class does not exist, and it
+    # won't in older versions of Logstash, then we need to set it to nil.
+    settings = defined?(LogStash::SETTINGS) ? LogStash::SETTINGS : nil
 
     @tail_config = {
       :exclude => @exclude,
@@ -189,6 +196,17 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
     end
 
     if @sincedb_path.nil?
+      if settings
+        datapath = File.join(settings.get_value("path.data"), "plugins", "inputs", "file")
+        # Ensure that the filepath exists before writing, since it's deeply nested.
+        FileUtils::mkdir_p datapath
+        @sincedb_path = File.join(datapath, ".sincedb_" + Digest::MD5.hexdigest(@path.join(",")))
+      end
+    end
+
+    # This section is going to be deprecated eventually, as path.data will be
+    # the default, not an environment variable (SINCEDB_DIR or HOME)
+    if @sincedb_path.nil? # If it is _still_ nil...
       if ENV["SINCEDB_DIR"].nil? && ENV["HOME"].nil?
         @logger.error("No SINCEDB_DIR or HOME environment variable set, I don't know where " \
                       "to keep track of the files I'm watching. Either set " \
@@ -296,6 +314,7 @@ class LogStash::Inputs::File < LogStash::Inputs::Base
   end # def run
 
   def post_process_this(event)
+    event.set("[@metadata][host]", @host)
     event.set("host", @host) if !event.include?("host")
     decorate(event)
     @queue << event

data/logstash-input-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-file'
-  s.version         = '3.0.3'
+  s.version         = '3.1.1'
   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/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -32,4 +32,3 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'logstash-codec-json'
   s.add_development_dependency 'rspec-sequencing'
 end
-

data/spec/inputs/file_spec.rb

@@ -122,9 +122,11 @@ describe LogStash::Inputs::File do
 
       insist { events[0].get("path") } == "my_path"
       insist { events[0].get("host") } == "my_host"
+      insist { events[0].get("[@metadata][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)}"
+      insist { events[1].get("[@metadata][host]") } == "#{Socket.gethostname.force_encoding(Encoding::UTF_8)}"
     end
 
     context "when sincedb_path is an existing directory" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-file
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.6.3
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Stream events from files.