fluent-plugin-yohoushi 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0260b396f8e546b3fbac8d17c8c54b2bf99d9c91
-  data.tar.gz: 580c25d8ae8a7b074ba6d77c64386a03f8cbb013
+  metadata.gz: e999a6aedf4bd3f07f2a40298b9826da39a5dd68
+  data.tar.gz: abd025986465c4ee61f437f656a2439c6f12d3d0
 SHA512:
-  metadata.gz: 2a55115383e3167ce00babc0c5463fc88027ba7e77fc26435258eb9b645ef51669bed1a4060db1bfeee23a37711c8c65edddab556c26b29f1c601233ccf1277e
-  data.tar.gz: c060c70279ec0b3fa27637af816b8caa05ebe328511064dfc2280660a030fc64f02186fb3983ee2e2871366fae92a9e590805071fc5005c8a6bb0f5435b3b53c
+  metadata.gz: 7ba26bb0f27b83ac24b059e24989e12097b5cf8e5f50b039da0059e85952856820c5082f5d474fd1767180fa27363be9e553c7af308987ab2a5779a544d8954c
+  data.tar.gz: 48f200e029d13f71655c13bf18301616aa80eb66ce69c289a0af0f199e7542a902e641eebb013c9458f406180279fd3c3c9b2dfc495d2f78bcb705114f080f76

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.3 (2013/12/12)
+
+Changes:
+
+* Rename ${tags} placeholders to ${tag\_parts} placeholder to support plugin standard (see fluent-plugin-record-reformer, fluent-plugin-rewrite-tag-filter)
+
 ## 0.0.2 (2013/12/12)
 
 Enhancement:

data/README.md

@@ -1,4 +1,4 @@
-# fluent-plugin-yohoushi [![Build Status](https://secure.travis-ci.org/sonots/fluent-plugin-yohoushi.png?branch=master)](http://travis-ci.org/sonots/fluent-plugin-yohoushi) [![Dependency Status](https://gemnasium.com/sonots/fluent-plugin-yohoushi.png)](https://gemnasium.com/sonots/fluent-plugin-yohoushi)
+# fluent-plugin-yohoushi [![Build Status](https://secure.travis-ci.org/yohoushi/fluent-plugin-yohoushi.png?branch=master)](http://travis-ci.org/sonots/fluent-plugin-yohoushi) [![Dependency Status](https://gemnasium.com/yohoushi/fluent-plugin-yohoushi.png)](https://gemnasium.com/yohoushi/fluent-plugin-yohoushi)
 
 Fluentd plugin to post data to yohoushi where [yohoushi](http://yohoushi.github.io/yohoushi/) is a visualization graph tool.
 
@@ -77,14 +77,15 @@ shall be available. In addition, following placeholders are reserved:
 
 * ${hostname} hostname
 * ${tag} input tag
-* ${tags} input tag splitted by '.'
+* ${tag\_parts} input tag splitted by '.'
+* ${tags} input tag splitted by '.' (obsolete)
 * ${time} time of the event
 * ${key} the matched key value with `key_pattern` or `key1`, `key2`, ...
 
 It is also possible to write a ruby code in placeholders, so you may write some codes as
 
 * ${time.strftime('%Y-%m-%dT%H:%M:%S%z')}
-* ${tags.last}  
+* ${tag\_parts.last}
 
 ## ChangeLog
 

data/fluent-plugin-yohoushi.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-yohoushi"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-yohoushi"

data/lib/fluent/plugin/out_yohoushi.rb

@@ -94,12 +94,12 @@ class Fluent::YohoushiOutput < Fluent::Output
   end
 
   def emit(tag, es, chain)
-    tags = tag.split('.')
+    tag_parts = tag.split('.')
     if @key_pattern
       es.each do |time, record|
         record.each do |key, value|
           next unless key =~ @key_pattern
-          path = expand_placeholder(@key_pattern_path, record, tag, tags, time, key)
+          path = expand_placeholder(@key_pattern_path, record, tag, tag_parts, time, key)
           post(path, value)
         end
       end
@@ -107,7 +107,7 @@ class Fluent::YohoushiOutput < Fluent::Output
       es.each do |time, record|
         @keys.each do |key, path|
           next unless value = record[key]
-          path = expand_placeholder(path, record, tag, tags, time, key)
+          path = expand_placeholder(path, record, tag, tag_parts, time, key)
           post(path, value)
         end
       end
@@ -118,12 +118,11 @@ class Fluent::YohoushiOutput < Fluent::Output
     $log.warn "out_yohoushi: #{e.class} #{e.message} #{e.backtrace.first}"
   end
 
-  private
-
-  def expand_placeholder(str, record, tag, tags, time, key)
+  def expand_placeholder(str, record, tag, tag_parts, time, key)
     struct = UndefOpenStruct.new(record)
     struct.tag  = tag
-    struct.tags = tags
+    struct.tags = tag_parts # obsolete
+    struct.tag_parts = tag_parts
     struct.time = time
     struct.key  = key
     struct.hostname = @hostname

data/spec/out_yohoushi_spec.rb

@@ -20,6 +20,7 @@ describe Fluent::YohoushiOutput do
   let(:growthforecast_base_uri) { 'http://localhost:5125' }
   let(:tag) { 'test' }
   let(:driver) { Fluent::Test::OutputTestDriver.new(Fluent::YohoushiOutput, tag).configure(config) }
+  let(:instance) { driver.instance }
   let(:emit) { driver.run { messages.each {|message| driver.emit(message, time) } } }
 
   describe 'test configure' do
@@ -137,4 +138,22 @@ describe Fluent::YohoushiOutput do
       it { emit }
     end
   end
+
+  describe 'expand_placeholder' do
+    let(:config) { %[mapping1 / http://foo\nkey1 foo bar] }
+    let(:tag) { 'fluent.error' }
+    let(:record) { { 'foo_count' => "1", 'bar_count' => "1" } }
+    let(:tag_parts) { tag.split('.') }
+    let(:time) { Time.now.to_i }
+
+    context 'tags (obsolete)' do
+      let(:path) { '/path/to/${tags[-1]}' }
+      it { instance.expand_placeholder(path, record, tag, tag_parts, time, 'foo_count').should == '/path/to/error' }
+    end
+
+    context 'tag_parts' do
+      let(:path) { '/path/to/${tag_parts[-1]}' }
+      it { instance.expand_placeholder(path, record, tag, tag_parts, time, 'foo_count').should == '/path/to/error' }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-yohoushi
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-yohoushi
-rubygems_version: 2.1.10
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: fluentd plugin to post data to yohoushi