fluent-plugin-map 0.0.2 → 0.0.3

data/README.markdown

@@ -30,3 +30,16 @@ This sample config output code file and time file.
 The parameter "map" can use 3 variables in event log; tag, time, record. The format of time is an integer number of seconds since the Epoch. The format of record is hash.
 The config file parses # as the begin of comment. So the "map" value cannot use #{tag} operation.
 This plugin can output multi logs by seting multi to true.
+
+If you don't use multi option, you can use key, time, record parameter. The 2 following match directive is same:
+
+    <match tag>
+      type map
+      map ["code." + tag, time, {"code" => record["code"].to_i}]
+    </match>
+    <match tag>
+      type map
+      tag "code." + tag
+      time time
+      record {"code" => record["code"].to_i}
+    </match>

data/fluent-plugin-map.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-map"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Kohei Tomita"]
   s.email       = ["tommy.fmale@gmail.com"]
   s.homepage    = "https://github.com/tomity/fluent-plugin-map"

data/lib/fluent/plugin/out_map.rb

@@ -3,23 +3,43 @@ module Fluent
   class MapOutput < Fluent::Output
     Fluent::Plugin.register_output('map', self)
 
-    config_param :map, :string
+    config_param :map, :string, :default => nil
+    config_param :key, :string, :default => nil
+    config_param :time, :string, :default => nil
+    config_param :record, :string, :default => nil
     config_param :multi, :bool, :default => false
 
     def configure(conf)
       super
-      $log.debug { "map: #{@map}" }
+      if @map
+        $log.debug { "map: #{@map}" }
+        @mode = "tuple"
+      elsif @key && @time && @record
+        raise ConfigError, "multi and 3 parameters(key, time, and record) are not compatible" if @multi
+        $log.debug { "key: #{@key}, time: #{@time}, record: #{@record}" }
+        @mode = "each"
+      else
+        raise ConfigError, "Either map or 3 parameters(key, time, and record) is required "
+      end
     end
 
     def emit(tag, es, chain)
       begin
         tuples = []
         es.each {|time, record|
-          new_tuple = eval(@map)
-          if @multi
-            tuples.concat new_tuple
-          else
-            tuples << new_tuple
+          case @mode
+          when "tuple"
+            new_tuple = eval(@map)
+            if @multi
+              tuples.concat new_tuple
+            else
+              tuples << new_tuple
+            end
+          when "each"
+            new_key = eval(@key)
+            new_time = eval(@time)
+            new_record = eval(@record)
+            tuples << [new_key, new_time, new_record]
           end
         }
         tuples.each do |tag, time, record|
@@ -33,7 +53,7 @@ module Fluent
         tuples
       rescue SyntaxError => e
         chain.next
-        $log.error "Select_if command is syntax error: #{@map}"
+        $log.error "map command is syntax error: #{@map}"
         e #for test
       end
     end

data/test/plugin/test_out_map.rb

@@ -79,4 +79,79 @@ class MapOutputTest < Test::Unit::TestCase
     e =  d1.instance.emit(tag, es, chain)
     assert e.kind_of?(SyntaxError)
   end
+
+  def test_tag_convert_using_key_time_record
+    tag = 'tag'
+    time = Time.local(2012, 10, 10, 10, 10, 10)
+    record = {'code' => '300'}
+
+    d1 = create_driver %[
+      key "newtag"
+      time time
+      record record
+    ], tag
+    d1.run do
+      d1.emit(record, time)
+    end
+    emits = d1.emits
+    assert_equal 1, emits.length
+    assert_equal ["newtag", time.to_i, record], emits[0]
+  end
+
+  def test_config_error_key
+    tag = "tag"
+    time = Time.local(2012, 10, 10, 10, 10, 0)
+    record = {'code' => '300'}
+
+    #require time
+    assert_raise(Fluent::ConfigError){
+      create_driver %[
+        time time
+        record record
+      ], tag
+    }
+  end
+
+  def test_config_error_time
+    tag = "tag"
+    record = {'code' => '300'}
+
+    #require time
+    assert_raise(Fluent::ConfigError){
+      create_driver %[
+        key "newtag"
+        record record
+      ], tag
+    }
+  end
+
+  def test_config_error_record
+    tag = "tag"
+    time = Time.local(2012, 10, 10, 10, 10, 0)
+
+    #require record
+    assert_raise(Fluent::ConfigError){
+      create_driver %[
+        key "newtag"
+        time time
+      ], tag
+    }
+  end
+
+  def test_config_error_multi
+    tag = "tag"
+    time = Time.local(2012, 10, 10, 10, 10, 0)
+    time = Time.local(2012, 10, 10, 10, 10, 0)
+    record = {'code' => '300'}
+
+    #require time
+    assert_raise(Fluent::ConfigError){
+      create_driver %[
+        key "newtag"
+        time time
+        record record
+        multi true
+      ], tag
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-map
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000Z
+date: 2012-08-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70329973241780 !ruby/object:Gem::Requirement
+  requirement: &70263359418000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70329973241780
+  version_requirements: *70263359418000
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &70329973241200 !ruby/object:Gem::Requirement
+  requirement: &70263359417460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 0.10.24
   type: :development
   prerelease: false
-  version_requirements: *70329973241200
+  version_requirements: *70263359417460
 description: ! 'fluent-plugin-map is the non-buffered plugin that can convert an event
   log to different event log(s).  '
 email: