fluent-plugin-redis-counter 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjcyZmZkMWJmZWM1Y2IyMDg5YzY5OTc0Y2M2NDEyOWJjMDdlODBhNw==
+  data.tar.gz: !binary |-
+    ODk1ZmUyNWRlNjQzMWI1OWJjZTYyMDdlN2Y1ZjBkOTI3MWVmNGMzMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    M2FjODc0ZjUwNzU1M2E3M2VmYWIzYmUyOTE5N2U3ZWU0ZDAxZjRhMzhjM2Yw
+    ZjExNmE5OTVkNTk2YTZhODJiYTdhNjBhMmU0MzAwMDk0ZWU1ODZmNjBmMDUz
+    NDc3MGE0ODRkYzZhYTkwZWIyYWYzNWNjZDRhMjI2NjhlOWQxMjE=
+  data.tar.gz: !binary |-
+    MjMyNmM4OWFmNzg4YmYzNGFlMWE5Yjk5OTBkYWQ0YzFmNTg5NTJlYTZmZDdh
+    ZDBlY2EwMzI0YjlkZDE5YjVjZWE2MDk1OTE2Mjc2MzI3ZjBlMGZlMzQ2MjZl
+    MThlNzQ2N2FhZmQyMTI1NzUyODUzNDIzMjA1NWI1YWFhOWM3NmE=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.3.0
+* count value can be picked up from JSON data contents.
+
 ## 0.2.0
 * count key can be built from JSON data contents.
 

data/README.md

@@ -49,6 +49,14 @@ fluent-plugin-redis-counter is hosted by [RubyGems.org](https://rubygems.org/).
         match_status ^2[0-9][0-9]$
         count_key_format customer:%_{customer_id}:status2xx-%Y-%m-%d
       </pattern>
+
+      # you can also sum up specified key with count_value_key option.
+      # for example, {"count": 321, "customer_id": 123 ... }.
+      # INCRBY item_count:123 321.
+      <pattern>
+        count_key_format item_count:%_{item_id}
+        count_value_key count
+      </pattern>
     </match>
 
 # Example

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/fluent-plugin-redis-counter.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-redis-counter"
-  s.version     = "0.2.0"
+  s.version     = "0.3.0"
   s.description = "fluent-plugin-redis-counter is a fluent plugin to count-up/down redis keys."
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Buntaro Okada"]
-  s.date        = %q{2013-02-19}
+  s.date        = %q{2013-05-06}
   s.email       = "kbinani.bt@gmail.com"
   s.homepage    = "https://github.com/kbinani/fluent-plugin-redis-counter"
   s.summary     = "Redis counter plugin for fluent"

data/lib/fluent/plugin/out_redis_counter.rb

@@ -52,7 +52,7 @@ module Fluent
             @patterns.select { |pattern|
               pattern.is_match?(record)
             }.each{ |pattern|
-              table[pattern.get_count_key(time, record)] += pattern.count_value
+              table[pattern.get_count_key(time, record)] += pattern.get_count_value(record)
             }
           }
         rescue EOFError
@@ -84,7 +84,7 @@ module Fluent
     end
 
     class Pattern
-      attr_reader :matches, :count_value
+      attr_reader :matches, :count_value, :count_value_key
 
       def initialize(conf_element)
         if !conf_element.has_key?('count_key') && !conf_element.has_key?('count_key_format')
@@ -107,12 +107,16 @@ module Fluent
           @count_key_format = [conf_element['count_key_format'], is_localtime]
         end
 
-        @count_value = 1
-        if conf_element.has_key?('count_value')
-          begin
-            @count_value = Integer(conf_element['count_value'])
-          rescue
-            raise RedisCounterException, 'invalid "count_value", integer required.'
+        if conf_element.has_key?('count_value_key')
+          @count_value_key = conf_element['count_value_key']
+        else
+          @count_value = 1
+          if conf_element.has_key?('count_value')
+            begin
+              @count_value = Integer(conf_element['count_value'])
+            rescue
+              raise RedisCounterException, 'invalid "count_value", integer required.'
+            end
           end
         end
 
@@ -143,6 +147,17 @@ module Fluent
           formatter.format(time)
         end
       end
+
+      def get_count_value(record)
+        if @count_value_key
+          ret = record[@count_value_key] || 0
+          return ret.kind_of?(Integer) ? ret : 0
+        else
+          if @count_value
+            return @count_value
+          end
+        end
+      end
     end
   end
 end

data/test/plugin/out_redis_counter.rb

@@ -17,6 +17,7 @@ class RedisCounterTest < Test::Unit::TestCase
     redis.del("a")
     redis.del("b")
     redis.del("foo-2012-06-21")
+    redis.del("item_sum_count:200")
     redis.quit
   end
 
@@ -152,6 +153,27 @@ class RedisCounterTest < Test::Unit::TestCase
     end
   end
 
+  def test_get_count_value_with_count_value_key
+    driver = create_driver %[
+      <pattern>
+        count_key_format %_{customer_id}
+        count_value_key count
+      </pattern>
+    ]
+    record = {'count' => 123, 'customer_id' => 321}
+    assert_equal 123, driver.instance.patterns[0].get_count_value(record)
+  end
+
+  def test_get_count_value_without_count_value_key
+    driver = create_driver %[
+      <pattern>
+        count_key_format %_{customer_id}
+      </pattern>
+    ]
+    record = {'count' => 123, 'customer_id' => 321}
+    assert_equal 1, driver.instance.patterns[0].get_count_value(record)
+  end
+
   def test_format
     time = Time.parse('2012-06-21 01:55:00 UTC').to_i
     @d.emit({"a" => 1}, time)
@@ -195,4 +217,42 @@ class RedisCounterTest < Test::Unit::TestCase
     assert_equal '2', driver.instance.redis.get("foo-2012-06-21")
   end
 
+  def test_write_with_count_value_key
+    driver = create_driver %[
+      db_number 1
+      <pattern>
+        count_key_format item_sum_count:%_{item_id}
+        count_value_key count
+      </pattern>
+    ]
+
+    time = Time.parse('2012-06-21 03:01:00 UTC').to_i
+    driver.emit({"item_id" => 200, "count" => 123}, time)
+    driver.run
+
+    assert_equal '123', driver.instance.redis.get("item_sum_count:200")
+
+    driver = create_driver %[
+      db_number 1
+      <pattern>
+        count_key_format item_sum_count:%_{item_id}
+        count_value_key count
+      </pattern>
+    ]
+    driver.emit({"item_id" => 200, }, time)
+    driver.run
+    assert_equal '123', driver.instance.redis.get("item_sum_count:200"), "it should be ignore when count_value_key does not exists."
+
+    driver = create_driver %[
+      db_number 1
+      <pattern>
+        count_key_format item_sum_count:%_{item_id}
+        count_value_key count
+      </pattern>
+    ]
+    driver.emit({"item_id" => 200, "count" => "111aaa"}, time)
+    driver.run
+    assert_equal '123', driver.instance.redis.get("item_sum_count:200"), "it should be ignore when count_value_key is not number"
+  end
+
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-redis-counter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Buntaro Okada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,27 +57,26 @@ files:
 - test/plugin/out_redis_counter.rb
 homepage: https://github.com/kbinani/fluent-plugin-redis-counter
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Redis counter plugin for fluent
 test_files:
 - test/plugin/out_redis_counter.rb