fluent-plugin-stats-notifier 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d2cfc5f24520dc1e1e27a516f2e9546de7eaf74
-  data.tar.gz: b3dbf5efeb2ce58932e2d1519e4b95010985f39a
+  metadata.gz: 20ebee510eb1403230e4baee3b2b302e9d5a82dd
+  data.tar.gz: 64c9831470b6871e9f7df06efeb61d7c2d14466c
 SHA512:
-  metadata.gz: 1496c8c85cf8ea9c720aa9405aaf8cfb668b4368fab424da0d5e67661657622e2cebc910b69b382923a8f8b442ac578ada134c75f29f7f6eb1eb38b5b1f6e210
-  data.tar.gz: ac5fc0fb7203ab2674a090e424501b441a71b948fb86b3a94b754f96ba7acd5c07dfa27163be7f8de9d19a94bb0a9a7f58ee970dff4d6ca12763bf0d49f26ba9
+  metadata.gz: 3f5b4655b1d325fa5bfcb018f82ccc78e01815a5a7b2e7e8d57d042e3f48a0713eb6bd3671f36967f1910401b019ab4a04b4e091b69c150c8899e3e620dfa7ab
+  data.tar.gz: 0172ea3071a0713239147954b68818b8f57ccf8505c043f51a47977930b4ac3093a5452153ae2eadaf737cb695464612b1549967c39e524dfc9d2cdaffa605d5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.3
+
+Enchancements
+
+* Add `aggregate` and `add_tag_prefix`, `remove_tag_prefix` options
+
 ## 0.0.2
 
 Changes

data/README.md

@@ -55,15 +55,15 @@ then this plugin emits an message because the max of `4xx_count` is greater than
 
 - tag
 
-    The output tag name. 
+    The output tag name. Required for `aggregate all`.
 
 - add_tag_prefix
 
-    (not available yet) Add tag prefix for output message. 
+    Add tag prefix for output message. Required for `aggregate tag`.
 
 - aggragate
     
-    (not available yet) Do calculation by each `tag` or `all`. The default value is `tag`.
+    Do calculation for each `tag` or `all`. The defaultis `all`.
 
 - store_file
 

data/fluent-plugin-stats-notifier.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-stats-notifier"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Naotoshi Seo"]
   s.email       = ["sonots@gmail.com"]
   s.homepage    = "https://github.com/sonots/fluent-plugin-stats-notifier"

data/lib/fluent/plugin/out_stats_notifier.rb

@@ -15,6 +15,9 @@ class Fluent::StatsNotifierOutput < Fluent::Output
   config_param :greater_equal, :float, :default => nil
   config_param :compare_with, :string, :default => "max"
   config_param :tag, :string
+  config_param :add_tag_prefix, :string, :default => nil
+  config_param :remove_tag_prefix, :string, :default => nil
+  config_param :aggregate, :string, :default => 'all'
   config_param :store_file, :string, :default => nil
 
   attr_accessor :counts
@@ -48,6 +51,30 @@ class Fluent::StatsNotifierOutput < Fluent::Output
       raise Fluent::ConfigError, "out_stats_notiifer: `compare_with` must be one of `sum`, `max`, `min`, `avg`"
     end
 
+    case @aggregate
+    when 'all'
+      raise Fluent::ConfigError, "anomalydetect: `tag` must be specified with aggregate all" if @tag.nil?
+    when 'tag'
+      raise Fluent::ConfigError, "anomalydetect: `add_tag_prefix` must be specified with aggregate tag" if @add_tag_prefix.nil?
+    else
+      raise Fluent::ConfigError, "anomalydetect: aggregate allows tag/all"
+    end
+
+    @tag_prefix = "#{@add_tag_prefix}." if @add_tag_prefix
+    @tag_prefix_match = "#{@remove_tag_prefix}." if @remove_tag_prefix
+    @tag_proc =
+      if @tag_prefix and @tag_prefix_match
+        Proc.new {|tag| "#{@tag_prefix}#{lstrip(tag, @tag_prefix_match)}" }
+      elsif @tag_prefix_match
+        Proc.new {|tag| lstrip(tag, @tag_prefix_match) }
+      elsif @tag_prefix
+        Proc.new {|tag| "#{@tag_prefix}#{tag}" }
+      elsif @tag
+        Proc.new {|tag| @tag }
+      else
+        Proc.new {|tag| tag }
+      end
+
     @counts = {}
     @matches = {}
     @mutex = Mutex.new
@@ -74,7 +101,7 @@ class Fluent::StatsNotifierOutput < Fluent::Output
     count = 0; matches = {}
     es.each do |time,record|
       if record[key]
-        # @todo: make an option for statsuation in the same tag. now only sum is supported
+        # @todo: make an option for calcuation in the same tag. now only sum is supported
         matches[key] = (matches[key] ? matches[key] + record[key] : record[key])
       end
       count += 1
@@ -85,7 +112,7 @@ class Fluent::StatsNotifierOutput < Fluent::Output
     @matches[tag] ||= {}
     @mutex.synchronize do
       if matches[key]
-        # @todo: make an option for statsuation in the same tag. now only sum is supported
+        # @todo: make an option for calcuation in the same tag. now only sum is supported
         @matches[tag][key] = (@matches[tag][key] ? @matches[tag][key] + matches[key] : matches[key])
       end
       @counts[tag] += count
@@ -119,15 +146,23 @@ class Fluent::StatsNotifierOutput < Fluent::Output
   # This method is the real one to emit
   def flush_emit(step)
     time = Fluent::Engine.now
-    flushed_counts, flushed_matches, @counts, @matches = @counts, @matches, {}, {}
-
-    output = generate_output(flushed_counts, flushed_matches)
-    Fluent::Engine.emit(@tag, time, output) if output
+    counts, matches, @counts, @matches = @counts, @matches, {}, {}
+
+    if @aggregate == 'all'
+      values = matches.values.map {|match| match[@target_key] }.compact
+      output = generate_output(values)
+      Fluent::Engine.emit(@tag, time, output) if output
+    else # aggregate tag
+      matches.each do |tag, match|
+        values = [match[@target_key]]
+        output = generate_output(values)
+        emit_tag = @tag_proc.call(tag)
+        Fluent::Engine.emit(emit_tag, time, output) if output
+      end
+    end
   end
 
-  def generate_output(counts, matches)
-    values = matches.values.map {|match| match[@target_key] }.compact
-
+  def generate_output(values)
     case @compare_with
     when :sum
       target_value = values.inject(:+)

data/spec/out_stats_notifier_spec.rb

@@ -145,6 +145,35 @@ describe Fluent::StatsNotifierOutput do
       end
     end
 
+    context 'aggregate' do
+      let(:emit) do
+        driver.run do
+          driver.emit_with_tag({"5xx_count"=>2}, time, 'foo.bar1')
+          driver.emit_with_tag({"5xx_count"=>6}, time, 'foo.bar2')
+        end
+        driver.instance.flush_emit(0)
+      end
+
+      context 'all' do
+        let(:config) { CONFIG + %[aggregate all \n tag foo \n compare_with sum] }
+        before do
+          Fluent::Engine.stub(:now).and_return(time)
+          Fluent::Engine.should_receive(:emit).with("foo", time, {"5xx_count"=>8.0})
+        end
+        it { emit }
+      end
+
+      context 'tag' do
+        let(:config) { CONFIG + %[aggregate tag \n add_tag_prefix add] }
+        before do
+          Fluent::Engine.stub(:now).and_return(time)
+          Fluent::Engine.should_receive(:emit).with("add.foo.bar1", time, {"5xx_count"=>2.0})
+          Fluent::Engine.should_receive(:emit).with("add.foo.bar2", time, {"5xx_count"=>6.0})
+        end
+        it { emit }
+      end
+    end
+
     context 'compare_with' do
       let(:emit) do
         driver.run do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-stats-notifier
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd