fluent-plugin-calc 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb6d86f52bcefcd6d104c356cc6df3b707196ec8
-  data.tar.gz: 03b34ce3169a1f29c08823d1cfd8f2850822d6c9
+  metadata.gz: 3c4e47d56f27cba7e3e04f0738eb6434456ce824
+  data.tar.gz: e759f302614709da9350bd0f59a748cc7ab6d724
 SHA512:
-  metadata.gz: 1960a83a0a998933536bf6ea48c6129692258849e474f2ad701865c081b6fc268bdfc01e4d3591cbedc13b414a08837ea68fb6417f3097e49f0ba682c1e9fa0b
-  data.tar.gz: 6b97b056a3654180cbb8530e7744f75b606380d3cb513813f8b98a5327cb92fecf58ee69c49a5424025d48656533ebf2ca95aeb4c0cb9a452f59e48c42149061
+  metadata.gz: f9701abea3da09295a09a02fd8867fc882644ef9f980ea2896ea95e953945f8413790494fb784cfd19294f451e1ef0300961e3298619f864629371e20fefffee
+  data.tar.gz: 1a1d71d9497dc2bfb394eb1cc58c47daed5dd3b4aab686a7388a6ad22218dcba23513d8c0bf41eb5bb09df165373a05138afa0b7682ebf7212d3699c9191a919

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.5 (2013/09/02)
+
+Enhancement:
+
+- add `sum_keys`, `max_keys`, `min_keys`, `avg_keys`.
+
 ## 0.0.4 (2013/08/30)
 
 Enhancement:

data/README.md

@@ -4,7 +4,7 @@ Simple fluentd plugin to calculate messages.
 
 ## Configuration
 
-Example1)
+### Example 1
 
 sum for xxx_count, max for xxx_max, min for xxx_min, avg for xxx_avg
 
@@ -28,7 +28,7 @@ then output bocomes as belows:
 
     calc.foo.bar: {"4xx_count":5,"5xx_count":4","reqtime_max":24831,"reqtime_min":10,"reqtime_avg":270.46}
 
-Example2)
+### Example 2
 
 sum, max, min, avg for the same key
 
@@ -60,7 +60,13 @@ then output bocomes as belows:
 
 - sum, min, max, avg
 
-    Calculation. Specify input keys by a regular expression
+    Target of calculation. Specify input keys by a regular expression
+
+- sum\_keys, min\_keys, max\_keys, avg\_keys
+
+    Target of calculation. Specify input keys by a string separated by , (comma) such as
+
+        sum_keys 4xx_count,5xx_count
 
 - sum\_suffix, min\_suffix, max\_suffix, avg\_suffix
 

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.4"
+  s.version     = "0.0.5"
   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

@@ -11,6 +11,10 @@ class Fluent::CalcOutput < Fluent::Output
   config_param :max, :string, :default => nil
   config_param :min, :string, :default => nil
   config_param :avg, :string, :default => nil
+  config_param :sum_keys, :string, :default => nil
+  config_param :max_keys, :string, :default => nil
+  config_param :min_keys, :string, :default => nil
+  config_param :avg_keys, :string, :default => nil
   config_param :sum_suffix, :string, :default => ""
   config_param :max_suffix, :string, :default => ""
   config_param :min_suffix, :string, :default => ""
@@ -35,6 +39,10 @@ class Fluent::CalcOutput < Fluent::Output
     @max = Regexp.new(@max) if @max
     @min = Regexp.new(@min) if @min
     @avg = Regexp.new(@avg) if @avg
+    @sum_keys = @sum_keys ? @sum_keys.split(',') : []
+    @max_keys = @max_keys ? @max_keys.split(',') : []
+    @min_keys = @min_keys ? @min_keys.split(',') : []
+    @avg_keys = @avg_keys ? @avg_keys.split(',') : []
 
     unless ['tag', 'all'].include?(@aggregate)
       raise Fluent::ConfigError, "aggregate allows tag/all"
@@ -70,6 +78,18 @@ class Fluent::CalcOutput < Fluent::Output
     # calc
     count = 0; matches = { :sum => {}, :max => {}, :min => {}, :avg => {} }
     es.each do |time, record|
+      @sum_keys.each do |key|
+        matches[:sum][key] = sum(matches[:sum][key], record[key])
+      end
+      @max_keys.each do |key|
+        matches[:max][key] = max(matches[:max][key], record[key])
+      end
+      @min_keys.each do |key|
+        matches[:min][key] = min(matches[:min][key], record[key])
+      end
+      @avg_keys.each do |key|
+        matches[:avg][key] = avg(matches[:avg][key], record[key])
+      end
       record.keys.each do |key|
         if @sum and @sum.match(key)
           matches[:sum][key] = sum(matches[:sum][key], record[key])
@@ -83,7 +103,7 @@ class Fluent::CalcOutput < Fluent::Output
         if @avg and @avg.match(key)
           matches[:avg][key] = sum(matches[:avg][key], record[key]) # sum yet
         end
-      end
+      end if @sum || @max || @min || @avg
       count += 1
     end
 
@@ -216,7 +236,7 @@ class Fluent::CalcOutput < Fluent::Output
           stored[:min] == @min and
           stored[:avg] == @avg
 
-          if !stored[:matches].first[1].has_key?(:max)
+          if !stored[:matches].empty? and !stored[:matches].first[1].has_key?(:max)
             $log.warn "out_calc: stored data does not have compatibility with the current version. ignore stored data"
             return
           end

data/spec/out_calc_spec.rb

@@ -96,6 +96,24 @@ describe Fluent::CalcOutput do
       it { emit }
     end
 
+    context 'sum/max/min/avg_keys' do
+      let(:config) do
+        CONFIG + %[
+          sum_keys 4xx_count,5xx_count
+          max reqtime_max
+          min reqtime_min
+          avg reqtime_avg
+        ]
+      end
+      before do
+        Fluent::Engine.stub(:now).and_return(time)
+        Fluent::Engine.should_receive(:emit).with("calc.#{tag}", time, {
+          "4xx_count"=>6,"5xx_count"=>6,"reqtime_max"=>6,"reqtime_min"=>1,"reqtime_avg"=>3.0
+        })
+      end
+      it { emit }
+    end
+
     context 'sum/max/min/avg_suffix' do
       let(:config) do
         CONFIG + %[

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-calc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Naotoshi SEO
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd