fluent-plugin-forest 0.1.0 → 0.1.1

data/README.md

@@ -9,6 +9,10 @@ In template configurations, you can write configuration lines for overall tags b
 
 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\_\_
+  * replaced with string specified by 'hostname' configuration value, or (default) result of 'hostname' command
+
 You SHOULD NOT use ForestOutput for tags increasing infinitly. 
 
 ## Configuration
@@ -56,7 +60,7 @@ You can write configuration with ForestOutput like below:
       </template>
     </match>
 
-If you want to place logs /var/archive for `service.search.**` without compression, `case` directive is useful:
+If you want to place logs /var/archive for `service.search.**` as filename with hostname, without compression, `case` directive is useful:
 
     <match service.*>
       type forest
@@ -67,7 +71,7 @@ If you want to place logs /var/archive for `service.search.**` without compressi
       </template>
       <case search.**>
         compress no
-        path /var/archive/__TAG__.*.log
+        path /var/archive/__TAG__.__HOSTNAME__.*.log
       </case>
       <case *>
         compress yes

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.0"
+  gem.version       = "0.1.1"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{create sub-plugin dynamically per tags, with template configuration and parameters}
@@ -13,6 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_development_dependency "rake"
   gem.add_development_dependency "fluentd"
   gem.add_runtime_dependency "fluentd"
 end

data/lib/fluent/plugin/out_forest.rb

@@ -4,6 +4,7 @@ class Fluent::ForestOutput < Fluent::Output
   config_param :subtype, :string
   config_param :remove_prefix, :string, :default => nil
   config_param :add_prefix, :string, :default => nil
+  config_param :hostname, :string, :default => `hostname`.chomp
 
   def configure(conf)
     super
@@ -50,7 +51,7 @@ class Fluent::ForestOutput < Fluent::Output
   def parameter(tag, e)
     pairs = {}
     e.each do |k,v|
-      pairs[k] = v.gsub('__TAG__', tag)
+      pairs[k] = v.gsub('__TAG__', tag).gsub('__HOSTNAME__', @hostname)
     end
     Fluent::Config::Element.new('instance', '', pairs, [])
   end

data/test/plugin/test_out_forest.rb

@@ -82,6 +82,100 @@ subtype hoge
     assert_equal 'd.zz', conf['alt_key']
   end
 
+  def test_spec_hostname
+    d = create_driver %[
+subtype hoge
+hostname somehost.local
+<template>
+  keyx xxxxxx.__HOSTNAME__
+  keyy yyyyyy.__TAG__
+  alt_key a
+</template>
+<case xx>
+  keyz z1
+  alt_key b
+</case>
+<case yy.**>
+  keyz z2
+  alt_key c
+</case>
+<case *>
+  keyz z3
+  alt_key d.__TAG__.__HOSTNAME__
+</case>
+    ]
+    conf = d.instance.spec('xx')
+    assert_equal 'xxxxxx.somehost.local', conf['keyx']
+    assert_equal 'yyyyyy.xx', conf['keyy']
+    assert_equal 'z1', conf['keyz']
+    assert_equal 'b', conf['alt_key']
+    
+    conf = d.instance.spec('yy')
+    assert_equal 'xxxxxx.somehost.local', conf['keyx']
+    assert_equal 'yyyyyy.yy', conf['keyy']
+    assert_equal 'z2', conf['keyz']
+    assert_equal 'c', conf['alt_key']
+
+    conf = d.instance.spec('yy.3')
+    assert_equal 'xxxxxx.somehost.local', conf['keyx']
+    assert_equal 'yyyyyy.yy.3', conf['keyy']
+    assert_equal 'z2', conf['keyz']
+    assert_equal 'c', conf['alt_key']
+
+    conf = d.instance.spec('zz')
+    assert_equal 'xxxxxx.somehost.local', conf['keyx']
+    assert_equal 'yyyyyy.zz', conf['keyy']
+    assert_equal 'z3', conf['keyz']
+    assert_equal 'd.zz.somehost.local', conf['alt_key']
+  end
+
+  def test_spec_real_hostname
+    hostname = `hostname`.chomp
+    d = create_driver %[
+subtype hoge
+<template>
+  keyx xxxxxx.__HOSTNAME__
+  keyy yyyyyy.__TAG__
+  alt_key a
+</template>
+<case xx>
+  keyz z1
+  alt_key b
+</case>
+<case yy.**>
+  keyz z2
+  alt_key c
+</case>
+<case *>
+  keyz z3
+  alt_key d.__TAG__.__HOSTNAME__
+</case>
+    ]
+    conf = d.instance.spec('xx')
+    assert_equal 'xxxxxx.' + hostname, conf['keyx']
+    assert_equal 'yyyyyy.xx', conf['keyy']
+    assert_equal 'z1', conf['keyz']
+    assert_equal 'b', conf['alt_key']
+    
+    conf = d.instance.spec('yy')
+    assert_equal 'xxxxxx.' + hostname, conf['keyx']
+    assert_equal 'yyyyyy.yy', conf['keyy']
+    assert_equal 'z2', conf['keyz']
+    assert_equal 'c', conf['alt_key']
+
+    conf = d.instance.spec('yy.3')
+    assert_equal 'xxxxxx.' + hostname, conf['keyx']
+    assert_equal 'yyyyyy.yy.3', conf['keyy']
+    assert_equal 'z2', conf['keyz']
+    assert_equal 'c', conf['alt_key']
+
+    conf = d.instance.spec('zz')
+    assert_equal 'xxxxxx.' + hostname, conf['keyx']
+    assert_equal 'yyyyyy.zz', conf['keyy']
+    assert_equal 'z3', conf['keyz']
+    assert_equal 'd.zz.' + hostname, conf['alt_key']
+  end
+
   def test_faild_plant
     d = create_driver
     time = Time.parse("2012-01-02 13:14:15").to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-forest
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement