fluent-plugin-forest 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8de96a623bfa6608e043f68ca1dbd0549ed4d315
-  data.tar.gz: e34249c2332e2520d75aba897b852045db5ce983
+  metadata.gz: e0a7d7f3b087e4e98b95b64c59cba05d0e7414ae
+  data.tar.gz: 0de19f3bffae6681c880ba68eed4189875c30ca7
 SHA512:
-  metadata.gz: 64f32283a2f2cde11e07ce690ed810b492990ee9a48b7a18e91bb643b31140dec89991d9f924998ce0152505df703466adaf01d6bc8f2562c679ff20f7d4aa86
-  data.tar.gz: 35aa6d7e0c3e8dd8df00387569d60a6a583a66511fb0bdaa9fea9d04bba75f9b2742450b39c367f9d0dab1d164083125e99a6144c49fa8cf6165265a15ef2e45
+  metadata.gz: d8058bf19db99b46c8af6c0f181fec8af939f6fb8785c99447c59aa87ae6abbc816f023c692ea2ccb2ab8fb215c3ce9cb89affd0bda9f35df9c595e36b9db9ef
+  data.tar.gz: 6e49a2ad4a71002ef3eaa67db20782fda87d0271b9ef2fda4eccabb89b4d986004cba88879dd27e7e878657d7ab3256f8242fd5f35f0bc811d9f435672e93788

data/README.md

@@ -12,6 +12,8 @@ This plugin helps you if you are writing very long configurations by copy&paste
 Other supported placeholders:
 * \_\_HOSTNAME\_\_ (or ${hostname})
   * replaced with string specified by 'hostname' configuration value, or (default) result of 'hostname' command
+* \_\_ESCAPED\_TAG\_\_ (or ${escaped\_tag})
+  * replaced with escaped tag. Escaped tag is replaced '.' with a character specified by 'escape\_tag\_separator' (default: '\_')
 
 You SHOULD NOT use ForestOutput for tags increasing infinitly. 
 

data/fluent-plugin-forest.gemspec

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-forest"
-  gem.version       = "0.2.0"
+  gem.version       = "0.2.1"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{create sub-plugin dynamically per tags, with template configuration and parameters}
   gem.summary       = %q{plugin to create output plugin instances per tags dynamically}
   gem.homepage      = "https://github.com/tagomoris/fluent-plugin-forest"
+  gem.license       = "APLv2"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/fluent/plugin/out_forest.rb

@@ -5,6 +5,7 @@ class Fluent::ForestOutput < Fluent::MultiOutput
   config_param :remove_prefix, :string, :default => nil
   config_param :add_prefix, :string, :default => nil
   config_param :hostname, :string, :default => `hostname`.chomp
+  config_param :escape_tag_separator, :string, :default => '_'
 
   attr_reader :outputs
 
@@ -60,8 +61,10 @@ class Fluent::ForestOutput < Fluent::MultiOutput
   end
 
   def parameter(tag, e, name = 'instance', arg = '')
+    escaped_tag = tag.gsub('.', @escape_tag_separator)
     pairs = {}
     e.each do |k,v|
+      v = v.gsub('__ESCAPED_TAG__', escaped_tag).gsub('${escaped_tag}', escaped_tag)
       pairs[k] = v.gsub('__TAG__', tag).gsub('${tag}', tag).gsub('__HOSTNAME__', @hostname).gsub('${hostname}', @hostname)
     end
     elements = e.elements.map do |child|

data/test/plugin/test_out_forest.rb

@@ -231,6 +231,60 @@ subtype hoge
     assert_equal 'dupdup', conf.elements[6]['key']
   end
 
+  def test_spec_replace_tag_separator
+    d = create_driver %[
+subtype hoge
+<template>
+  keyx xxxxxx
+  keyy yyyyyy.__ESCAPED_TAG__
+</template>
+<case xx.*>
+  keyz zzzzzz.__ESCAPED_TAG__
+  alt_key a
+</case>
+<case xx.**>
+  keyz zzzzzz.${escaped_tag}
+  alt_key b
+</case>
+    ]
+
+    conf = d.instance.spec('xx.1')
+    assert_equal 'xxxxxx', conf['keyx']
+    assert_equal 'yyyyyy.xx_1', conf['keyy']
+    assert_equal 'zzzzzz.xx_1', conf['keyz']
+    assert_equal 'a', conf['alt_key']
+
+    conf = d.instance.spec('xx.1.2')
+    assert_equal 'xxxxxx', conf['keyx']
+    assert_equal 'yyyyyy.xx_1_2', conf['keyy']
+    assert_equal 'zzzzzz.xx_1_2', conf['keyz']
+    assert_equal 'b', conf['alt_key']
+  end
+
+  def test_spec_replace_tag_separator_with_specified_char
+    d = create_driver %[
+subtype hoge
+escape_tag_separator +
+<template>
+  keyx xxxxxx
+  keyy yyyyyy.__ESCAPED_TAG__
+</template>
+<case xx.**>
+  keyz zzzzzz.${escaped_tag}
+</case>
+    ]
+
+    conf = d.instance.spec('xx.1')
+    assert_equal 'xxxxxx', conf['keyx']
+    assert_equal 'yyyyyy.xx+1', conf['keyy']
+    assert_equal 'zzzzzz.xx+1', conf['keyz']
+
+    conf = d.instance.spec('xx.1.2')
+    assert_equal 'xxxxxx', conf['keyx']
+    assert_equal 'yyyyyy.xx+1+2', conf['keyy']
+    assert_equal 'zzzzzz.xx+1+2', conf['keyz']
+  end
+
   def test_spec_hostname
     d = create_driver %[
 subtype hoge

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-forest
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,7 +58,8 @@ files:
 - test/plugin/test_out_forest.rb
 - test/plugin/test_out_forest_test.rb
 homepage: https://github.com/tagomoris/fluent-plugin-forest
-licenses: []
+licenses:
+- APLv2
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -76,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: plugin to create output plugin instances per tags dynamically