fluentd 0.12.6 → 0.12.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c985cc764cdbd2bf187c6bc753ab848872903cb7
-  data.tar.gz: 38415f2aee1237c4b47a42bd2b5b0dfa5badee39
+  metadata.gz: 34615d5421761b2b42cd9831d2d87a96ac401b9d
+  data.tar.gz: 49ba7a22424ee071c07c166e35a5bff49720327b
 SHA512:
-  metadata.gz: 34944adc24897e3ef75b1abeecd0561ef75aa5d44db6f0d40f4aa248e9d0fb9b4610d7f00724e3b5f22a693ec55217c8288e01c5a7bfb204182f11cbf8bc181a
-  data.tar.gz: 96a843e248cefc58c1246f65f5a316fc8ff7f8d05b7d0fe55a63f4b676674dccae49397c752b17dea4ec8aff5fd3be00247c562d40ab06cbf884318e21eea723
+  metadata.gz: d71f71d6e0f4267836f6f683698a9dbe12c5447dd95a19a1a251bde03e058913a6b32de0a7bdad98783efb198660cf5a5dfebe76ec5e60ebf19d698654ded6b6
+  data.tar.gz: 6a09feb33ef26f30c0901d3f0e2e6b046d4a837b1679c69b7c87abf12f2de2cd5ce3a88ff86a220c81ee5a0e0cd8fcb5aea9d9899aa6b757be24ee79d63df2a3

data/.gitignore

@@ -20,3 +20,4 @@ test/tmp/*
 test/config/tmp/*
 make_dist.sh
 Gemfile.local
+.ruby-version

data/.travis.yml

@@ -16,6 +16,7 @@ branches:
   only:
     - master
     - v0.10
+    - v0.14
 
 gemfile:
   - Gemfile

data/ChangeLog

@@ -1,5 +1,15 @@
 # v0.12
 
+## Release 0.12.7 - 2015/03/22
+
+### New features / Enhancement
+
+* in_tail: Add exclude_path option to support exclusion of files
+  https://github.com/fluent/fluentd/pull/561
+* filter_record_transformer: Support placeholders in record keys
+  https://github.com/fluent/fluentd/pull/558
+
+
 ## Release 0.12.6 - 2015/03/03
 
 ### Bug fixes

data/lib/fluent/plugin/filter_record_transformer.rb

@@ -108,27 +108,29 @@ module Fluent
 
       new_record = @renew_record ? {} : record.dup
       @keep_keys.each {|k| new_record[k] = record[k]} if @keep_keys and @renew_record
-      @map.each_pair {|k, v| new_record[k] = interpolate(v)}
+      new_record.merge!(expand_placeholders(@map))
       @remove_keys.each {|k| new_record.delete(k) } if @remove_keys
 
       new_record
     end
 
-    def interpolate(value)
+    def expand_placeholders(value)
       if value.is_a?(String)
-        value = @placeholder_expander.expand(value)
+        new_value = @placeholder_expander.expand(value)
       elsif value.is_a?(Hash)
         new_value = {}
         value.each_pair do |k, v|
-          new_value[@placeholder_expander.expand(k)] = interpolate(v)
+          new_value[@placeholder_expander.expand(k)] = expand_placeholders(v)
         end
-        value = new_value
       elsif value.is_a?(Array)
+        new_value = []
         value.each_with_index do |v, i|
-          value[i] = interpolate(v)
+          new_value[i] = expand_placeholders(v)
         end
+      else
+        new_value = value
       end
-      value
+      new_value
     end
 
     def tag_prefix(tag_parts)

data/lib/fluent/plugin/in_tail.rb

@@ -26,6 +26,7 @@ module Fluent
 
     config_param :path, :string
     config_param :tag, :string
+    config_param :exclude_path, :array, :default => []
     config_param :rotate_wait, :time, :default => 5
     config_param :pos_file, :string, :default => nil
     config_param :read_from_head, :bool, :default => false
@@ -99,6 +100,8 @@ module Fluent
     def expand_paths
       date = Time.now
       paths = []
+
+      excluded = @exclude_path.map { |path| path = date.strftime(path); path.include?('*') ? Dir.glob(path) : path }.flatten.uniq
       @paths.each { |path|
         path = date.strftime(path)
         if path.include?('*')
@@ -108,7 +111,7 @@ module Fluent
           paths << path
         end
       }
-      paths
+      paths - excluded
     end
 
     # in_tail with '*' path doesn't check rotation file equality at refresh phase.

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.6'
+  VERSION = '0.12.7'
 
 end

data/test/plugin/test_filter_record_transformer.rb

@@ -271,6 +271,7 @@ class RecordTransformerFilterTest < Test::Unit::TestCase
           assert_equal({"hostname" => @hostname, "tag" => @tag, "#{@tag}" => 100}, r['hash_field'])
         end
       end
+
       test "array values with placeholders with enable_ruby #{enable_ruby}" do
         config = %[
           enable_ruby #{enable_ruby}
@@ -284,6 +285,7 @@ class RecordTransformerFilterTest < Test::Unit::TestCase
           assert_equal([@hostname, @tag], r['array_field'])
         end
       end
+
       test "array and hash values with placeholders with enable_ruby #{enable_ruby}" do
         config = %[
           enable_ruby #{enable_ruby}
@@ -297,6 +299,22 @@ class RecordTransformerFilterTest < Test::Unit::TestCase
           assert_equal([{"tag" => @tag}], r['mixed_field'])
         end
       end
+
+      test "keys with placeholders with enable_ruby #{enable_ruby}" do
+        config = %[
+          enable_ruby #{enable_ruby}
+          renew_record true
+          <record>
+            ${hostname} hostname
+            foo.${tag}  tag
+          </record>
+        ]
+        msgs = ['1', '2']
+        es = emit(config, msgs)
+        es.each_with_index do |(t, r), i|
+          assert_equal({@hostname=>'hostname',"foo.#{@tag}"=>'tag'}, r)
+        end
+      end
     end
 
     test 'unknown placeholder (enable_ruby no)' do

data/test/plugin/test_in_tail.rb

@@ -389,6 +389,11 @@ class TailInputTest < Test::Unit::TestCase
       timeclass.should_receive(:now).with_no_args.and_return(Time.new(2010, 1, 2, 3, 4, 5))
       assert_equal EX_PATHS, plugin.expand_paths.sort
     end
+
+    # Test exclusion
+    exclude_config = EX_CONFIG + "  exclude_path [\"#{EX_PATHS.last}\"]"
+    plugin = create_driver(exclude_config, false).instance
+    assert_equal EX_PATHS - [EX_PATHS.last], plugin.expand_paths.sort
   end
 
   def test_refresh_watchers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.6
+  version: 0.12.7
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack