fluent-plugin-metricsense 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/fluent/plugin/out_metricsense.rb

@@ -61,7 +61,7 @@ module Fluent
 
     config_param :backend, :string
 
-    config_param :aggregate_interval, :integer, :default => 60
+    config_param :aggregate_interval, :time, :default => 60
 
     def configure(conf)
       super
@@ -85,6 +85,11 @@ module Fluent
         raise ConfigError, "unknown backend: #{@backend.inspect}"
       end
 
+      # aggregate_interval must be a multiple of 60 to normalize values
+      # into X per minute
+      @aggregate_interval = @aggregate_interval.to_i / 60 * 60
+      @normalize_factor = @aggregate_interval / 60
+
       @backend = be.new
       @backend.configure(conf)
     end
@@ -171,6 +176,10 @@ module Fluent
       end
       attr_reader :value
 
+      def normalized_value(n)
+        n == 1 ? @value : @value.to_f / n
+      end
+
       def add(value)
         @value += value
       end
@@ -186,6 +195,10 @@ module Fluent
       end
       attr_reader :value
 
+      def normalized_value(n)
+        @value
+      end
+
       def add(value)
         if @value < value
           @value = value
@@ -231,7 +244,7 @@ module Fluent
 
       data = []
       counters.each_pair {|ak,up|
-        data << [ak.tag, ak.time, up.value, ak.seg_key, ak.seg_val, up.mode]
+        data << [ak.tag, ak.time, up.normalized_value(@normalize_factor), ak.seg_key, ak.seg_val, up.mode]
       }
 
       @backend.write(data)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-metricsense
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd