fluent-plugin-datacounter 0.2.0 → 0.2.1

data/README.rdoc

@@ -28,7 +28,7 @@ Count messages that have attribute 'referer' as 'google.com', 'yahoo.com' and 'f
       unit minute
       aggregate all
       count_key referer
-      # patternX: X(1-9)
+      # patternX: X(1-20)
       pattern1 google google.com
       pattern2 yahoo  yahoo.com
       pattern3 facebook facebook.com
@@ -41,7 +41,7 @@ Or, more exact match pattern, output per tags (default 'aggregate tag'), per hou
       type datacounter
       unit hour
       count_key referer
-      # patternX: X(1-9)
+      # patternX: X(1-20)
       pattern1 google ^http://www\.google\.com/.*
       pattern2 yahoo  ^http://www\.yahoo\.com/.*
       pattern3 twitter ^https://twitter.com/.*
@@ -54,7 +54,7 @@ HTTP status code patterns.
       count_interval 1m    # just same as 'unit minute' and 'count_interval 60s'
                            # you can also specify '30s', '5m', '2h' ....
       count_key status
-      # patternX: X(1-9)
+      # patternX: X(1-20)
       pattern1 2xx ^2\d\d$
       pattern2 3xx ^3\d\d$
       pattern3 404 ^404$    # we want only 404 counts...

data/fluent-plugin-datacounter.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-datacounter"
-  s.version     = "0.2.0"
+  s.version     = "0.2.1"
   s.authors     = ["TAGOMORI Satoshi"]
   s.email       = ["tagomoris@gmail.com"]
   s.homepage    = "https://github.com/tagomoris/fluent-plugin-datacounter"

data/lib/fluent/plugin/out_datacounter.rb

@@ -1,6 +1,8 @@
 class Fluent::DataCounterOutput < Fluent::Output
   Fluent::Plugin.register_output('datacounter', self)
 
+  PATTERN_MAX_NUM = 20
+
   config_param :count_interval, :time, :default => nil
   config_param :unit, :string, :default => 'minute'
   config_param :aggregate, :string, :default => 'tag'
@@ -10,7 +12,7 @@ class Fluent::DataCounterOutput < Fluent::Output
 
   # pattern0 reserved as unmatched counts
   config_param :pattern1, :string # string: NAME REGEXP
-  (2..9).each do |i|
+  (2..PATTERN_MAX_NUM).each do |i|
     config_param ('pattern' + i.to_s).to_sym, :string, :default => nil # NAME REGEXP
   end
 
@@ -42,7 +44,12 @@ class Fluent::DataCounterOutput < Fluent::Output
 
     @patterns = [[0, 'unmatched', nil]]
     pattern_names = ['unmatched']
-    (1..9).each do |i|
+
+    invalids = conf.keys.select{|k| k =~ /^pattern(\d+)$/}.select{|arg| arg =~ /^pattern(\d+)/ and not (1..PATTERN_MAX_NUM).include?($1.to_i)}
+    if invalids.size > 0
+      $log.warn "invalid number patterns (valid pattern number:1-20):" + invalids.join(",")
+    end
+    (1..PATTERN_MAX_NUM).each do |i|
       next unless conf["pattern#{i}"]
       name,regexp = conf["pattern#{i}"].split(' ', 2)
       @patterns.push([i, name, Regexp.new(regexp)])

data/test/plugin/test_out_datacounter.rb

@@ -177,6 +177,45 @@ class DataCounterOutputTest < Test::Unit::TestCase
     assert_equal 80.0, r2['hoge_percentage']
   end
 
+  def test_pattern_num
+    assert_equal 20, Fluent::DataCounterOutput::PATTERN_MAX_NUM
+
+    conf = %[
+      aggregate all
+      count_key field
+    ]
+    (1..20).each do |i|
+      conf += "pattern#{i} name#{i} ^#{i}$\n"
+    end
+    d = create_driver(conf, 'test.max')
+    d.run do
+      (1..20).each do |j|
+        d.emit({'field' => j})
+      end
+    end
+    r = d.instance.flush(60)
+    assert_equal 1, r['name1_count']
+    assert_equal 1, r['name2_count']
+    assert_equal 1, r['name3_count']
+    assert_equal 1, r['name4_count']
+    assert_equal 1, r['name5_count']
+    assert_equal 1, r['name6_count']
+    assert_equal 1, r['name7_count']
+    assert_equal 1, r['name8_count']
+    assert_equal 1, r['name9_count']
+    assert_equal 1, r['name10_count']
+    assert_equal 1, r['name11_count']
+    assert_equal 1, r['name12_count']
+    assert_equal 1, r['name13_count']
+    assert_equal 1, r['name14_count']
+    assert_equal 1, r['name15_count']
+    assert_equal 1, r['name16_count']
+    assert_equal 1, r['name17_count']
+    assert_equal 1, r['name18_count']
+    assert_equal 1, r['name19_count']
+    assert_equal 1, r['name20_count']
+  end
+
   def test_emit
     d1 = create_driver(CONFIG, 'test.tag1')
     d1.run do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datacounter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
+date: 2012-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &2160689900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160689900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fluentd
-  requirement: &2160689460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160689460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Output filter plugin to count messages that matches specified conditions
 email:
 - tagomoris@gmail.com
@@ -70,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fluent-plugin-datacounter
-rubygems_version: 1.8.6
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Output filter plugin to count messages that matches specified conditions