fluent-plugin-rewrite-tag-filter 1.2.0 → 1.2.1

data/README.md

@@ -28,6 +28,12 @@ rewruterule<num:1-200> <attribute> <regex_pattern> <new_tag>
 
 # Optional: Capitalize every matched regex backreference. (ex: $1, $2)
 capitalize_regex_backreference <yes/no> (default no)
+
+# Optional: remove tag prefix for tag placeholder.
+remove_tag_prefix <string>
+
+# Optional: set placeholder for hostname.
+hostname_command <string>
 ```
 
 ### Usage
@@ -38,7 +44,7 @@ It's a sample to exclude some static file log before split tag by domain.
 <source>
   type tail
   path /var/log/httpd/access_log
-  format /^(?<domain>[^ ]*) (?<host>[^ ]*) [^ ]* (?<user>[^ ]*) \[(?<time>[^\]]*)\] "(?<method>\S+)(?: +(?<path>[^ ]*) +\S*)?" (?<status>[^ ]*) (?<size>[^ ]*)(?: "(?<referer>[^\"]*)" "(?<agent>[^\"]*)" (?<response_time>[^ ]*))?$/
+  format apache2
   time_format %d/%b/%Y:%H:%M:%S %z
   tag td.apache.access
   pos_file /var/log/td-agent/apache_access.pos
@@ -124,6 +130,13 @@ It's a sample to rewrite a tag with placeholder.
   type rewrite_tag_filter
   rewriterule1  domain  ^(mail)\.(example)\.com$  rewrited.$2$1.${hostname}
 </match>
+
+# It will get "rewrited.ExampleMail.app30-124" when hostname is "app30-124.foo.com"
+<match apache.access>
+  type rewrite_tag_filter
+  rewriterule1  domain  ^(mail)\.(example)\.com$  rewrited.$2$1.${hostname}
+  hostname_command hostname -s
+</match>
 ```
 
 ## Example
@@ -151,6 +164,9 @@ https://gist.github.com/matsumana/4078096
 - 稼働中のFluentdにflowcounter pluginを導入してみた  
 http://dayafterneet.blogspot.jp/2012/12/fluentdflowcounter-plugin.html
 
+- fluent-plugin-rewrite-tag-filter v1.2.0 をリリースしました。新機能を紹介します。 #fluentd  
+http://y-ken.hatenablog.com/entry/fluent-plugin-rewrite-tag-filter-v1.2.0
+
 ## 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.2.0"
+  s.version     = "1.2.1"
   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

@@ -9,13 +9,14 @@ class Fluent::RewriteTagFilterOutput < Fluent::Output
   end
   config_param :capitalize_regex_backreference, :bool, :default => false
   config_param :remove_tag_prefix, :string, :default => nil
+  config_param :hostname_command, :string, :default => 'hostname'
 
   def configure(conf)
     super
 
     @rewriterules = []
     rewriterule_names = []
-    @hostname = `hostname`.chomp
+    @hostname = `#{@hostname_command}`.chomp
 
     invalids = conf.keys.select{|k| k =~ /^rewriterule(\d+)$/}.select{|arg| arg =~ /^rewriterule(\d+)/ and not (1..PATTERN_MAX_NUM).include?($1.to_i)}
     if invalids.size > 0

data/test/plugin/test_out_rewrite_tag_filter.rb

@@ -30,6 +30,13 @@ class RewriteTagFilterOutputTest < Test::Unit::TestCase
     remove_tag_prefix input
   ]
 
+  # hostname placeholder test
+  CONFIG4 = %[
+    rewriterule1 domain ^www\.google\.com$ ${hostname}
+    remove_tag_prefix input
+    hostname_command hostname -s
+  ]
+
   def create_driver(conf=CONFIG,tag='test')
     Fluent::Test::OutputTestDriver.new(Fluent::RewriteTagFilterOutput, tag).configure(conf)
   end
@@ -102,5 +109,16 @@ class RewriteTagFilterOutputTest < Test::Unit::TestCase
     p emits[0]
     assert_equal 'access', emits[0][0] # tag
   end
+
+  def test_emit4
+    d1 = create_driver(CONFIG4, 'input.access')
+    d1.run do
+      d1.emit({'domain' => 'www.google.com', 'path' => '/foo/bar?key=value', 'agent' => 'Googlebot', 'response_time' => 1000000})
+    end
+    emits = d1.emits
+    assert_equal 1, emits.length
+    p emits[0]
+    assert_equal `hostname -s`.chomp, emits[0][0] # tag
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-rewrite-tag-filter
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake