fluent-plugin-filter-record-map 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3cc9ccf5e8a0bd317bc5728a5866e398913569b
-  data.tar.gz: ce935a8c184a51ba89eebf48851ce33c441188e8
+  metadata.gz: ce29ef6d804ade6ca4e6d5eb39d74a0506ffdc79
+  data.tar.gz: 4194a0b3f618d69a50b64d5c2d3c29d2331f9b10
 SHA512:
-  metadata.gz: 074dc87359695fbecc555422800d6f48b996587c968a324d9ab1e65a51fa4155b60cb1a6e0236c575fb89e9c0558b253c72a26daaf99fe3ade148872c351f685
-  data.tar.gz: 6665995e6ab6ac36c740801e0eadb3928e8e5aeacd1ef3fb81ad67d729da0749964256c5f69dca8fef082d3700865fc3767485608fd17f6ddf18d09470b322fd
+  metadata.gz: 9ce0e805718845d26fdea057520868a9bf0431978c2a5f76af6082b54ac7809449b444c96821e0af96356b96f011b352c37583a250c2815b46e6b77d5f2c8ecd
+  data.tar.gz: 5115736f7a6ebbff65108e885b11ee5110a1f1881a79816eb259cc25395bfce567171a198388a77ff9914a3460de548a8b188352d82d017cfd930b98c38e9175

data/README.md

@@ -26,7 +26,9 @@ Or install it yourself as:
 ```apache
 <filter>
   type record_map
-  map new_record["new_foo"] = record["foo"]; new_record["new_bar"] = record["bar"]
+  # map1: required
+  map1 new_record["new_foo"] = record["foo"]
+  map2 new_record["new_bar"] = record["bar"]
 </filter>
 ```
 
@@ -37,7 +39,8 @@ Or install it yourself as:
 ```apache
 <filter>
   type record_map
-  map new_record["new_foo"] = record["foo"].upcase; new_record["new_bar"] = record["bar"].upcase
+  map1 new_record["new_foo"] = record["foo"].upcase
+  map2 new_record["new_bar"] = record["bar"].upcase
 </filter>
 ```
 
@@ -51,7 +54,7 @@ $ echo '{"foo":"bar", "bar":"zoo"})' | fluentd test.data
 ```apache
 <filter>
   type record_map
-  map record.each {|k, v| new_record[k] = k + "." + v }
+  map1 record.each {|k, v| new_record[k] = k + "." + v }
 </filter>
 ```
 
@@ -65,7 +68,7 @@ $ echo '{"foo":"bar", "bar":"zoo"}' | fluent-cat test.data
 ```apache
 <filter>
   type record_map
-  map new_record = {"new_foo" => record["foo"]}
+  map1 new_record = {"new_foo" => record["foo"]}
 </filter>
 ```
 
@@ -79,7 +82,8 @@ $ echo '{"foo":"bar", "bar":"zoo"}' | fluent-cat test.data
 ```apache
 <filter>
   type record_map
-  map new_record["tag"] = tag; new_record["new_foo"] = tag_parts[1] + "." + record["foo"]
+  map1 new_record["tag"] = tag
+  map2 new_record["new_foo"] = tag_parts[1] + "." + record["foo"]
 </filter>
 ```
 
@@ -87,3 +91,17 @@ $ echo '{"foo":"bar", "bar":"zoo"}' | fluent-cat test.data
 $ echo '{"foo":"bar", "bar":"zoo"}' | fluent-cat test.data
 #=> 2015-01-01 23:34:45 +0900 test.data: {"tag":"test.data","new_foo":"data.foo"}
 ```
+
+### Use `hostname`
+
+```apache
+<filter>
+  type record_map
+  map1 new_record["hostname"] = hostname
+</filter>
+```
+
+```sh
+$ echo '{"foo":"bar", "bar":"zoo"}' | fluent-cat test.data
+#=> 2015-01-01 23:34:45 +0900 test.data: {"hostname":"my-host"}
+```

data/lib/fluent/plugin/filter_record_map.rb

@@ -1,27 +1,44 @@
 require 'fluent_plugin_filter_record_map/version'
+require 'socket'
 
 module Fluent
   class RecordMapFilter < Filter
+    Plugin.register_filter('record_map', self)
+
+    PARAM_INDICES = 1..9
+
+    PARAM_INDICES.each do |i|
+      options = (i == 1) ? {} : {:default => nil}
+      config_param :"map#{i}", :string, options
+    end
+
     class Context
       def context(tag, record)
         tag_parts = tag.split('.')
+        hostname = Socket.gethostname
         new_record = {}
         binding
       end
-    end
-
-    Plugin.register_filter('record_map', self)
-
-    config_param :map, :string
+    end # Context
 
     def configure(conf)
       super
       @context = Context.new
+      @maps = []
+
+      PARAM_INDICES.each do |i|
+        expr = instance_variable_get("@map#{i}")
+        @maps << expr if expr
+      end
     end
 
     def filter(tag, time, record)
       bind = @context.context(tag, record)
-      eval(@map, bind)
+
+      @maps.each do |expr|
+        eval(expr, bind)
+      end
+
       eval('new_record', bind)
     end
   end

data/lib/fluent_plugin_filter_record_map/version.rb

@@ -1,3 +1,3 @@
 module FluentPluginFilterSimpleMap
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-filter-record-map
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd