fluent-plugin-rewrite-tag-filter 0.0.9 → 1.0.0

data/README.rdoc

@@ -22,8 +22,7 @@ user-agent, request-uri, regex-backreference and so on with regular expression.
 
     rewruterule<num:1-200> <attribute> <regex_pattern> <new_tag>
     
-    # Option: Capitalize every matched regex backreference. (ex: $1, $2)
-    # It has described on usage section below.
+    # Capitalize every matched regex backreference. (ex: $1, $2)
     capitalize_regex_backreference <yes/no(default)>
 
 === Usage
@@ -78,7 +77,7 @@ It's a sample to exclude some static file log before split tag by domain.
 
 === Debug
 
-Logging supported like below.
+On starting td-agent, Logging supported like below.
 
     $ tailf /var/log/td-agent/td-agent.log
     2012-09-16 18:10:51 +0900: adding match pattern="td.apache.access" type="rewrite_tag_filter"

data/example.conf

@@ -48,7 +48,7 @@
   <store>
     type rewrite_tag_filter
     rewriterule1 agent Googlebot/ site.GoogleMaps.agent_Googlebot
-    rewriterule2 agent " iPhone .+Googlebot-Mobile/" site.GoogleMaps.agent_GooglebotSmartphoneMobile
+    rewriterule2 agent ^.* iPhone .+Googlebot-Mobile/.*$ site.GoogleMaps.agent_GooglebotSmartphone
     rewriterule3 agent Googlebot-Mobile/ site.GoogleMaps.agent_GooglebotMobile
     rewriterule4 agent bingbot site.GoogleMaps.agent_Bingbot
     rewriterule5 agent Baiduspider site.GoogleMaps.agent_Baiduspider

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     = "0.0.9"
+  s.version     = "1.0.0"
   s.authors     = ["Kentaro Yoshida"]
   s.email       = ["y.ken.studio@gmail.com"]
   s.homepage    = "https://github.com/y-ken/fluent-plugin-rewrite-tag-filter"

data/lib/fluent/plugin/out_rewrite_tag_filter.rb

@@ -21,11 +21,11 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
     end
     (1..PATTERN_MAX_NUM).each do |i|
       next unless conf["rewriterule#{i}"]
-      rewritekey,regexp,rewritetag = conf["rewriterule#{i}"].match(/^([^\s]+)\s+["\/]?(.+?)["\/]?\s+([^\s]+)$/).captures
-      unless regexp != nil && rewritetag != nil
+      rewritekey,regexp,rewritetag = conf["rewriterule#{i}"].match(/^([^\s]+)\s+(.+?)\s+([^\s]+)$/).captures
+      if regexp.nil? || rewritetag.nil?
         raise Fluent::ConfigError, "missing values at rewriterule#{i} " + conf["rewriterule#{i}"].inspect
-      end 
-      @rewriterules.push([i, rewritekey, Regexp.new(regexp), rewritetag])
+      end
+      @rewriterules.push([i, rewritekey, Regexp.new(trim_regex_quote(regexp)), rewritetag])
       rewriterule_names.push(rewritekey + regexp)
       $log.info "adding rewrite_tag_filter rule: #{@rewriterules.last}"
     end
@@ -59,6 +59,14 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
     chain.next
   end
 
+  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}"
+      return regexp[1..-2]
+    end
+    return regexp
+  end
+
   def map_regex_table(elements)
     hash_table = Hash.new
     index = 1

data/test/plugin/test_out_rewrite_tag_filter.rb

@@ -8,18 +8,19 @@ class RewriteTagFilterOutputTest < Test::Unit::TestCase
   CONFIG = %[
     rewriterule1 domain ^www\.google\.com$ site.Google
     rewriterule2 domain ^news\.google\.com$ site.GoogleNews
-    rewriterule3 agent Mac\sOS\sX agent.MacOSX
+    rewriterule3 agent .* Mac OS X .* agent.MacOSX
     rewriterule4 agent (Googlebot|CustomBot)-([a-zA-Z]+) agent.$1-$2
   ]
 
   # aggresive test
-  # indentation, comment, capitalize_regex_backreference, regex with space aside, slash/quote delimited
+  # indentation, comment, capitalize_regex_backreference, regex with space aside.
+  # [DEPLICATED] Use ^....$ pattern for partial word match instead of double-quote-delimiter.
   CONFIG2 = %[
     capitalize_regex_backreference yes
-    rewriterule1 domain "^www\.google\.com$"                site.Google # some comment
-    rewriterule2 domain /^(news)\.(google)\.com$/           site.$2$1
-    rewriterule3 agent  / Mac OS X /                        agent.MacOSX
-    rewriterule4 agent  /(Googlebot|CustomBot)-([a-zA-Z]+)/ agent.$1-$2
+    rewriterule1 domain ^www\.google\.com$                  site.Google # some comment
+    rewriterule2 domain ^(news)\.(google)\.com$             site.$2$1
+    rewriterule3 agent  ^.* Mac OS X .*$                    agent.MacOSX
+    rewriterule4 agent  "(Googlebot|CustomBot)-([a-zA-Z]+)" agent.$1-$2
   ]
 
   def create_driver(conf=CONFIG,tag='test')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rewrite-tag-filter
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &10180420 !ruby/object:Gem::Requirement
+  requirement: &11833100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10180420
+  version_requirements: *11833100
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &10179520 !ruby/object:Gem::Requirement
+  requirement: &11832240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10179520
+  version_requirements: *11832240
 description: 
 email:
 - y.ken.studio@gmail.com