fluent-plugin-calc 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ef459d57b1a570eb06400f3eb8e6a4b54ed0323
-  data.tar.gz: 3f075999d044512d5504897e237dd7e8a07f57e6
+  metadata.gz: a1c071f135ee347fbda42cabebcf97145738e861
+  data.tar.gz: d96f235f6f89144c8c576be0a8502034355c6147
 SHA512:
-  metadata.gz: 94465d66d28c3ec8596b94c19e9da14c6ecd2624262dc9ce27038b19ca8ee50c529242bba14be09aba95ba7545627da935dd5e4fd6d07f7af44af3f8fefac1c1
-  data.tar.gz: 76c2f2d778128c2287111b086290c14f7cf05df08eac3f7d7aa39717061b0c9408749ddcf6103a58df9b6c3a641898135cb57d87c757a8ce4f568d2114364d5d
+  metadata.gz: 10600118061e558c871707bff0c6d24c55aa2c6b3dea62c176a5ac0f2e317dc2d1dd116bf306c2f4a806e26510105a2b6ce5d4969b4ff349e1152b4e885a4019
+  data.tar.gz: 2ddf8699037167a5bd72aef1a3489d73487bbb75c1befd80c77cf2be0d60e3c70468eb45fbdba1efa6f52417926c69bd45bd117b1881eb48b610edd3af5aec7f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.0.2 (2013/05/06)
+
+Bugfixes:
+
+- Fix so that @avg can be an option
+
 ## 0.0.1 (2013/05/05)
 
 First version
+

data/README.md

@@ -7,7 +7,6 @@ Fluentd plugin to calc messages.
     <match foo.**>
       type calc
       interval 5s
-      aggragate tag
       add_tag_prefix calc
 
       sum .*_count$
@@ -18,18 +17,18 @@ Fluentd plugin to calc messages.
 
 Assuming following inputs are coming:
 
-    foo.bar: {"4xx_count":1,"5xx_count":2","reqtime_max":12083,"reqtime_min":10,reqtime_avg":240.46}
-    foo.bar: {"4xx_count":4,"5xx_count":2","reqtime_max":24831,"reqtime_min":82,reqtime_avg":300.46}
+    foo.bar: {"4xx_count":1,"5xx_count":2","reqtime_max":12083,"reqtime_min":10,"reqtime_avg":240.46}
+    foo.bar: {"4xx_count":4,"5xx_count":2","reqtime_max":24831,"reqtime_min":82,"reqtime_avg":300.46}
 
 then output bocomes as belows:
 
-    foo.bar: {"4xx_count":5,"5xx_count":4","reqtime_max":24831,"reqtime_min":82,reqtime_avg":270.46}
+    calc.foo.bar: {"4xx_count":5,"5xx_count":4","reqtime_max":24831,"reqtime_min":82,"reqtime_avg":270.46}
 
 ## Parameters
 
-- aggragate
-    
-    Calculate by each `tag` or `all`. The default value is `tag`.
+- sum, min, max, avg
+
+    Calculation. Specify input keys by a regular expression
 
 - interval
 
@@ -37,15 +36,15 @@ then output bocomes as belows:
 
 - tag
 
-    The output tag name
+    The output tag name. Required for aggregate `all`. 
 
 - add_tag_prefix
 
-    Add tag prefix for output message
+    Add tag prefix for output message. 
 
-- sum, min, max, avg
-
-    Calculation. Specify input keys by a regular expression
+- aggragate
+    
+    Calculate by each `tag` or `all`. The default value is `tag`.
 
 ## ChangeLog
 

data/fluent-plugin-calc.gemspec

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

data/lib/fluent/plugin/out_calc.rb

@@ -121,7 +121,7 @@ class Fluent::CalcOutput < Fluent::Output
   def generate_output(count, matches)
     output = matches.dup
     output.keys.each do |key|
-      if @avg.match(key)
+      if @avg and @avg.match(key)
         output[key] = matches[key] / count.to_f # compute avg
       end
     end

data/spec/out_calc_spec.rb

@@ -1,11 +1,16 @@
 # encoding: UTF-8
 require_relative 'spec_helper'
 
+class Fluent::Test::OutputTestDriver
+  def emit_with_tag(record, time=Time.now, tag = nil)
+    @tag = tag if tag
+    emit(record, time)
+  end
+end
+
 describe Fluent::CalcOutput do
   before { Fluent::Test.setup }
-  CONFIG = %[
-    input_key message
-  ]
+  CONFIG = %[]
   let(:tag) { 'foo.bar' }
   let(:driver) { Fluent::Test::OutputTestDriver.new(Fluent::CalcOutput, tag).configure(config) }
 
@@ -14,7 +19,7 @@ describe Fluent::CalcOutput do
       context 'invalid aggregate' do
         let(:config) do
           CONFIG + %[
-          aggregate foo
+            aggregate foo
           ]
         end
         it { expect { driver }.to raise_error(Fluent::ConfigError) }
@@ -23,7 +28,7 @@ describe Fluent::CalcOutput do
       context 'no tag for aggregate all' do
         let(:config) do
           CONFIG + %[
-          aggregate all
+            aggregate all
           ]
         end
         it { expect { driver }.to raise_error(Fluent::ConfigError) }
@@ -64,6 +69,7 @@ describe Fluent::CalcOutput do
     let(:messages) do
       [
         {"4xx_count"=>1,"5xx_count"=>2,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3},
+        {">4sec_count"=>1},
         {"4xx_count"=>2,"5xx_count"=>2,"reqtime_max"=>5,"reqtime_min"=>2,"reqtime_avg"=>2},
         {"4xx_count"=>3,"5xx_count"=>2,"reqtime_max"=>1,"reqtime_min"=>3,"reqtime_avg"=>4},
       ]
@@ -121,24 +127,49 @@ describe Fluent::CalcOutput do
       it { emit }
     end
 
-    context 'aggregate all' do
-      let(:config) do
-        CONFIG + %[
+    context 'aggregate' do
+      let(:emit) do
+        driver.run { messages.each {|message| driver.emit_with_tag(message, time, 'foo.bar') } }
+        driver.run { messages.each {|message| driver.emit_with_tag(message, time, 'foo.bar2') } }
+        driver.instance.flush_emit(0)
+      end
+
+      context 'aggregate all' do
+        let(:config) do
+          CONFIG + %[
           aggregate all
           tag foo
           sum _count$
-          max _max$
-          min _min$
-          avg _avg$
         ]
+        end
+        before do
+          Fluent::Engine.stub(:now).and_return(time)
+          Fluent::Engine.should_receive(:emit).with("foo", time, {
+            "4xx_count"=>12,"5xx_count"=>12,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
+          })
+        end
+        it { emit }
       end
-      before do
-        Fluent::Engine.stub(:now).and_return(time)
-        Fluent::Engine.should_receive(:emit).with("foo", time, { 
-          "4xx_count"=>6,"5xx_count"=>6,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
-        })
+
+      context 'aggregate tag' do
+        let(:config) do
+          CONFIG + %[
+          aggregate tag
+          add_tag_prefix calc
+          sum _count$
+          ]
+        end
+        before do
+          Fluent::Engine.stub(:now).and_return(time)
+          Fluent::Engine.should_receive(:emit).with("calc.foo.bar", time, {
+            "4xx_count"=>6,"5xx_count"=>6,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
+          })
+          Fluent::Engine.should_receive(:emit).with("calc.foo.bar2", time, {
+            "4xx_count"=>6,"5xx_count"=>6,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
+          })
+        end
+        it { emit }
       end
-      it { emit }
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-calc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naotoshi SEO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd