fluent-plugin-derive 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd95355aa8004a964c277475bc8716af8a1adea7
-  data.tar.gz: d7f05f7e00022daae25af6dbda1d926c421c6b1e
+  metadata.gz: 2edf79d1c0846b494a3e52d47d19078ed1b9ada0
+  data.tar.gz: 87e3e2840c5d56c7744a37bd4183de29db72ed93
 SHA512:
-  metadata.gz: 99ac284efb825d838b1a1f6cb434fa06b5772ae8512167d606ea4bdaaa98e0b54679999893756bc9316a3ab7565a79f9f6cf9451e45b7b82ae9287e23fdac9f6
-  data.tar.gz: 987957ac4fbd5222ad927cce3ab77166f3a6c702c093307bca8d414ea50b7de2f1162cc1b2e2552b766ca44a482cae09556cd34dc13226ddfa7a1a47ab35a2b2
+  metadata.gz: aff057813ef913ebc37a08f2ce37a4654039a66c6f5a97219e3d041ce50742bf3ba3ef25b53b595e676e9bace83808aa38a8815c04146f274f1b89aff4fe1ebb
+  data.tar.gz: 74be1d87a51f67e61b8291bee976880f68c83c2af8dce03b07f9f765f56210f40609d647d658ef67d7555b82cb706d5cda94b8956a5f4789e04afe9f1a872981

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.4 (2016/10/11)
+
+Enhancement:
+
+* Support RRD's counter_mode optionally. Thanks @paihu.
+
 # 0.0.3 (2014/08/04)
 
 Enhancement:

data/README.md

@@ -99,6 +99,10 @@ Define the expected range value. If min and/or max are specified any value outsi
 
 Optional. Divide the incleased value by interval time before output. The default is `true`. Set `false` for disable dividing.
 
+* counter_mode
+
+Optional. Use RRD's counter mode. The default is `false`. Set `true` for use RRD's counter.
+
 ## Contributing
 
 1. Fork it

data/fluent-plugin-derive.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-derive"
-  spec.version       = "0.0.3"
+  spec.version       = "0.0.4"
   spec.authors       = ["Nobuhiro Nikushi"]
   spec.email         = ["deneb.ge@gmail.com"]
   spec.description   = spec.summary

data/lib/fluent/plugin/out_derive.rb

@@ -15,6 +15,7 @@ class Fluent::DeriveOutput < Fluent::Output
   config_param :min, :integer, :default => nil
   config_param :max, :integer, :default => nil
   config_param :time_unit_division, :bool, :default => true
+  config_param :counter_mode, :bool, :default => false
 
   # for test
   attr_reader :key_pattern
@@ -157,9 +158,9 @@ class Fluent::DeriveOutput < Fluent::Output
       return nil
     end
     if @time_unit_division
-      rate = (cur_value - prev_value)/(cur_time - prev_time)
+      rate = _calc_rate(cur_value , prev_value)/(cur_time - prev_time)
     else
-      rate = cur_value - prev_value
+      rate = _calc_rate(cur_value , prev_value)
     end
     if adjustment && adjustment[0] == '*'
       rate * adjustment[1]
@@ -170,6 +171,19 @@ class Fluent::DeriveOutput < Fluent::Output
     end
   end
 
+  def _calc_rate(cur_value, prev_value)
+    rate = cur_value - prev_value
+    if @counter_mode
+      if rate < 0
+        rate += 2 ** 32 - 1
+      end
+      if rate < 0
+        rate += 2 ** 64 - 2 ** 32
+      end
+    end
+    rate
+  end
+
   def truncate_min(value, min)
     return nil unless value
     (value < min) ? min : value

data/spec/out_derive_spec.rb

@@ -299,6 +299,77 @@ describe Fluent::DeriveOutput do
         }
       end
 
+      context 'counter_mode true 32bit' do
+        let(:config) { %[
+          counter_mode true
+          tag rate
+          key1 foo
+          time_unit_division false
+        ]}
+        before do
+          driver.run {
+                  driver.emit({'foo'=> 4294967295}, time)
+                  driver.emit({'foo'=> 100}, time + 60)
+                  }
+        end
+        it {
+                driver.emits[1].should == ['rate', time + 60, {'foo'=> 100}]
+        }
+      end
+
+      context 'counter_mode not set 32bit' do
+        let(:config) { %[
+          tag rate
+          key1 foo
+          time_unit_division false
+        ]}
+        before do
+          driver.run {
+                  driver.emit({'foo'=> 4294967295}, time)
+                  driver.emit({'foo'=> 100}, time + 60)
+                  }
+        end
+        it {
+                driver.emits[1].should == ['rate', time + 60, {'foo'=> -4294967195}]
+        }
+      end
+
+      context 'counter_mode true 64bit' do
+        let(:config) { %[
+          counter_mode true
+          tag rate
+          key1 foo
+          time_unit_division false
+        ]}
+        before do
+          driver.run {
+                  driver.emit({'foo'=> 18446744073709551615}, time)
+                  driver.emit({'foo'=> 100}, time + 60)
+                  }
+        end
+        it {
+                driver.emits[1].should == ['rate', time + 60, {'foo'=> 100}]
+        }
+      end
+
+      context 'counter_mode not set 64bit' do
+        let(:config) { %[
+          tag rate
+          key1 foo
+          time_unit_division false
+        ]}
+        before do
+          driver.run {
+                  driver.emit({'foo'=> 18446744073709551615}, time)
+                  driver.emit({'foo'=> 100}, time + 60)
+                  }
+        end
+        it {
+                driver.emits[1].should == ['rate', time + 60, {'foo'=> -18446744073709551515}]
+        }
+      end
+
+
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-derive
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Nobuhiro Nikushi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: fluentd plugin to derive rate