fluent-plugin-flowcounter 0.1.3 → 0.1.4

data/README.rdoc

@@ -59,6 +59,16 @@ Counts from field 'message', per hour, aggregates all tags, output with tag 'flu
       # output configurations where to send count results
     </match>
 
+To count with all fields in messages, specify 'count_keys *'.
+
+    <match target.**>
+      type flowcounter
+      count_keys *
+      unit hour
+      aggregate all
+      tag fluentd.traffic
+    </match>
+
 == TODO
 
 - consider what to do next

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/fluent-plugin-flowcounter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fluent-plugin-flowcounter"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["TAGOMORI Satoshi"]
-  s.date = "2012-03-29"
+  s.date = "2012-04-24"
   s.description = "Plugin to counts messages/bytes that matches, per minutes/hours/days"
   s.email = "tagomoris@gmail.com"
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/tagomoris/fluent-plugin-flowcounter"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.19"
+  s.rubygems_version = "1.8.21"
   s.summary = "Plugin to counts messages/bytes that matches, per minutes/hours/days"
   s.test_files = ["test/helper.rb", "test/plugin/test_out_flowcounter.rb"]
 

data/lib/fluent/plugin/out_flowcounter.rb

@@ -9,6 +9,7 @@ class Fluent::FlowCounterOutput < Fluent::Output
 
   attr_accessor :counts
   attr_accessor :last_checked
+  attr_accessor :count_all
 
   def configure(conf)
     super
@@ -31,6 +32,7 @@ class Fluent::FlowCounterOutput < Fluent::Output
       @removed_length = @removed_prefix_string.length
     end
     @count_keys = @count_keys.split(',')
+    @count_all = (@count_keys == ['*'])
 
     @counts = count_initialized
     @mutex = Mutex.new
@@ -120,10 +122,17 @@ class Fluent::FlowCounterOutput < Fluent::Output
       name = tag[@removed_length..-1]
     end
     c,b = 0,0
-    es.each {|time,record|
-      c += 1
-      b += @count_keys.inject(0){|s,k| s + record[k].bytesize}
-    }
+    if @count_all
+      es.each {|time,record|
+        c += 1
+        b += record.keys.inject(0){|s,k| s + record[k].bytesize}
+      }
+    else
+      es.each {|time,record|
+        c += 1
+        b += @count_keys.inject(0){|s,k| s + record[k].bytesize}
+      }
+    end
     countup(name, c, b)
 
     chain.next

data/test/plugin/test_out_flowcounter.rb

@@ -67,6 +67,19 @@ count_keys message
     assert_equal 'test.flowcount', d.instance.tag
     assert_equal 'test', d.instance.input_tag_remove_prefix
     assert_equal ['message'], d.instance.count_keys
+
+    d = create_driver %[
+      unit day
+      aggregate all
+      tag test.flowcount
+      input_tag_remove_prefix test
+      count_keys *
+    ]
+    assert_equal :day, d.instance.unit
+    assert_equal :all, d.instance.aggregate
+    assert_equal 'test.flowcount', d.instance.tag
+    assert_equal 'test', d.instance.input_tag_remove_prefix
+    assert d.instance.count_all
   end
 
   def test_count_initialized
@@ -190,7 +203,33 @@ count_keys message
     d2.instance.flush_emit(60)
     emits = d2.emits
     assert_equal 1, emits.length
-    p emits[0].to_json
+    data = emits[0]
+    assert_equal 'flowcount', data[0] # tag
+    assert_equal 60*5, data[2]['count']
+    assert_equal 60*5*20, data[2]['bytes']
+  end
+
+  def test_emit3
+    d3 = create_driver( %[
+      unit minute
+      aggregate all
+      tag  flowcount
+      input_tag_remove_prefix test
+      count_keys *
+    ], 'test.tag3')
+    time = Time.now.to_i
+    d3.run do
+      60.times do 
+        d3.emit({'f1' => 'abcde', 'f2' => 'vwxyz', 'f3' => '0123456789'})
+        d3.emit({'f1' => 'abcde', 'f2' => 'vwxyz', 'f3' => '0123456789'})
+        d3.emit({'f1' => 'abcde', 'f2' => 'vwxyz', 'f3' => '0123456789'})
+        d3.emit({'f1' => 'abcde', 'f2' => 'vwxyz', 'f3' => '0123456789'})
+        d3.emit({'f1' => 'abcde', 'f2' => 'vwxyz', 'f3' => '0123456789'})
+      end
+    end
+    d3.instance.flush_emit(60)
+    emits = d3.emits
+    assert_equal 1, emits.length
     data = emits[0]
     assert_equal 'flowcount', data[0] # tag
     assert_equal 60*5, data[2]['count']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-flowcounter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-29 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -189,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3181497759668816793
+      hash: 3237314410143149168
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Plugin to counts messages/bytes that matches, per minutes/hours/days