fluent-plugin-numeric-monitor 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed7ae5ea19e39d2c8681925b418fb903f2c04edc
-  data.tar.gz: b8ac80695a505db3f0de381bdfd1ff3f78f10232
+  metadata.gz: e9958f6c8175857684aa47425a26b7a334570e6a
+  data.tar.gz: 64f7c2b792cf2a14b62e4f120ece11e5f0aab977
 SHA512:
-  metadata.gz: 048e8fc9090e7a8cac43820b9892878c180acad53d40f890c16d9928f6685e907259bc9a75ed81888cb60a8f230df1c6cc2f0021393cb8c3db07fd6c5a3e52d9
-  data.tar.gz: 05958871c3bb114ca921ced7af82676d03ce7741beea5c17d6c518c50813b40afe4cc6a3a7b476e5a2a1b5df1353521b3ac854167d4b1f4bb8fd5ab2383ef112
+  metadata.gz: c9ea36335547a948cfd4f808224c4c55158ca350a9fc39f1a5c5135a1da19c5ded3f456440d3de21cdec05740e2c17ecb19f6efa39d8a6ac90d6d7cdccbefc4e
+  data.tar.gz: 030b305fc8bb4bcf9c504d683d33a1c5ca511e57c7fe97b86a276d2a5728c005119fe6c33db0f9db37e81c709a562755888bbe21a97310afc4c1c855c08f15dd

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.5
+  - 2.2.2

data/example/test.conf

@@ -0,0 +1,17 @@
+<source>
+  @type dummy
+  tag testing
+  rate 10
+  auto_increment_key num
+  dummy [{"str": "message"}]
+</source>
+
+<match testing>
+  @type numeric_monitor
+  count_interval 10s
+  monitor_key num
+</match>
+
+<match monitor>
+  @type stdout
+</match>

data/example/test_1s.conf

@@ -0,0 +1,17 @@
+<source>
+  @type dummy
+  tag testing
+  rate 10
+  auto_increment_key num
+  dummy [{"str": "message"}]
+</source>
+
+<match testing>
+  @type numeric_monitor
+  count_interval 1s
+  monitor_key num
+</match>
+
+<match monitor>
+  @type stdout
+</match>

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.7"
+  gem.version       = "0.1.8"
   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}
@@ -15,5 +15,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "test-unit"
   gem.add_runtime_dependency "fluentd"
 end

data/lib/fluent/plugin/out_numeric_monitor.rb

@@ -8,13 +8,21 @@ class Fluent::NumericMonitorOutput < Fluent::Output
 
   EMIT_STREAM_RECORDS = 100
 
-  config_param :count_interval, :time, :default => 60
-  config_param :unit, :string, :default => nil
-  config_param :tag, :string, :default => 'monitor'
-  config_param :tag_prefix, :string, :default => nil
+  config_param :count_interval, :time, default: 60
+  config_param :unit, default: nil do |value|
+    case value
+    when 'minute' then 60
+    when 'hour' then 3600
+    when 'day' then 86400
+    else
+      raise Fluent::ConfigError, "unit must be one of minute/hour/day"
+    end
+  end
+  config_param :tag, :string, default: 'monitor'
+  config_param :tag_prefix, :string, default: nil
 
-  config_param :output_per_tag, :bool, :default => false
-  config_param :aggregate, :default => 'tag' do |val|
+  config_param :output_per_tag, :bool, default: false
+  config_param :aggregate, default: 'tag' do |val|
     case val
     when 'tag' then :tag
     when 'all' then :all
@@ -22,10 +30,10 @@ class Fluent::NumericMonitorOutput < Fluent::Output
       raise Fluent::ConfigError, "aggregate MUST be one of 'tag' or 'all'"
     end
   end
-  config_param :input_tag_remove_prefix, :string, :default => nil
+  config_param :input_tag_remove_prefix, :string, default: nil
   config_param :monitor_key, :string
-  config_param :output_key_prefix, :string, :default => nil
-  config_param :percentiles, :default => nil do |val|
+  config_param :output_key_prefix, :string, default: nil
+  config_param :percentiles, default: nil do |val|
     values = val.split(",").map(&:to_i)
     if values.select{|i| i < 1 or i > 99 }.size > 0
       raise Fluent::ConfigError, "percentiles MUST be specified between 1 and 99 by integer"
@@ -33,22 +41,15 @@ class Fluent::NumericMonitorOutput < Fluent::Output
     values
   end
 
-  config_param :samples_limit, :integer, :default => 1000000
+  config_param :samples_limit, :integer, default: 1000000
+  config_param :interval, :float, default: 0.5
 
   attr_accessor :count, :last_checked
 
   def configure(conf)
     super
 
-    if @unit
-      @count_interval = case @unit
-                        when 'minute' then 60
-                        when 'hour' then 3600
-                        when 'day' then 86400
-                        else
-                          raise Fluent::ConfigError, "unit must be one of minute/hour/day"
-                        end
-    end
+    @count_interval = @unit if @unit
 
     if @input_tag_remove_prefix
       @removed_prefix_string = @input_tag_remove_prefix + '.'
@@ -64,7 +65,7 @@ class Fluent::NumericMonitorOutput < Fluent::Output
       raise Fluent::ConfigError, 'Specify both of output_per_tag and tag_prefix'
     end
     @tag_prefix_string = @tag_prefix + '.' if @output_per_tag
-    
+
     @count = count_initialized
     @mutex = Mutex.new
   end
@@ -88,8 +89,8 @@ class Fluent::NumericMonitorOutput < Fluent::Output
   def watch
     @last_checked = Fluent::Engine.now
     while true
-      sleep 0.5
-      if Fluent::Engine.now - @last_checked > @count_interval
+      sleep @interval
+      if Fluent::Engine.now - @last_checked >= @count_interval
         now = Fluent::Engine.now
         flush_emit
         @last_checked = now
@@ -101,15 +102,15 @@ class Fluent::NumericMonitorOutput < Fluent::Output
     # counts['tag'] = {:min => num, :max => num, :sum => num, :num => num [, :sample => [....]]}
     if @aggregate == :all
       if @percentiles
-        {'all' => {:min => nil, :max => nil, :sum => nil, :num => 0, :sample => []}}
+        {'all' => {min: nil, max: nil, sum: nil, num: 0, sample: []}}
       else
-        {'all' => {:min => nil, :max => nil, :sum => nil, :num => 0}}
+        {'all' => {min: nil, max: nil, sum: nil, num: 0}}
       end
     elsif keys
       values = if @percentiles
-                 Array.new(keys.length) {|i| {:min => nil, :max => nil, :sum => nil, :num => 0, :sample => []}}
+                 Array.new(keys.length) {|i| {min: nil, max: nil, sum: nil, num: 0, sample: []}}
                else
-                 Array.new(keys.length) {|i| {:min => nil, :max => nil, :sum => nil, :num => 0}}
+                 Array.new(keys.length) {|i| {min: nil, max: nil, sum: nil, num: 0}}
                end
       Hash[[keys, values].transpose]
     else
@@ -193,8 +194,8 @@ class Fluent::NumericMonitorOutput < Fluent::Output
     end
 
     @mutex.synchronize do
-      c = (@count[tag] ||= {:min => nil, :max => nil, :sum => nil, :num => 0})
-      
+      c = (@count[tag] ||= {min: nil, max: nil, sum: nil, num: 0})
+
       if c[:min].nil? or c[:min] > min
         c[:min] = min
       end
@@ -208,7 +209,7 @@ class Fluent::NumericMonitorOutput < Fluent::Output
         c[:sample] ||= []
         if c[:sample].size + sample.size > @samples_limit
           (c[:sample].size + sample.size - @samples_limit).times do
-            c[:sample].delete_at(rand(c[:sample].size)) 
+            c[:sample].delete_at(rand(c[:sample].size))
           end
         end
         c[:sample] += sample

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-numeric-monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- example/test.conf
+- example/test_1s.conf
 - fluent-plugin-numeric-monitor.gemspec
 - lib/fluent/plugin/out_numeric_monitor.rb
 - test/helper.rb
@@ -76,10 +92,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Fluentd plugin to calculate min/max/avg/Xpercentile values
 test_files:
 - test/helper.rb
 - test/plugin/test_out_numeric_monitor.rb
+has_rdoc: