fluentd 0.12.9 → 0.12.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 389d806680686ce59ee87528aeb56c6bb3eabe92
-  data.tar.gz: 7756ef8d28122b38f3ded3413a1735f664926117
+  metadata.gz: 1713e75f8506de5f6b0536fad50320386c836d66
+  data.tar.gz: 4b8f4e7728086788c62f2f88b3e45e4ef93d0ccd
 SHA512:
-  metadata.gz: a1e17c1773eb0e805352862b6bc76a051aaa6ff257c5acef32fa244de245d9d67e261824c939187a76b22146c87a288494c9b31e92df176a4f910008f6ef198c
-  data.tar.gz: 07c21ddcdbf4d140e6151d60187b951a909e9269a48f037e18e7f5f43dc5f45cc2a42ea55ac538af1d36d42d0a273acdeed01f4835342163cd6893d7922d1d3b
+  metadata.gz: 72b4a8dd05fc897004a0313a37fcd2d931723a449dee05b8c6682ceba49ac539cad4dec1cd9ca90fae6563fd1a2893d96de2e7df20248014a5f9da6c416afb03
+  data.tar.gz: c6d11c5e0958a43f8edef4a8ff508687291e02749b850c84f88baae3ef1f78bcf84074718e63b681b0da26decf360d4303063381d894d47eff4ea1f185cfcc81

data/ChangeLog

@@ -1,5 +1,14 @@
 # v0.12
 
+## Release 0.12.10 - 2015/05/28
+
+### New features / Enhancement
+
+* filter_record_transformer: add renew_time_key option to replace event time with processed field
+  https://github.com/fluent/fluentd/pull/602
+* config: add config_param `enum` type
+  https://github.com/fluent/fluentd/pull/600
+
 ## Release 0.12.9 - 2015/05/19
 
 ### New features / Enhancement

data/lib/fluent/config/types.rb

@@ -67,6 +67,15 @@ module Fluent
     val
   })
 
+  Configurable.register_type(:enum, Proc.new { |val, opts|
+    s = val.to_sym
+    raise "Plugin BUG: config type 'enum' requires :list argument" unless opts[:list].is_a?(Array)
+    unless opts[:list].include?(s)
+      raise ConfigError, "valid options are #{opts[:list].join(',')} but got #{val}"
+    end
+    s
+  })
+
   Configurable.register_type(:integer, Proc.new { |val, opts|
     val.to_i
   })

data/lib/fluent/plugin/filter_record_transformer.rb

@@ -28,6 +28,7 @@ module Fluent
     config_param :remove_keys, :string, :default => nil
     config_param :keep_keys, :string, :default => nil
     config_param :renew_record, :bool, :default => false
+    config_param :renew_time_key, :string, :default => nil
     config_param :enable_ruby, :bool, :default => false
 
     def configure(conf)
@@ -81,6 +82,9 @@ module Fluent
       es.each do |time, record|
         last_record = record # for debug log
         new_record = reform(time, record, placeholders)
+        if @renew_time_key && new_record.has_key?(@renew_time_key)
+          time = new_record[@renew_time_key].to_i
+        end
         new_es.add(time, new_record)
       end
       new_es

data/lib/fluent/version.rb

@@ -16,6 +16,6 @@
 
 module Fluent
 
-  VERSION = '0.12.9'
+  VERSION = '0.12.10'
 
 end

data/test/config/test_configurable.rb

@@ -16,6 +16,9 @@ module ConfigurableSpec
     config_param :name3, :string, :default => "base1"
     config_param :name4, :string, :default => "base1"
 
+    config_param :opt1, :enum, list: [:foo, :bar, :baz]
+    config_param :opt2, :enum, list: [:foo, :bar, :baz], default: :foo
+
     def get_all
       [@node, @flag1, @flag2, @name1, @name2, @name3, @name4]
     end
@@ -24,8 +27,10 @@ module ConfigurableSpec
   class Base2 < Base1
     config_set_default :name2, "base2"
     config_set_default :name4, "base2"
+    config_set_default :opt1, :bar
     config_param :name5, :string
     config_param :name6, :string, :default => "base2"
+    config_param :opt3, :enum, list: [:a, :b]
 
     def get_all
       ary = super
@@ -34,6 +39,7 @@ module ConfigurableSpec
   end
 
   class Base3 < Base2
+    config_set_default :opt3, :a
     config_section :node do
       config_param :name, :string, :default => "node"
       config_param :type, :string
@@ -56,6 +62,7 @@ module ConfigurableSpec
   end
 
   class Base4 < Base2
+    config_set_default :opt3, :a
     config_section :node, param_name: :nodes do
       config_argument :num, :integer
       config_param :name, :string, :default => "node"
@@ -154,6 +161,8 @@ module Fluent::Config
           assert_nil(obj1.name2)
           assert_equal("base1", obj1.name3)
           assert_equal("base1", obj1.name4)
+          assert_nil(obj1.opt1)
+          assert_equal(:foo, obj1.opt2)
         end
 
         test 'create instance methods and default values overwritten by sub class definition' do
@@ -167,13 +176,15 @@ module Fluent::Config
           assert_equal("base2", obj2.name4)
           assert_nil(obj2.name5)
           assert_equal("base2", obj2.name6)
+          assert_equal(:bar, obj2.opt1)
+          assert_equal(:foo, obj2.opt2)
         end
       end
 
       sub_test_case '#configure' do
         test 'returns configurable object itself' do
           b2 = ConfigurableSpec::Base2.new
-          assert_instance_of(ConfigurableSpec::Base2, b2.configure({"name1" => "t1", "name5" => "t5"}))
+          assert_instance_of(ConfigurableSpec::Base2, b2.configure({"name1" => "t1", "name5" => "t5", "opt3" => "a"}))
         end
 
         test 'raise errors without any specifications for param without defaults' do
@@ -181,35 +192,49 @@ module Fluent::Config
           assert_raise(Fluent::ConfigError) { b2.configure({}) }
           assert_raise(Fluent::ConfigError) { b2.configure({"name1" => "t1"}) }
           assert_raise(Fluent::ConfigError) { b2.configure({"name5" => "t5"}) }
-          assert_nothing_raised { b2.configure({"name1" => "t1", "name5" => "t5"}) }
+          assert_raise(Fluent::ConfigError) { b2.configure({"name1" => "t1", "name5" => "t5"}) }
+          assert_nothing_raised { b2.configure({"name1" => "t1", "name5" => "t5", "opt3" => "a"}) }
 
           assert_equal(["node", false, true, "t1", "base2", "base1", "base2", "t5", "base2"], b2.get_all)
+          assert_equal(:a, b2.opt3)
         end
 
         test 'can configure bool values' do
           b2a = ConfigurableSpec::Base2.new
-          assert_nothing_raised { b2a.configure({"flag1" => "true", "flag2" => "yes", "name1" => "t1", "name5" => "t5"}) }
+          assert_nothing_raised { b2a.configure({"flag1" => "true", "flag2" => "yes", "name1" => "t1", "name5" => "t5", "opt3" => "a"}) }
           assert_true(b2a.flag1)
           assert_true(b2a.flag2)
 
           b2b = ConfigurableSpec::Base2.new
-          assert_nothing_raised { b2b.configure({"flag1" => false, "flag2" => "no", "name1" => "t1", "name5" => "t5"}) }
+          assert_nothing_raised { b2b.configure({"flag1" => false, "flag2" => "no", "name1" => "t1", "name5" => "t5", "opt3" => "a"}) }
           assert_false(b2b.flag1)
           assert_false(b2b.flag2)
         end
 
         test 'overwrites values of defaults' do
           b2 = ConfigurableSpec::Base2.new
-          b2.configure({"name1" => "t1", "name2" => "t2", "name3" => "t3", "name4" => "t4", "name5" => "t5"})
+          b2.configure({"name1" => "t1", "name2" => "t2", "name3" => "t3", "name4" => "t4", "name5" => "t5", "opt1" => "foo", "opt3" => "b"})
           assert_equal("t1", b2.name1)
           assert_equal("t2", b2.name2)
           assert_equal("t3", b2.name3)
           assert_equal("t4", b2.name4)
           assert_equal("t5", b2.name5)
           assert_equal("base2", b2.name6)
+          assert_equal(:foo, b2.opt1)
+          assert_equal(:b, b2.opt3)
 
           assert_equal(["node", false, true, "t1", "t2", "t3", "t4", "t5", "base2"], b2.get_all)
         end
+
+        test 'enum type rejects values which does not exist in list' do
+          default = {"name1" => "t1", "name2" => "t2", "name3" => "t3", "name4" => "t4", "name5" => "t5", "opt1" => "foo", "opt3" => "b"}
+
+          b2 = ConfigurableSpec::Base2.new
+          assert_nothing_raised { b2.configure(default) }
+          assert_raise(Fluent::ConfigError) { b2.configure(default.merge({"opt1" => "bazz"})) }
+          assert_raise(Fluent::ConfigError) { b2.configure(default.merge({"opt2" => "fooooooo"})) }
+          assert_raise(Fluent::ConfigError) { b2.configure(default.merge({"opt3" => "c"})) }
+        end
       end
     end
 

data/test/plugin/test_filter_record_transformer.rb

@@ -92,6 +92,16 @@ class RecordTransformerFilterTest < Test::Unit::TestCase
       end
     end
 
+    test 'renew_time_key' do
+      config = %[renew_time_key message]
+      times = [ Time.local(2,2,3,4,5,2010,nil,nil,nil,nil), Time.local(3,2,3,4,5,2010,nil,nil,nil,nil) ]
+      msgs = times.map{|t| t.to_i.to_s }
+      es = emit(config, msgs)
+      es.each_with_index do |(time, record), i|
+        assert_equal(times[i].to_i, time)
+      end
+    end
+
     test 'keep_keys' do
       config = %[renew_record true\nkeep_keys foo,message]
       msgs = ['1', '2']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluentd
 version: !ruby/object:Gem::Version
-  version: 0.12.9
+  version: 0.12.10
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack