fluent-plugin-forest 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0a7d7f3b087e4e98b95b64c59cba05d0e7414ae
-  data.tar.gz: 0de19f3bffae6681c880ba68eed4189875c30ca7
+  metadata.gz: 068cf7b8d91c92de946e8654ff085d8f2774976e
+  data.tar.gz: eb6b060dcadae7ee75634e762bce1101242278a1
 SHA512:
-  metadata.gz: d8058bf19db99b46c8af6c0f181fec8af939f6fb8785c99447c59aa87ae6abbc816f023c692ea2ccb2ab8fb215c3ce9cb89affd0bda9f35df9c595e36b9db9ef
-  data.tar.gz: 6e49a2ad4a71002ef3eaa67db20782fda87d0271b9ef2fda4eccabb89b4d986004cba88879dd27e7e878657d7ab3256f8242fd5f35f0bc811d9f435672e93788
+  metadata.gz: 270e18f43d93d9c0ae18aa1ed852d2fdd85ad8b2b614a79f4ca43a75f240086aaa311f3fb5fbd1f1c60c869789cd896d1a477b937dc722505c7ee29653178ac5
+  data.tar.gz: 0bfea56fe80e620a2e955fba8604a179cb34b2436b3cb1be23dd886bccfc71405e986bc0101d1dd90b5128c7dcf2cca6d94d584650a6ae1539cf841fe6c9f170

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - 2.0.0

data/README.md

@@ -14,6 +14,8 @@ Other supported placeholders:
   * 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: '\_')
+* \_\_TAG_PARTS[n]\_\_ (or ${tag_parts[n]})
+  * it acts accessing the index which split the tag with '.' (dot). It will get 'td' by ${tag_parts[0]} and 'apache' by ${tag_parts[1]} when the tag was `td.apache.access`.
 
 You SHOULD NOT use ForestOutput for tags increasing infinitly. 
 

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.2.1"
+  gem.version       = "0.2.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

@@ -32,6 +32,12 @@ class Fluent::ForestOutput < Fluent::MultiOutput
       # read and throw away to supress unread configuration warning
       touch_recursive(element)
 
+      element.each do |k,v|
+        unless v.match(/\$\{tag_parts\[\d\.\.\.?\d\]\}/).nil? or v.match(/__TAG_PARTS\[\d\.\.\.?\d\]__/).nil?
+          raise Fluent::ConfigError, "${tag_parts[n]} and __TAG_PARTS[n]__ placeholder does not support range specify at #{k} #{v}"
+        end
+      end
+
       case element.name
       when 'template'
         @template = element
@@ -61,9 +67,18 @@ class Fluent::ForestOutput < Fluent::MultiOutput
   end
 
   def parameter(tag, e, name = 'instance', arg = '')
+    tag_parts = {}
+    tag.split('.').each_with_index do |t, idx| 
+      tag_parts["${tag_parts[#{idx}]}"] = t
+      tag_parts["__TAG_PARTS[#{idx}]__"] = t
+    end
     escaped_tag = tag.gsub('.', @escape_tag_separator)
     pairs = {}
     e.each do |k,v|
+      v = v.gsub(/(__TAG_PARTS\[[0-9]+\]__|\${tag_parts\[[0-9]+\]})/) do 
+        $log.warn "out_forest: missing placeholder. tag:#{tag} placeholder:#{$1} conf:#{k} #{v}" unless tag_parts.include?($1)
+        tag_parts[$1]
+      end
       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

data/test/plugin/test_out_forest.rb

@@ -285,6 +285,46 @@ escape_tag_separator +
     assert_equal 'zzzzzz.xx+1+2', conf['keyz']
   end
 
+  def test_spec_split_tag_by_dot
+    assert_raise(Fluent::ConfigError) {
+      d = create_driver %[
+        subtype hoge
+        <template>
+          keyx ${tag_parts[0..2]}.__TAG_PARTS[0..2]__
+        </template>
+      ]
+    }
+    d = create_driver %[
+subtype hoge
+<template>
+  keyx xxxxxx
+  keyy yyyyyy.${tag_parts[0]}
+  unknown_tag_parts bar${tag_parts[999]}__TAG_PARTS[999]__
+</template>
+<case xx.*>
+  keyz zzzzzz.${tag_parts[0]}.${tag_parts[1]}
+  alt_key a
+</case>
+<case xx.**>
+  keyz zzzzzz.__TAG_PARTS[0]__.__TAG_PARTS[2]__
+  alt_key b
+</case>
+    ]
+
+    conf = d.instance.spec('xx.1')
+    assert_equal 'xxxxxx', conf['keyx']
+    assert_equal 'yyyyyy.xx', conf['keyy']
+    assert_equal 'zzzzzz.xx.1', conf['keyz']
+    assert_equal 'bar', conf['unknown_tag_parts']
+    assert_equal 'a', conf['alt_key']
+
+    conf = d.instance.spec('xx.1.2')
+    assert_equal 'xxxxxx', conf['keyx']
+    assert_equal 'yyyyyy.xx', conf['keyy']
+    assert_equal 'zzzzzz.xx.2', conf['keyz']
+    assert_equal 'b', conf['alt_key']
+  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.1
+  version: 0.2.2
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -47,6 +47,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md