fluent-plugin-datacounter 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64d80ad86bd2585306cd7f6e9ba750f7949d1740
-  data.tar.gz: dc801aa3ae66d93fd1e476743629a06d9dd9df75
+  metadata.gz: 4cfe9eca2a4e10f492885b664bacc09ad0b7778b
+  data.tar.gz: 3830e5d5e8d337cb69c68b1498616c9db434693c
 SHA512:
-  metadata.gz: 99dea601abca6ae123a04e568e5ead302af893f86c4ab9b0682a9f4a6993896aee5cd3f524a03dfcde536905e25a2ed0d1d5e70577161c2e5032b1fc3c46f02b
-  data.tar.gz: 7cc35142eb8ec3484188f4a95656d22ba8983ed994a6d69ce46050925eded3cb22e7f2a16f9bcfe778492d7721791f6546d03cd3514ac228873e5ead521aced7
+  metadata.gz: 0db6a72abf014b2cc6ba7a4910774cd757e68552068500b31b0d02245371ecda00c2cbd1d2573bc1acef60ebc75462a9dab190f73ef9017ca1ce77d2de09c560
+  data.tar.gz: bfb3bad278d68359493f2cf1a431e0870691d92fa11aab3317f6004ad9feccfc3abee5dc77382c48d6395d987db14b933c7f3629659b382c516fee3f891366e1

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.8
+  - 2.2.4
+

data/fluent-plugin-datacounter.gemspec

@@ -1,13 +1,13 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-datacounter"
-  gem.version     = "0.4.4"
+  gem.version     = "0.4.5"
   gem.authors     = ["TAGOMORI Satoshi"]
   gem.email       = ["tagomoris@gmail.com"]
   gem.homepage    = "https://github.com/tagomoris/fluent-plugin-datacounter"
   gem.summary     = %q{Fluentd plugin to count records with specified regexp patterns}
   gem.description = %q{To count records with string fields by regexps (To count records with numbers, use numeric-counter)}
-  gem.license     = "APLv2"
+  gem.license     = "Apache-2.0"
 
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/fluent/plugin/out_datacounter.rb

@@ -6,6 +6,11 @@ class Fluent::DataCounterOutput < Fluent::Output
     define_method("log") { $log }
   end
 
+  # Define `router` method of v0.12 to support v0.10 or earlier
+  unless method_defined?(:router)
+    define_method("router") { Fluent::Engine }
+  end
+
   def initialize
     super
     require 'pathname'
@@ -13,22 +18,35 @@ class Fluent::DataCounterOutput < Fluent::Output
 
   PATTERN_MAX_NUM = 20
 
-  config_param :count_interval, :time, :default => nil
-  config_param :unit, :string, :default => 'minute'
-  config_param :output_per_tag, :bool, :default => false
-  config_param :aggregate, :string, :default => 'tag'
-  config_param :tag, :string, :default => 'datacount'
-  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 => nil,
+               :desc => 'The interval time to count in seconds.'
+  config_param :unit, :string, :default => 'minute',
+               :desc => 'The interval time to monitor specified an unit (either of minute, hour, or day).'
+  config_param :output_per_tag, :bool, :default => false,
+               :desc => 'Emit for each input tag. tag_prefix must be specified together.'
+  config_param :aggregate, :string, :default => 'tag',
+               :desc => 'Calculate in each input tag separetely, or all records in a mass.'
+  config_param :tag, :string, :default => 'datacount',
+               :desc => 'The output tag.'
+  config_param :tag_prefix, :string, :default => nil,
+               :desc => 'The prefix string which will be added to the input tag.'
+  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 => 'Specify yes if you do not want to include \'unmatched\' counts into percentage. '
+  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 => 'Store internal data into a file of the given path on shutdown, and load on starting.'
 
   # pattern0 reserved as unmatched counts
-  config_param :pattern1, :string # string: NAME REGEXP
+  config_param :pattern1, :string, # string: NAME REGEXP
+               :desc => 'Specify RegexpName and Regexp. format: NAME REGEXP'
   (2..PATTERN_MAX_NUM).each do |i|
-    config_param ('pattern' + i.to_s).to_sym, :string, :default => nil # NAME REGEXP
+    config_param ('pattern' + i.to_s).to_sym, :string, :default => nil, # NAME REGEXP
+                 :desc => "Specify RegexpName and Regexp. format: NAME REGEXP"
   end
 
   attr_accessor :tick
@@ -221,12 +239,12 @@ class Fluent::DataCounterOutput < Fluent::Output
       # tag - message maps
       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-datacounter
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -101,7 +101,7 @@ files:
 - test/plugin/test_out_datacounter.rb
 homepage: https://github.com/tagomoris/fluent-plugin-datacounter
 licenses:
-- APLv2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []