fluent-plugin-numeric-counter 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf34aed7a1bdec3baef3baca72cccc6ee8e858f3
-  data.tar.gz: e77034978932949f7f41d84ac426d6b8152d5d0e
+  metadata.gz: 0eca30c0960083f2d09de2e87ad573a3afe28a9a
+  data.tar.gz: db747780c5031f6e2b4af01724379f863f6ba320
 SHA512:
-  metadata.gz: 748cbafe875ef82c2069db03b8fb24e8ff9bd008abb75dde27d1853b5379a155156f7ec627a0c2adafecdb73a07b4590c78998fa7f5fd1af8440867e062cc13e
-  data.tar.gz: 468015aeee1dffdad2679eb85b829789569728d84f36a7c179d915cc883f6fc7dbabd4c24b016eba7ef14dd5eb4f55e49bef050a77ce226dcc5cfe024f315c58
+  metadata.gz: 5f37489d5f5a06fe67fc66ceab08b3e5648b48243c124fda7f7931d07b84e892972b426a230772c1ccfea8739cea87fb5f2a201fe48671989b8249d306dce897
+  data.tar.gz: 44ad33100faae45ab3fdd0ddd89d0c90875d2b5bda87dc2bfc5e06f24f2666c0e35707b33b562fbb38177079900603ae2e7f600feff03a7bf47591e59b00715e

data/.travis.yml

@@ -2,3 +2,5 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - 2.2

data/fluent-plugin-numeric-counter.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-numeric-counter"
-  gem.version       = "0.2.2"
+  gem.version       = "0.2.3"
   gem.authors       = ["TAGOMORI Satoshi"]
   gem.email         = ["tagomoris@gmail.com"]
   gem.description   = %q{Counts messages, with specified key and numeric value in specified range}
@@ -17,5 +17,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "delorean"
+  gem.add_development_dependency "test-unit", ">= 3.1.0"
   gem.add_runtime_dependency "fluentd"
 end

data/lib/fluent/plugin/out_numeric_counter.rb

@@ -8,23 +8,52 @@ class Fluent::NumericCounterOutput < Fluent::Output
 
   PATTERN_MAX_NUM = 20
 
-  config_param :count_interval, :time, :default => 60
-  config_param :unit, :string, :default => nil
-  config_param :output_per_tag, :bool, :default => false
-  config_param :aggregate, :string, :default => 'tag'
-  config_param :tag, :string, :default => 'numcount'
-  config_param :tag_prefix, :string, :default => nil
-  config_param :input_tag_remove_prefix, :string, :default => nil
-  config_param :count_key, :string
-  config_param :outcast_unmatched, :bool, :default => false
-  config_param :output_messages, :bool, :default => false
-  config_param :store_file, :string, :default => nil
+  config_param :count_interval, :time, :default => 60,
+               :desc => 'The interval time to count in seconds.'
+  config_param :unit, :string, :default => nil,
+               :desc => <<-DESC
+The interval time to monitor specified an unit (either of minute, hour, or day).
+Use either of count_interval or unit.
+DESC
+  config_param :output_per_tag, :bool, :default => false,
+               :desc => <<-DESC
+Emit for each input tag.
+tag_prefix must be specified together.
+DESC
+  config_param :aggregate, :string, :default => 'tag',
+               :desc => 'Calculate in each input tag separetely, or all records in a mass.'
+  config_param :tag, :string, :default => 'numcount',
+               :desc => 'The output tag.'
+  config_param :tag_prefix, :string, :default => nil,
+               :desc => <<-DESC
+The prefix string which will be added to the input tag.
+output_per_tag yes must be specified together.
+DESC
+  config_param :input_tag_remove_prefix, :string, :default => nil,
+               :desc => 'The prefix string which will be removed from the input tag.'
+  config_param :count_key, :string,
+               :desc => 'The key to count in the event record.'
+  config_param :outcast_unmatched, :bool, :default => false,
+               :desc => <<-DESC
+Specify yes if you do not want to include 'unmatched' counts into percentage.
+DESC
+  config_param :output_messages, :bool, :default => false,
+               :desc => 'Specify yes if you want to get tested messages.'
+  config_param :store_file, :string, :default => nil,
+               :desc => <<-DESC
+Store internal data into a file of the given path on shutdown, and load on starting.
+DESC
 
   # pattern0 reserved as unmatched counts
-  config_param :pattern1, :string # string: NAME LOW HIGH
-                                  # LOW/HIGH allows size prefix (ex: 10k, 5M, 3500G)
+  config_param :pattern1, :string,
+               :desc => <<-DESC
+string: NAME LOW HIGH
+LOW/HIGH allows size prefix (ex: 10k, 5M, 3500G)
+Note that pattern0 reserved as unmatched counts.
+DESC
   (2..PATTERN_MAX_NUM).each do |i|
-    config_param ('pattern' + i.to_s).to_sym, :string, :default => nil
+    config_param ('pattern' + i.to_s).to_sym, :string, :default => nil,
+                 :desc => 'string: NAME LOW HIGH'
   end
 
   attr_accessor :counts
@@ -38,6 +67,11 @@ class Fluent::NumericCounterOutput < Fluent::Output
     define_method("log") { $log }
   end
 
+  # Define `router` method of v0.12 to support v0.10.57 or earlier
+  unless method_defined?(:router)
+    define_method("router") { Fluent::Engine }
+  end
+
   def parse_num(str)
     if str.nil?
       nil
@@ -224,12 +258,12 @@ class Fluent::NumericCounterOutput < Fluent::Output
     if @output_per_tag
       time = Fluent::Engine.now
       flush_per_tags(step).each do |tag,message|
-        Fluent::Engine.emit(@tag_prefix_string + tag, time, message)
+        router.emit(@tag_prefix_string + tag, time, message)
       end
     else
       message = flush(step)
       if message.keys.size > 0
-        Fluent::Engine.emit(@tag, Fluent::Engine.now, message)
+        router.emit(@tag, Fluent::Engine.now, message)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-numeric-counter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -38,6 +38,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: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
@@ -89,10 +103,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 count messages with specified numeric values
 test_files:
 - test/helper.rb
 - test/plugin/test_out_numeric_counter.rb
+has_rdoc: