fluent-plugin-eventcounter 0.0.4.1 → 0.0.5

data/README.md

@@ -59,58 +59,65 @@ or
 #### Basic
 
 - **count_key** (**required**)
-    - The key within the record to count unique instances of 
+    - The key within the record to count unique instances of
         - *eg. event*
 
 - **input_tag_exclude** (optional)
-    - A pattern to exclude from the incoming tag 
+    - A pattern to exclude from the incoming tag
         - *default: ''*
 
 - **emit_only** (optional) - *boolean*
-    - Skip redis and re-emit using emit_to 
+    - Skip redis and re-emit using emit_to
         - *default: false*
-    
+
 - **emit_to** (optional) - *string*
-    - Tag to re-emit with 
+    - Tag to re-emit with
         - *default: debug.events*
 
 #### Extra Capture (optional)
 
 - **capture_extra_if** (optional)
-    - An additional field to attach to the captured key 
+    - An additional field to attach to the captured key
         - *default: nil*
-    
+
 - **capture_extra_replace** (optional)
     - A regular expression to replace a portion of the extra capture. *(note: this is passed as a string and parsed as a regex so be aware that you may need to escape reserved characters to preserve their meaning.)*
         - *default: ''*
 
 #### Redis Config (optional)
-    
+
 - **redis_host** (optional) - *string*
-    - Host address of the redis server 
+    - Host address of the redis server
         - *default: localhost*
-    
+
 - **redis_port** (optional)
-    - Port of the redis server 
+    - Port of the redis server ()
         - *default: 6379*
-    
+
 - **redis_password** (optional)
-    - Password for the redis server 
+    - Password for the redis server
         - *default: nil*
-    
+
+- **redis_sentinel** (optional) - *boolean*
+    - Use `redis_host` and `redis_port` as sentinel
+        - *default: false*
+
+- **redis_master_group_name** (optional) - *string*
+    - Sentinel master group name
+        - *default: mymaster*
+
 - **redis_db_number** (optional)
-    - Redis DB 
+    - Redis DB (not used if `redis_sentinel` is set)
         - *default: 0*
 
 - **redis_output_key** (optional)
-    - The key to prefix against the tag 
+    - The key to prefix against the tag
         - *default: ''*
 
 #### Other
 
 - **flush_interval** (optional)
-    - Provided from **Fluent::BufferedOutput** time in seconds between flushes 
+    - Provided from **Fluent::BufferedOutput** time in seconds between flushes
         - *default: 60*
 
 
-  

data/fluent-plugin-eventcounter.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |gem|
   gem.name        = "fluent-plugin-eventcounter"
-  gem.version     = "0.0.4.1"
+  gem.version     = "0.0.5"
   gem.authors     = ["Sean Dick", "Change.org"]
   gem.email       = ["sean@change.org"]
   gem.homepage    = "https://github.com/change/fluent-plugin-eventcounter"

data/lib/fluent/plugin/out_eventcounter.rb

@@ -12,6 +12,8 @@ class Fluent::EventCounterOutput < Fluent::BufferedOutput
   config_param :redis_port, :integer, :default => 6379
   config_param :redis_password, :string, :default => nil
   config_param :redis_db_number, :integer, :default => 0
+  config_param :redis_sentinel, :bool, :default => false
+  config_param :redis_master_group_name, :string, :default => 'mymaster'
   config_param :redis_output_key, :string, :default => ''
 
   config_param :input_tag_exclude, :string, :default => ''
@@ -19,7 +21,7 @@ class Fluent::EventCounterOutput < Fluent::BufferedOutput
   config_param :capture_extra_replace, :string, :default => ''
   config_param :debug_emit, :bool, :default => false
 
-  config_param :count_key, :string # REQUIRED 
+  config_param :count_key, :string # REQUIRED
 
   attr_accessor :counts
 
@@ -30,13 +32,28 @@ class Fluent::EventCounterOutput < Fluent::BufferedOutput
 
   def start
     super
-    @redis = Redis.new(
-        host: @redis_host,
-        port: @redis_port,
-        password: @redis_password,
-        thread_safe: true,
-        db: @redis_db_number
-      ) unless @emit_only
+    unless @emit_only
+      @redis = begin
+        if @redis_sentinel
+          sentinels = [{host: @redis_host, port: @redis_port}]
+          Redis.new(
+            url: "redis://#{@redis_master_group_name}",
+            sentinels: sentinels,
+            password: @redis_password,
+            thread_safe: true,
+            role: :master
+          )
+        else
+           Redis.new(
+            host: @redis_host,
+            port: @redis_port,
+            password: @redis_password,
+            thread_safe: true,
+            db: @redis_db_number
+          )
+        end
+      end
+    end
   end
 
   def format(tag, time, record)
@@ -56,7 +73,7 @@ class Fluent::EventCounterOutput < Fluent::BufferedOutput
       items = io.read.split("\n")
       items.each do |item|
         key, event = JSON.parse(item)
-        counts[key][event] += 1 
+        counts[key][event] += 1
       end
     end
 
@@ -65,7 +82,7 @@ class Fluent::EventCounterOutput < Fluent::BufferedOutput
         events.each do |event, c|
           redis_key = [@redis_output_key,tag].join(':')
           @redis.hincrby(redis_key, event, c.to_i)
-        end        
+        end
       end
     end unless @emit_only
 
@@ -76,4 +93,4 @@ class Fluent::EventCounterOutput < Fluent::BufferedOutput
     end
 
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-eventcounter
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd