fluent-plugin-calc 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f8d625101f66b98091f034d26d6bdb61332f507
-  data.tar.gz: 5e65dc06ab15e2ff39d19cdc287fd71532a4a6d4
+  metadata.gz: 30c8943cbad7b43b318067d0708773cce1e1adff
+  data.tar.gz: 74e0cdf6eaf70a24efae255962333c499bc72fcb
 SHA512:
-  metadata.gz: c9f94407643311294a2d6014dfbbaae0682e787cfa057934025a3f23531a35d9fd2665ca279cd875bc9dca3e18c17f5ba617d5dc2ce43b2cdf45f28cb1679ad3
-  data.tar.gz: e3fd1ab151b4cee10922e6b553a88f931ec0d4ab70a052c4f92d111f7dbcb6cf97e37c5373150d79f91bb5e75aa4a5b78542aaf5dea5853f14d564e9cc668e44
+  metadata.gz: 82ed5239999ff5306267c125bbbfb2e46ac5bcefd9ace0e55dede3145dc809f6c747590a48e49b5d1e794f2bd64835a545ddec273e0597d3dde02bee71b03e65
+  data.tar.gz: f0ea97358cc2b5695a96a101a3851fca6a6cb5758f7953b3d9668f14bfdbc938a5129801412e79b80b913e18270e6058bb9f9c46f2f9c4495fa2c9976a9ce9c7

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0 (2013/12/12)
+
+Enhancement:
+
+- Add `remove_tag_prefix` option
+
 ## 0.1.2 (2013/10/10)
 
 Enhancement:

data/README.md

@@ -82,7 +82,11 @@ then output bocomes as belows:
 
 - add_tag_prefix
 
-    Add tag prefix for output message. 
+    Add tag prefix for output message. Default: 'calc'
+
+- remove_tag_prefix
+
+    Remove tag prefix for output message. 
 
 - aggragate
     

data/fluent-plugin-calc.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-calc"
-  s.version     = "0.1.2"
-  s.authors     = ["Naotoshi SEO"]
+  s.version     = "0.2.0"
+  s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-calc"
-  s.summary     = "fluentd plugin to calcucate numbers in messages"
+  s.summary     = "Fluentd plugin to calcucate statistics in messages"
   s.description = s.summary
 
   s.rubyforge_project = "fluent-plugin-calc"

data/lib/fluent/plugin/out_calc.rb

@@ -21,7 +21,8 @@ class Fluent::CalcOutput < Fluent::Output
   config_param :avg_suffix, :string, :default => ""
   config_param :interval, :time, :default => 5
   config_param :tag, :string, :default => nil
-  config_param :add_tag_prefix, :string, :default => 'calc'
+  config_param :add_tag_prefix, :string, :default => nil
+  config_param :remove_tag_prefix, :string, :default => nil
   config_param :aggregate, :string, :default => 'tag'
   config_param :store_file, :string, :default => nil
   config_param :zero_emit, :bool, :default => false
@@ -53,6 +54,25 @@ class Fluent::CalcOutput < Fluent::Output
       raise Fluent::ConfigError, "tag must be specified for aggregate all" if @tag.nil?
     end
 
+    if @tag.nil? and @add_tag_prefix.nil? and @remove_tag_prefix.nil?
+      @add_tag_prefix = 'calc' # not ConfigError for lower version compatibility
+    end
+
+    @tag_prefix = "#{@add_tag_prefix}." if @add_tag_prefix
+    @tag_prefix_match = "#{@remove_tag_prefix}." if @remove_tag_prefix
+    @tag_proc =
+      if @tag
+        Proc.new {|tag| @tag }
+      elsif @tag_prefix and @tag_prefix_match
+        Proc.new {|tag| "#{@tag_prefix}#{lstrip(tag, @tag_prefix_match)}" }
+      elsif @tag_prefix_match
+        Proc.new {|tag| lstrip(tag, @tag_prefix_match) }
+      elsif @tag_prefix
+        Proc.new {|tag| "#{@tag_prefix}#{tag}" }
+      else
+        Proc.new {|tag| tag }
+      end
+
     @matches = {}
     @mutex = Mutex.new
   end
@@ -177,8 +197,8 @@ class Fluent::CalcOutput < Fluent::Output
     flushed_matches.keys.each do |tag|
       matches = flushed_matches[tag]
       output = generate_output(matches)
-      tag = @tag ? @tag : "#{@add_tag_prefix}.#{tag}"
-      Fluent::Engine.emit(tag, time, output) if output
+      emit_tag = @tag_proc.call(tag)
+      Fluent::Engine.emit(emit_tag, time, output) if output
     end
   end
 
@@ -283,4 +303,10 @@ class Fluent::CalcOutput < Fluent::Output
     end
   end
 
+  private
+
+  def lstrip(string, substring)
+    string.index(substring) == 0 ? string[substring.size..-1] : string
+  end
+
 end

data/spec/out_calc_spec.rb

@@ -199,6 +199,22 @@ describe Fluent::CalcOutput do
       it { emit }
     end
 
+    context 'remove_tag_prefix' do
+      let(:config) do
+        CONFIG + %[
+          remove_tag_prefix foo
+          sum _count$
+        ]
+      end
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("bar", time, {
+          "4xx_count"=>6,"5xx_count"=>6
+        })
+      end
+      it { emit }
+    end
+
     context 'aggregate' do
       let(:emit) do
         driver.run { messages.each {|message| driver.emit_with_tag(message, time, 'foo.bar') } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-calc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
-- Naotoshi SEO
+- Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -80,7 +80,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: fluentd plugin to calcucate numbers in messages
+description: Fluentd plugin to calcucate statistics in messages
 email:
 - sonots@gmail.com
 executables: []
@@ -120,11 +120,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-calc
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: fluentd plugin to calcucate numbers in messages
+summary: Fluentd plugin to calcucate statistics in messages
 test_files:
 - spec/out_calc_spec.rb
 - spec/spec_helper.rb
-has_rdoc: