fluent-plugin-redeliver 0.0.2 → 0.1.0

data/README.md

@@ -12,7 +12,8 @@ Simple re-delivery plugin to process log record as another tag
   regexp   ^foo\.(.*)$
   replace  bar.\1
   # add original tag to record['__tag'] (optional) 
-  tag_attr __tag
+  include_tag_key true
+  tag_key __tag
 </match>
 
 <match bar.**>
@@ -21,6 +22,8 @@ Simple re-delivery plugin to process log record as another tag
 </match>
 ```
 
+For v0.0.2 User: `tag_attr` is obsoleted. But it works compatible with 0.0.2 now.
+
 ### More Effective
 
 ```
@@ -36,7 +39,8 @@ Simple re-delivery plugin to process log record as another tag
     type     redeliver
     regexp   ^myapp\.error\.(.*)$
     replace  logging.error.\1
-    tag_attr __tag
+    include_tag_key true
+    tag_key __tag
   </store>
 </match>
 
@@ -72,7 +76,8 @@ Simple re-delivery plugin to process log record as another tag
 
  * `regexp`: redelivers the record if tag matches specified pattern.
  * `replace`: rewrites tag for re-emit. You can use n-th matched subexpression(\1,\2...) for replace string.
- * `tag_attr`: adds original tag to specified key if regexp matches.
+ * `include_tag_key`: enables adding original tag to specified key when regexp matches.
+ * `tag_key`: adds original tag to specified key when include_tag_key set `true`.
 
 
 ## Installation

data/fluent-plugin-redeliver.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-redeliver"
-  gem.version       = "0.0.2"
+  gem.version       = "0.1.0"
   gem.authors       = ["Masatoshi Kawazoe (acidlemon)"]
   gem.email         = ["acidlemon@beatsync.net"]
   gem.description   = %q{simple tag-based redeliver plugin}

data/lib/fluent/plugin/out_redeliver.rb

@@ -1,8 +1,13 @@
 class Fluent::RedeliverOutput < Fluent::Output
   Fluent::Plugin.register_output('redeliver', self)
 
+  include Fluent::SetTagKeyMixin
+  config_set_default :include_tag_key, false
+
   config_param :regexp, :string, :default => nil
   config_param :replace, :string, :default => nil
+
+  # obsolete option
   config_param :tag_attr, :string, :default => nil
 
   def initialize
@@ -11,6 +16,11 @@ class Fluent::RedeliverOutput < Fluent::Output
 
   def configure(conf)
     super
+
+    if tag_attr 
+      @include_tag_key = true
+      @tag_key = tag_attr
+    end
   end
 
   def start
@@ -30,7 +40,7 @@ class Fluent::RedeliverOutput < Fluent::Output
     if newtag != tag and newtag.length > 0
       es.each do |time, record|
         if (record)
-          record[tag_attr] = tag if tag_attr
+          filter_record(tag, time, record)
           Fluent::Engine.emit(newtag, time, record)
         end
       end

data/test/plugin/test_out_redeliver.rb

@@ -22,6 +22,7 @@ class RedeliverOutputTest < Test::Unit::TestCase
     assert_equal '^app\.(.*)\.(.*)$', d.instance.regexp
     assert_equal 'test.hoge.\1_\2', d.instance.replace
     assert_equal nil, d.instance.tag_attr
+    assert_equal false, d.instance.include_tag_key
 
     d = create_driver %[
       regexp ^debug\\.(.*)$
@@ -32,6 +33,21 @@ class RedeliverOutputTest < Test::Unit::TestCase
     assert_equal '^debug\.(.*)$', d.instance.regexp
     assert_equal 'ignore.\1', d.instance.replace
     assert_equal '__tag', d.instance.tag_attr
+    assert_equal true, d.instance.include_tag_key
+    assert_equal '__tag', d.instance.tag_key
+
+    d = create_driver %[
+      regexp ^powawa\\.(.*)$
+      replace powapowa.\\1
+      include_tag_key true
+      tag_key __tag__
+    ]
+
+    assert_equal '^powawa\.(.*)$', d.instance.regexp
+    assert_equal 'powapowa.\1', d.instance.replace
+    assert_equal nil, d.instance.tag_attr
+    assert_equal true, d.instance.include_tag_key
+    assert_equal '__tag__', d.instance.tag_key
 
   end
 
@@ -114,6 +130,32 @@ class RedeliverOutputTest < Test::Unit::TestCase
 
     assert_equal 0, emits.length
 
+
+    # v0.1.0 SetTagKeyMixIn support
+    d5 = create_driver %[
+      regexp ^powawa\\.(.*)$
+      replace powapowa.\\1
+      include_tag_key true
+      tag_key __tag__
+    ], 'powawa.standalone'
+
+    d5.run do
+      d5.emit({ "test" => "value5" }, now1)
+    end
+
+    emits = d5.emits
+
+    assert_equal 1, emits.length
+
+    assert_equal 'powapowa.standalone', emits[0][0]
+    assert_equal now1.to_i, emits[0][1]
+    assert_equal 'value5', emits[0][2]['test']
+    assert_equal nil, emits[0][2]['tag']
+    assert_equal nil, emits[0][2]['__tag']
+    assert_equal 'powawa.standalone', emits[0][2]['__tag__']
+    
+
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redeliver
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: simple tag-based redeliver plugin