fluent-plugin-derive 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40df6241c18260283efffec5f0f93c244c34a40b
-  data.tar.gz: 5915919018654ad6c36a6bb55ec333f63165ac93
+  metadata.gz: bd95355aa8004a964c277475bc8716af8a1adea7
+  data.tar.gz: d7f05f7e00022daae25af6dbda1d926c421c6b1e
 SHA512:
-  metadata.gz: 24921c68f917045f314586080a70a35703e313b132ec4f1d610680c531674845fefc260b4b13c69648ca33b27d2eff6a1abac60e54b8819e6a577d94c2f5c4f2
-  data.tar.gz: c99527ac6b9b5479e4f5a6d2cf252473439135390110757aa495934e0da1b029c108bfdad16be77442b890f8282a9776b242942d87f96512d7df7adaa6041412
+  metadata.gz: 99ac284efb825d838b1a1f6cb434fa06b5772ae8512167d606ea4bdaaa98e0b54679999893756bc9316a3ab7565a79f9f6cf9451e45b7b82ae9287e23fdac9f6
+  data.tar.gz: 987957ac4fbd5222ad927cce3ab77166f3a6c702c093307bca8d414ea50b7de2f1162cc1b2e2552b766ca44a482cae09556cd34dc13226ddfa7a1a47ab35a2b2

data/.travis.yml

@@ -6,3 +6,4 @@ rvm:
 gemfile:
   - Gemfile
   - Gemfile.fluentd.lt.0.10.43
+  - Gemfile.fluentd.lt.0.10.47

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.0.3 (2014/08/04)
+
+Enhancement:
+
+* time_unit_division option to disable divinding by unit time. Thanks @avvmoto! 
+
 # 0.0.2 (2014/02/07)
 
 Enhancement:

data/Gemfile.fluentd.lt.0.10.47

@@ -0,0 +1,8 @@
+source 'https://rubygems.org'
+
+# fluentd 0.10.47 or later supports Fluent::Test::DummyLogDevice.
+# This tests lt 0.10.47 on travis ci.
+gem 'fluentd', '= 0.10.46'
+
+# Specify your gem's dependencies in fluent-plugin-derive.gemspec
+gemspec

data/README.md

@@ -1,4 +1,4 @@
-# fluent-plugin-derive
+# fluent-plugin-derive, a plugin for [Fluentd](http://fluentd.org)
 
 Calculate per second value for the increasing/decreasing value between the last and the current, like derive in RRDTool.
 
@@ -95,6 +95,10 @@ Define the expected range value. If min and/or max are specified any value outsi
 
 Define the expected range value. If min and/or max are specified any value outside the defined range will be truncated.
 
+* time_unit_division
+
+Optional. Divide the incleased value by interval time before output. The default is `true`. Set `false` for disable dividing.
+
 ## 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.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Nobuhiro Nikushi"]
   spec.email         = ["deneb.ge@gmail.com"]
   spec.description   = spec.summary
@@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "fluentd"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", '~> 2.99.0'
 end

data/lib/fluent/plugin/out_derive.rb

@@ -14,6 +14,7 @@ class Fluent::DeriveOutput < Fluent::Output
   config_param :remove_tag_prefix, :string, :default => nil
   config_param :min, :integer, :default => nil
   config_param :max, :integer, :default => nil
+  config_param :time_unit_division, :bool, :default => true
 
   # for test
   attr_reader :key_pattern
@@ -155,7 +156,11 @@ class Fluent::DeriveOutput < Fluent::Output
       log.warn "Could not calculate the rate. multiple input less than one second or minus delta of seconds on tag=#{tag}, key=#{key}"
       return nil
     end
-    rate = (cur_value - prev_value)/(cur_time - prev_time)
+    if @time_unit_division
+      rate = (cur_value - prev_value)/(cur_time - prev_time)
+    else
+      rate = cur_value - prev_value
+    end
     if adjustment && adjustment[0] == '*'
       rate * adjustment[1]
     elsif adjustment && adjustment[0] == '/'

data/spec/out_derive_spec.rb

@@ -282,6 +282,22 @@ describe Fluent::DeriveOutput do
         }
       end
 
+      context 'time_unit_division false' do
+        let(:config) { %[
+          tag rate
+          key1 foo
+          time_unit_division false
+        ]}
+        before do
+          driver.run {
+            driver.emit({'foo'=> 100}, time)
+            driver.emit({'foo'=> 700}, time + 60)
+          }
+        end
+        it {
+          driver.emits[1].should == ['rate', time + 60, {'foo' => 600}]
+        }
+      end
 
     end
   end
@@ -307,17 +323,20 @@ describe Fluent::DeriveOutput do
     if Fluent::VERSION >= "0.10.43"
       context "log_level info" do
         let(:config) { base_config + %[log_level info] }
+        subject { Fluent::VERSION <= "0.10.46" ? capture_log(log) {|log| log.debug "foobar" } : log.tap{|log| log.debug "foobar" }.logs }
 
         it "should not contain debug level" do
-          capture_log(log) {|log| log.debug "foobar" }.should == ""
+          should be_empty
         end
       end
     end
 
     context "log" do
       let(:config) { base_config }
+      subject { Fluent::VERSION <= "0.10.46" ? capture_log(log) {|log| log.debug "foobar" } : log.tap{|log| log.debug "foobar" }.logs.first }
+
       it "should work" do
-        capture_log(log) {|log| log.info "foobar" }.should include("foobar")
+        should include("foobar")
       end
     end
   end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-derive
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Nobuhiro Nikushi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.99.0
 description: ''
 email:
 - deneb.ge@gmail.com
@@ -59,12 +59,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.fluentd.lt.0.10.43
+- Gemfile.fluentd.lt.0.10.47
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -83,17 +84,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: fluentd plugin to derive rate