fluent-plugin-forest 0.1.1 → 0.1.2

data/README.md

@@ -5,12 +5,12 @@
 ### ForestOutput
 
 ForestOutput creates sub plugin instance of a output plugin dynamically per tag, from template configurations.
-In template configurations, you can write configuration lines for overall tags by <template>, and for specified tags by <case TAG_PATTERN>, and you can use \_\_TAG\_\_ placeholder at anywhere in <template> and <case>.
+In template configurations, you can write configuration lines for overall tags by <template>, and for specified tags by <case TAG_PATTERN>, and you can use \_\_TAG\_\_ (or ${tag}) placeholder at anywhere in <template> and <case>.
 
 This plugin helps you if you are writing very long configurations by copy&paste with a little little diff for many tags.
 
 Other supported placeholders:
-* \_\_HOSTNAME\_\_
+* \_\_HOSTNAME\_\_ (or ${hostname})
   * replaced with string specified by 'hostname' configuration value, or (default) result of 'hostname' command
 
 You SHOULD NOT use ForestOutput for tags increasing infinitly. 
@@ -56,7 +56,7 @@ You can write configuration with ForestOutput like below:
       <template>
         time_slice_format %Y%m%d%H
         compress yes
-        path /var/log/__TAG__.*.log
+        path /var/log/${tag}.*.log
       </template>
     </match>
 
@@ -103,5 +103,6 @@ If you want to place logs /var/archive for `service.search.**` as filename with
 
 ## Copyright
 
-Copyright:: Copyright (c) 2012- TAGOMORI Satoshi (tagomoris)
-License::   Apache License, Version 2.0
+* Copyright (c) 2012- TAGOMORI Satoshi (tagomoris)
+* License
+  * Apache License, Version 2.0

data/fluent-plugin-forest.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-forest"
-  gem.version       = "0.1.1"
+  gem.version       = "0.1.2"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{create sub-plugin dynamically per tags, with template configuration and parameters}

data/lib/fluent/plugin/out_forest.rb

@@ -51,7 +51,7 @@ class Fluent::ForestOutput < Fluent::Output
   def parameter(tag, e)
     pairs = {}
     e.each do |k,v|
-      pairs[k] = v.gsub('__TAG__', tag).gsub('__HOSTNAME__', @hostname)
+      pairs[k] = v.gsub('__TAG__', tag).gsub('${tag}', tag).gsub('__HOSTNAME__', @hostname).gsub('${hostname}', @hostname)
     end
     Fluent::Config::Element.new('instance', '', pairs, [])
   end

data/test/plugin/test_out_forest.rb

@@ -148,7 +148,7 @@ subtype hoge
 </case>
 <case *>
   keyz z3
-  alt_key d.__TAG__.__HOSTNAME__
+  alt_key d.${tag}.${hostname}
 </case>
     ]
     conf = d.instance.spec('xx')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-forest
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake