logstash-output-file 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1fa1cc00c32419d9b7d6335913705b6ffe0c673
-  data.tar.gz: 75abc303447f376a214762c8640c4fb5826c3830
+  metadata.gz: 76aac0c5cc726eb75e9e861aae50fc240a965449
+  data.tar.gz: c6096e0f9f1bdbac7c1a604922ae8edf704a8bec
 SHA512:
-  metadata.gz: 78343ff70e99a692d5a7a53fbf5ad33b63d1207a1a15dbcd690bc8036cb5a77d56ff3f227bffa32a52d8fa5705e0b2f383415bd33dddc6a2dad4066a2d08052b
-  data.tar.gz: 4b54dc359fa1b42b176d8ad45fdb2eee2c0e304563a1d52a80a82d958e70857f9b84103b99718a9a8fee0050a48a3a292dc451499cda6de62c09ac9c95e1e85f
+  metadata.gz: 7eb2b5b22b9eca84937fd2841206f7fcfa3328a24cd61bc3ed84c697c5b1aca8650c88d95f409915cad0b14d6716e6a5091991686175a46efc2fcf5776350ef1
+  data.tar.gz: 845be053f7c8e8a79caec2060d3b8d8b601d5676bcd7a55563e1f18775d8cb1a47621b2b0f6a86d183574b0e4e1ed0b074d1013d9b24a68c4d802ccf738da02c

data/lib/logstash/outputs/file.rb

@@ -7,6 +7,7 @@ require "zlib"
 # This output will write events to files on disk. You can use fields
 # from the event as parts of the filename and/or path.
 class LogStash::Outputs::File < LogStash::Outputs::Base
+  FIELD_REF = /%\{[^}]+\}/
 
   config_name "file"
   milestone 2
@@ -78,7 +79,7 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
   def validate_path
     root_directory = @path.split(File::SEPARATOR).select { |item| !item.empty? }.shift
 
-    if (root_directory =~ /%\{[^}]+\}/) != nil
+    if (root_directory =~ FIELD_REF) != nil
       @logger.error("File: The starting part of the path should not be dynamic.", :path => @path)
       raise LogStash::ConfigurationError.new("The starting part of the path should not be dynamic.")
     end
@@ -126,7 +127,7 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
 
   private
   def path_with_field_ref?
-    path =~ /%\{[^}]+\}/
+    path =~ FIELD_REF
   end
 
   def format_message(event)
@@ -138,8 +139,8 @@ class LogStash::Outputs::File < LogStash::Outputs::Base
   end
 
   def extract_file_root
-    extracted_path = File.expand_path(path.gsub(/%{.+/, ''))
-    Pathname.new(extracted_path).expand_path
+    parts = File.expand_path(path).split(File::SEPARATOR)
+    parts.take_while { |part| part !~ FIELD_REF }.join(File::SEPARATOR)
   end
 
   def teardown

data/logstash-output-file.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-file'
-  s.version         = '0.1.1'
+  s.version         = '0.1.2'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "This output will write events to files on disk"
   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"

data/spec/outputs/file_spec.rb

@@ -186,6 +186,44 @@ describe LogStash::Outputs::File do
           end
         end
 
+        it 'write the events to a file when some part of a folder or file is dynamic' do
+          t = Time.now
+          good_event = LogStash::Event.new("@timestamp" => t)
+
+          Stud::Temporary.directory do |path|
+            dynamic_path = "#{path}/failed_syslog-%{+YYYY-MM-dd}"
+            expected_path = "#{path}/failed_syslog-#{t.strftime("%Y-%m-%d")}"
+
+            config = { "path" => dynamic_path }
+            output = LogStash::Outputs::File.new(config)
+            output.register
+            output.receive(good_event)
+
+            expect(File.exist?(expected_path)).to eq(true)
+          end
+        end
+
+        it 'write the events to the generated path containing multiples fieldref' do
+          t = Time.now
+          good_event = LogStash::Event.new("error" => 42,
+                                           "@timestamp" => t,
+                                           "level" => "critical",
+                                           "weird_path" => '/inside/../deep/nested')
+
+          Stud::Temporary.directory do |path|
+            dynamic_path = "#{path}/%{error}/%{level}/%{weird_path}/failed_syslog-%{+YYYY-MM-dd}"
+            expected_path = "#{path}/42/critical/deep/nested/failed_syslog-#{t.strftime("%Y-%m-%d")}"
+
+            config = { "path" => dynamic_path }
+
+            output = LogStash::Outputs::File.new(config)
+            output.register
+            output.receive(good_event)
+
+            expect(File.exist?(expected_path)).to eq(true)
+          end
+        end
+
         it 'write the event to the generated filename with multiple deep' do
           good_event = LogStash::Event.new
           good_event['error'] = '/inside/errors/42.txt'

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-file
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Elasticsearch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
+  name: logstash
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -19,10 +20,7 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,34 +28,36 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 2.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: logstash-input-generator
+  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'
-  name: logstash-input-generator
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
   prerelease: false
   type: :development
-  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
 email: info@elasticsearch.com
 executables: []