fluent-plugin-rewrite-tag-filter 1.4.1 → 1.5.1

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.1.0
+  - 2.1
   - 2.0.0
   - 1.9.3
 

data/README.md

@@ -9,14 +9,17 @@ user-agent, request-uri, regex-backreference and so on with regular expression.
 
 ## Installation
 
-Install with gem or fluent-gem command as:
+Install with `gem`, `fluent-gem` or `td-agent-gem` command as:
 
 ```
-# for fluentd
+# for system installed fluentd
 $ gem install fluent-plugin-rewrite-tag-filter
 
 # for td-agent
 $ sudo /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-rewrite-tag-filter
+
+# for td-agent2
+$ sudo td-agent-gem install fluent-plugin-rewrite-tag-filter
 ```
 
 ## Configuration
@@ -35,6 +38,9 @@ remove_tag_prefix <string>
 
 # Optional: override hostname command for placeholder. (see the section of "Tag placeholder")
 hostname_command <string>
+
+# Optional: Set log level for this plugin. (ex: trace, debug, info, warn, error, fatal)
+log_level        <string> (default info)
 ```
 
 ### Usage
@@ -180,42 +186,45 @@ https://github.com/y-ken/fluent-plugin-rewrite-tag-filter/blob/master/example2.c
 
 ## Related Articles
 
-- 自在にタグを書き換える fluent-plugin-rewrite-tag-filter でログ解析が捗るお話 #fluentd  
+- 自在にタグを書き換える fluent-plugin-rewrite-tag-filter でログ解析が捗るお話 #fluentd<br>
 http://d.hatena.ne.jp/yoshi-ken/20120701/1341137269
 
-- Fluentd & TreasureDataで こっそり始めるログ集計 Fluentd Meetup #2 @mikeda  
+- Fluentd & TreasureDataで こっそり始めるログ集計 Fluentd Meetup #2 @mikeda<br>
 http://www.slideshare.net/baguzy/fluentd-meetup-2-14073930
 
-- 似てる #fluentd プラグインの比較  
+- 似てる #fluentd プラグインの比較<br>
 http://matsumana.wordpress.com/2012/11/15/%E4%BC%BC%E3%81%A6%E3%82%8B-fluentd-%E3%83%97%E3%83%A9%E3%82%B0%E3%82%A4%E3%83%B3%E3%81%AE%E6%AF%94%E8%BC%83/
 
-- Fluentdの集約サーバ用設定ファイル (fluent-plugin-rewrite-tag-filter版)  
+- Fluentdの集約サーバ用設定ファイル (fluent-plugin-rewrite-tag-filter版)<br>
 https://gist.github.com/matsumana/4078096
 
-- 稼働中のFluentdにflowcounter pluginを導入してみた  
+- 稼働中のFluentdにflowcounter pluginを導入してみた<br>
 http://dayafterneet.blogspot.jp/2012/12/fluentdflowcounter-plugin.html
 
-- fluent-plugin-rewrite-tag-filter v1.2.0 をリリースしました。新機能であるremove_tag_prefix設定の使い方を解説します。 #fluentd  
+- fluent-plugin-rewrite-tag-filter v1.2.0 をリリースしました。新機能であるremove_tag_prefix設定の使い方を解説します。 #fluentd<br>
 http://y-ken.hatenablog.com/entry/fluent-plugin-rewrite-tag-filter-v1.2.0
 
-- fluent-plugin-rewrite-tag-filter v1.2.1 をリリースしました。設定サンプルと共にプレースホルダ機能強化内容を紹介します。 #fluentd  
+- fluent-plugin-rewrite-tag-filter v1.2.1 をリリースしました。設定サンプルと共にプレースホルダ機能強化内容を紹介します。 #fluentd<br>
 http://y-ken.hatenablog.com/entry/fluent-plugin-rewrite-tag-filter-v1.2.1
 
-- 待望の正規表現の否定パターンに対応した fluent-plugin-rewrite-tag-filter v1.3.0 をリリースしました #fluentd  
+- 待望の正規表現の否定パターンに対応した fluent-plugin-rewrite-tag-filter v1.3.0 をリリースしました #fluentd<br>
 http://y-ken.hatenablog.com/entry/fluent-plugin-rewrite-tag-filter-v1.3.0
 
-- 不具合修正版 fluent-plugin-rewrite-tag-filter v1.3.1 をリリースしました #fluentd  
+- 不具合修正版 fluent-plugin-rewrite-tag-filter v1.3.1 をリリースしました #fluentd<br>
 http://y-ken.hatenablog.com/entry/fluent-plugin-rewrite-tag-filter-v1.3.1
 
-- PostgreSQLのログをfluentdで回収する設定 — still deeper  
+- PostgreSQLのログをfluentdで回収する設定 — still deeper<br>
 http://chopl.in/blog/2013/06/07/postgresql_csv_log_with_fluentd.html
 
-- S3とFluentdを用いた効率的なログ管理 | SmartNews開発者ブログ  
+- S3とFluentdを用いた効率的なログ管理 | SmartNews開発者ブログ<br>
 http://developer.smartnews.be/blog/2013/09/02/an-effective-log-management-technique-which-uses-fluentd-and-s3/
 
-- fluentd(td-agent) の導入 : Raccoon Tech Blog [株式会社ラクーン 技術戦略部ブログ]  
+- fluentd(td-agent) の導入 : Raccoon Tech Blog [株式会社ラクーン 技術戦略部ブログ]<br>
 http://techblog.raccoon.ne.jp/archives/35031163.html
 
+- fluent-plugin-rewrite-tag-filter v1.4.1 をリリースしました #fluentd<br>
+http://y-ken.hatenablog.com/entry/fluent-plugin-rewrite-tag-filter-v1.4.1
+
 ## TODO
 
 Pull requests are very welcome!!

data/fluent-plugin-rewrite-tag-filter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-rewrite-tag-filter"
-  s.version     = "1.4.1"
+  s.version     = "1.5.1"
   s.license     = "Apache 2.0"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake"
   s.add_runtime_dependency "fluentd"
-  s.add_runtime_dependency "string-scrub"
+  s.add_runtime_dependency "string-scrub", "= 0.0.3" if RUBY_VERSION.to_f < 2.1
 end

data/lib/fluent/plugin/out_rewrite_tag_filter.rb

@@ -7,9 +7,14 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
 
   MATCH_OPERATOR_EXCLUDE = '!'
 
+  # Define `log` method for v0.10.42 or earlier
+  unless method_defined?(:log)
+    define_method("log") { $log }
+  end
+
   def initialize
     super
-    require 'string/scrub'
+    require 'string/scrub' if RUBY_VERSION.to_f < 2.1
   end
 
   def configure(conf)
@@ -31,7 +36,7 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
 
       @rewriterules.push([rewritekey, /#{trim_regex_quote(regexp)}/, get_match_operator(regexp), rewritetag])
       rewriterule_names.push(rewritekey + regexp)
-      $log.info "adding rewrite_tag_filter rule: #{key} #{@rewriterules.last}"
+      log.info "adding rewrite_tag_filter rule: #{key} #{@rewriterules.last}"
     end
 
     unless @rewriterules.length > 0
@@ -72,7 +77,7 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
         rewritetag = rewritetag.gsub(/\$\d+/, backreference_table)
       end
       rewritetag = rewritetag.gsub(/(\${[a-z_]+(\[[0-9]+\])?}|__[A-Z_]+__)/) do
-        $log.warn "rewrite_tag_filter: unknown placeholder found. :placeholder=>#{$1} :tag=>#{tag} :rewritetag=>#{rewritetag}" unless placeholder.include?($1)
+        log.warn "rewrite_tag_filter: unknown placeholder found. :placeholder=>#{$1} :tag=>#{tag} :rewritetag=>#{rewritetag}" unless placeholder.include?($1)
         placeholder[$1]
       end
       return rewritetag
@@ -100,7 +105,7 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
 
   def trim_regex_quote(regexp)
     if regexp.start_with?('"') && regexp.end_with?('"')
-      $log.info "rewrite_tag_filter: [DEPRECATED] Use ^....$ pattern for partial word match instead of double-quote-delimiter. #{regexp}"
+      log.info "rewrite_tag_filter: [DEPRECATED] Use ^....$ pattern for partial word match instead of double-quote-delimiter. #{regexp}"
       regexp = regexp[1..-2]
     end
     if regexp.start_with?(MATCH_OPERATOR_EXCLUDE)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rewrite-tag-filter
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 description: 
 email:
 - y.ken.studio@gmail.com