fluent-plugin-forest 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 068cf7b8d91c92de946e8654ff085d8f2774976e
-  data.tar.gz: eb6b060dcadae7ee75634e762bce1101242278a1
+  metadata.gz: ea721095d308823baadbc9e6296c076c75d1011f
+  data.tar.gz: d5d3ae86ae4638783e7f8286373c1b47906068b9
 SHA512:
-  metadata.gz: 270e18f43d93d9c0ae18aa1ed852d2fdd85ad8b2b614a79f4ca43a75f240086aaa311f3fb5fbd1f1c60c869789cd896d1a477b937dc722505c7ee29653178ac5
-  data.tar.gz: 0bfea56fe80e620a2e955fba8604a179cb34b2436b3cb1be23dd886bccfc71405e986bc0101d1dd90b5128c7dcf2cca6d94d584650a6ae1539cf841fe6c9f170
+  metadata.gz: a0ce28f5b60185e4758367ef918990cf18537e8a5b5bcaa308b7d554efd4ff810c0bda0825262fd11510abdbaced8c39ff85566b8cc51d21df88b849db759d65
+  data.tar.gz: 061c8287095c952c4fc94be45bc24e755f86dc067c1130fc34b1ab1a4830bb7d4cf9bdab1a6ee48522c6b18ca498495c53bad71f8df0227619a0e1f4a28181f5

data/README.md

@@ -15,7 +15,8 @@ Other supported placeholders:
 * \_\_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`.
+  * it acts accessing the index which split the tag with '.' (dot). It will get 'td' by ${tag_parts[0]}, 'apache' by ${tag_parts[1]} and 'access' by ${tag_parts[-1]} when the tag was `td.apache.access`.
+  * you can also use range index like '1..4' or '1...3' (e.g. ${tag_parts[1..-1]} will return 'apache.access' on giving tag same as previous.)
 
 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.2"
+  gem.version       = "0.2.3"
   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,12 +32,6 @@ 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
@@ -67,17 +61,30 @@ 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
+    tag_parts = tag.split('.')
     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]
+      v = v.gsub(/__TAG_PARTS\[-?[0-9]+(?:\.\.\.?-?[0-9]+)?\]__|\$\{tag_parts\[-?[0-9]+(?:\.\.\.?-?[0-9]+)?\]\}/) do |tag_parts_matched|
+        matched = /\[(?<first>-?[0-9]+)(?<range_part>(?<range_type>\.\.\.?)(?<last>-?[0-9]+))?\]/.match(tag_parts_matched)
+        if matched && matched[:range_part]
+          exclude_end = (matched[:range_type] == '...')
+          range = Range.new(matched[:first].to_i, matched[:last].to_i, exclude_end)
+          if tag_parts[range]
+            tag_parts[range].join(".")
+          else
+            $log.warn "out_forest: missing placeholder. tag:#{tag} placeholder:#{tag_parts_matched} conf:#{k} #{v}"
+            nil
+          end
+        elsif matched # non range index (without range_part)
+          index = matched[:first].to_i
+          unless tag_parts[index]
+            $log.warn "out_forest: missing placeholder. tag:#{tag} placeholder:#{tag_parts_matched} conf:#{k} #{v}"
+          end
+          tag_parts[index]
+        else
+          raise "BUG: gsub regex matches but index regex does not match"
+        end
       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)

data/test/plugin/test_out_forest.rb

@@ -285,43 +285,79 @@ 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>
-      ]
-    }
+  def test_spec_split_tag_by_dot_with_int_index
     d = create_driver %[
 subtype hoge
 <template>
-  keyx xxxxxx
-  keyy yyyyyy.${tag_parts[0]}
+  keya aaaaaa
+  keyb bbbbbb.${tag_parts[0]}
   unknown_tag_parts bar${tag_parts[999]}__TAG_PARTS[999]__
 </template>
 <case xx.*>
-  keyz zzzzzz.${tag_parts[0]}.${tag_parts[1]}
+  keyc cccccc.${tag_parts[0]}.${tag_parts[1]}
+  keyd dddddd.${tag_parts[-2]}.${tag_parts[-1]}
   alt_key a
 </case>
 <case xx.**>
-  keyz zzzzzz.__TAG_PARTS[0]__.__TAG_PARTS[2]__
+  keyc cccccc.__TAG_PARTS[0]__.__TAG_PARTS[2]__
+  keyd dddddd.__TAG_PARTS[-2]__.__TAG_PARTS[-1]__
   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 'aaaaaa', conf['keya']
+    assert_equal 'bbbbbb.xx', conf['keyb']
+    assert_equal 'cccccc.xx.1', conf['keyc']
+    assert_equal 'dddddd.xx.1', conf['keyd']
     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 'aaaaaa', conf['keya']
+    assert_equal 'bbbbbb.xx', conf['keyb']
+    assert_equal 'cccccc.xx.2', conf['keyc']
+    assert_equal 'dddddd.1.2', conf['keyd']
+    assert_equal 'b', conf['alt_key']
+  end
+
+  def test_spec_split_tag_by_dot_with_range_index
+    d = create_driver %[
+subtype hoge
+<template>
+  keya aaaaaa
+  keyb bbbbbb.${tag_parts[0]}
+  unknown_tag_parts bar${tag_parts[999..1000]}__TAG_PARTS[999...1001]__
+</template>
+<case xx.*>
+  keyc cccccc.${tag_parts[0..1]}
+  keyd dddddd.${tag_parts[-2..-1]}
+  keye eeeeee.${tag_parts[1..1000]}
+  alt_key a
+</case>
+<case xx.**>
+  keyc cccccc.__TAG_PARTS[1...3]__
+  keyd dddddd.__TAG_PARTS[-3...-1]__
+  keye eeeeee.__TAG_PARTS[1...1000]__
+  alt_key b
+</case>
+    ]
+
+    conf = d.instance.spec('xx.1')
+    assert_equal 'aaaaaa', conf['keya']
+    assert_equal 'bbbbbb.xx', conf['keyb']
+    assert_equal 'cccccc.xx.1', conf['keyc']
+    assert_equal 'dddddd.xx.1', conf['keyd']
+    assert_equal 'eeeeee.1', conf['keye']
+    assert_equal 'bar', conf['unknown_tag_parts']
+    assert_equal 'a', conf['alt_key']
+
+    conf = d.instance.spec('xx.1.2')
+    assert_equal 'aaaaaa', conf['keya']
+    assert_equal 'bbbbbb.xx', conf['keyb']
+    assert_equal 'cccccc.1.2', conf['keyc']
+    assert_equal 'dddddd.xx.1', conf['keyd']
+    assert_equal 'eeeeee.1.2', conf['keye']
     assert_equal 'b', conf['alt_key']
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-forest
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake