fluent-plugin-numeric-monitor 0.1.2 → 0.1.3

data/fluent-plugin-numeric-monitor.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-numeric-monitor"
-  gem.version       = "0.1.2"
+  gem.version       = "0.1.3"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{Fluentd plugin to calculate min/max/avg/Xpercentile values, and emit these data as message}

data/lib/fluent/plugin/out_numeric_monitor.rb

@@ -113,12 +113,15 @@ class Fluent::NumericMonitorOutput < Fluent::Output
       if c[:num] then output['num'] = c[:num] end
       if c[:min] then output['min'] = c[:min] end
       if c[:max] then output['max'] = c[:max] end
-      if c[:num] > 0 then output['avg'] = (c[:sum] * 100.0 / (c[:num] * 1.0)).round / 100 end
+      if c[:num] > 0 then output['avg'] = (c[:sum] * 100.0 / (c[:num] * 1.0)).round / 100.0 end
       if @percentiles
         sorted = c[:sample].sort
         @percentiles.each do |p|
           i = (c[:num] * p / 100).floor
-          output["percentile_#{p}"] = c[:sample][i]
+          if i > 0
+            i -= 1
+          end
+          output["percentile_#{p}"] = sorted[i]
         end
       end
       return output

data/test/plugin/test_out_numeric_monitor.rb

@@ -65,6 +65,39 @@ class NumericMonitorOutputTest < Test::Unit::TestCase
     assert_equal 100, r1['tag1_num']
   end
 
+  def test_emit_aggregate_all
+    d1 = create_driver(%[
+      unit minute
+      tag monitor.test
+      input_tag_remove_prefix test
+      aggregate all
+      monitor_key field1
+      percentiles 80,90
+    ], 'test.tag1')
+
+    d1.run do
+      10.times do
+        d1.emit({'field1' => 0})
+        d1.emit({'field1' => '1'})
+        d1.emit({'field1' => 2})
+        d1.emit({'field1' => '3'})
+        d1.emit({'field1' => 4})
+        d1.emit({'field1' => 5})
+        d1.emit({'field1' => 6})
+        d1.emit({'field1' => 7})
+        d1.emit({'field1' => 8})
+        d1.emit({'field1' => 9})
+      end
+    end
+    r1 = d1.instance.flush
+    assert_equal 0, r1['min']
+    assert_equal 9, r1['max']
+    assert_equal 4.5, r1['avg']
+    assert_equal 7, r1['percentile_80']
+    assert_equal 8, r1['percentile_90']
+    assert_equal 100, r1['num']
+  end
+
   def test_without_percentiles
     d = create_driver(%[
       unit minute

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-numeric-monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2013-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd