fluent-plugin-suppress 0.0.2 → 0.0.3

data/Changes

@@ -0,0 +1,6 @@
+2013-06-06 v0.0.3
+           nested key support (by Harukasan <miruca@me.com>)
+
+2012-11-22 v0.0.2
+           initial release
+

data/README.rdoc

@@ -42,6 +42,18 @@ Output messages:
     2012-11-22T11:22:37 sp.foo.info {"id":5,"host":"app01","message":"error!!"}
     2012-11-22T11:22:45 sp.foo.info {"id":9,"host":"web01","message":"error!!"}
 
+attr_keys allows nested key name (eg. foo.bar).
+
+    <match foo.**>
+      type           suppress
+      attr_keys      data.host, data.message
+    </match>
+
+Input messages will be suppressed by key data.host and data.message.
+
+     2012-11-22T11:22:33 foo.info {"id":1,"data":{"host":"web01","message":"error!!"}}
+     2012-11-22T11:22:34 foo.info {"id":2,"data":{"host":"web01","message":"error!!"}}
+
 == TODO
 
 - patches welcome!

data/fluent-plugin-supress.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "fluent-plugin-suppress"
   gem.require_paths = ["lib"]
-  gem.version       = "0.0.2"
+  gem.version       = "0.0.3"
 
   gem.add_development_dependency "fluentd"
   gem.add_runtime_dependency "fluentd"

data/lib/fluent/plugin/out_suppress.rb

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 module Fluent
   class SuppressOutput < Output
-    Fluent::Plugin.register_output('suppress', self)
-
     include Fluent::HandleTagNameMixin
 
+    Fluent::Plugin.register_output('suppress', self)
+
     config_param :attr_keys,     :string,  :default => nil
     config_param :num,           :integer, :default => 3
     config_param :interval,      :integer, :default => 300
@@ -16,7 +16,7 @@ module Fluent
         raise ConfigError, "out_suppress: attr_keys is required."
       end
 
-      if ( !@remove_tag_prefix and !@remove_tag_suffix and !@add_tag_prefix and !@add_tag_suffix )
+      if ( !@remove_tag_prefix && !@remove_tag_suffix && !@add_tag_prefix && !@add_tag_suffix )
         raise ConfigError, "out_suppress: Set remove_tag_prefix, remove_tag_suffix, add_tag_prefix or add_tag_suffix."
       end
 
@@ -34,13 +34,15 @@ module Fluent
 
     def emit(tag, es, chain)
       es.each do |time, record|
-        key  = @keys.map{|k| record[k]}.join("\0")
-        key  = tag + "\0" + key
+        keys = @keys.map do |key|
+          key.split(/\./).inject(record) {|r, k| r[k] }
+        end
+        key = tag + "\0" + keys.join("\0")
         slot = @slots[key] ||= []
 
         # expire old records time
         expired = time.to_f - @interval
-        while slot.first and slot.first <= expired
+        while slot.first && (slot.first <= expired)
           slot.shift
         end
 

data/test/plugin/test_out_suppress.rb

@@ -12,6 +12,13 @@ class SuppressOutputTest < Test::Unit::TestCase
     add_tag_prefix sp.
   ]
 
+  CONFIG_WITH_NESTED_KEY = %[
+    interval       10
+    num            2
+    attr_keys      data.host, data.message
+    add_tag_prefix sp.
+  ]
+
   def create_driver(conf = CONFIG, tag='test.info')
     Fluent::Test::OutputTestDriver.new(Fluent::SuppressOutput, tag).configure(conf)
   end
@@ -40,4 +47,29 @@ class SuppressOutputTest < Test::Unit::TestCase
     assert_equal ["sp.test.info", time + 13, {"id"=>7, "host"=>"web01", "message"=>"error!!"}], emits[4]
 
   end
+
+  def test_emit_wtih_nested_key
+    d = create_driver(CONFIG_WITH_NESTED_KEY)
+
+    time = Time.parse("2012-11-22 11:22:33 UTC").to_i
+    d.run do
+      d.emit({"id" => 1, "data" => {"host" => "web01", "message" => "error!!"}}, time + 1)
+      d.emit({"id" => 2, "data" => {"host" => "web01", "message" => "error!!"}}, time + 2)
+      d.emit({"id" => 3, "data" => {"host" => "web01", "message" => "error!!"}}, time + 3)
+      d.emit({"id" => 4, "data" => {"host" => "web01", "message" => "error!!"}}, time + 4)
+      d.emit({"id" => 5, "data" => {"host" => "app01", "message" => "error!!"}}, time + 4)
+      d.emit({"id" => 6, "data" => {"host" => "web01", "message" => "error!!"}}, time + 12)
+      d.emit({"id" => 7, "data" => {"host" => "web01", "message" => "error!!"}}, time + 13)
+      d.emit({"id" => 8, "data" => {"host" => "web01", "message" => "error!!"}}, time + 14)
+    end
+
+    emits = d.emits
+    assert_equal 5, emits.length
+    assert_equal ["sp.test.info", time + 1,  {"id"=>1, "data" => {"host"=>"web01", "message"=>"error!!"}}], emits[0]
+    assert_equal ["sp.test.info", time + 2,  {"id"=>2, "data" => {"host"=>"web01", "message"=>"error!!"}}], emits[1]
+    assert_equal ["sp.test.info", time + 4,  {"id"=>5, "data" => {"host"=>"app01", "message"=>"error!!"}}], emits[2]
+    assert_equal ["sp.test.info", time + 12, {"id"=>6, "data" => {"host"=>"web01", "message"=>"error!!"}}], emits[3]
+    assert_equal ["sp.test.info", time + 13, {"id"=>7, "data" => {"host"=>"web01", "message"=>"error!!"}}], emits[4]
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-suppress
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -51,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Changes
 - Gemfile
 - LICENSE
 - README.rdoc