fluent-plugin-suppress 0.0.3 → 0.0.4

data/Changes

@@ -1,3 +1,6 @@
+2014-04-11 v0.0.4
+           suppress by tag only mode
+
 2013-06-06 v0.0.3
            nested key support (by Harukasan <miruca@me.com>)
 

data/README.rdoc

@@ -54,6 +54,13 @@ 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!!"}}
 
+If attr_keys is not specified, suppressed by tag only.
+
+    <match foo.**>
+      type  suppress
+    </match>
+
+
 == 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.3"
+  gem.version       = "0.0.4"
 
   gem.add_development_dependency "fluentd"
   gem.add_runtime_dependency "fluentd"

data/lib/fluent/plugin/out_suppress.rb

@@ -9,18 +9,18 @@ module Fluent
     config_param :num,           :integer, :default => 3
     config_param :interval,      :integer, :default => 300
 
+    unless method_defined?(:log)
+      define_method("log") { $log }
+    end
+
     def configure(conf)
       super
 
-      unless @attr_keys
-        raise ConfigError, "out_suppress: attr_keys is required."
-      end
-
       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
 
-      @keys  = @attr_keys.split(/ *, */)
+      @keys  = @attr_keys ? @attr_keys.split(/ *, */) : nil
       @slots = {}
     end
 
@@ -34,10 +34,14 @@ module Fluent
 
     def emit(tag, es, chain)
       es.each do |time, record|
-        keys = @keys.map do |key|
-          key.split(/\./).inject(record) {|r, k| r[k] }
+        if @keys
+          keys = @keys.map do |key|
+            key.split(/\./).inject(record) {|r, k| r[k] }
+          end
+          key = tag + "\0" + keys.join("\0")
+        else
+          key = tag
         end
-        key = tag + "\0" + keys.join("\0")
         slot = @slots[key] ||= []
 
         # expire old records time
@@ -47,7 +51,7 @@ module Fluent
         end
 
         if slot.length >= @num
-          $log.debug "suppressed record: #{record.to_json}"
+          log.debug "suppressed record: #{record.to_json}"
           next
         end
 
@@ -57,7 +61,7 @@ module Fluent
         if tag != _tag
           Engine.emit(_tag, time, record)
         else
-          $log.warn "Drop record #{record} tag '#{tag}' was not replaced. Can't emit record, cause infinity looping. Set remove_tag_prefix, remove_tag_suffix, add_tag_prefix or add_tag_suffix correctly."
+          log.warn "Drop record #{record} tag '#{tag}' was not replaced. Can't emit record, cause infinity looping. Set remove_tag_prefix, remove_tag_suffix, add_tag_prefix or add_tag_suffix correctly."
         end
       end
 

data/test/plugin/test_out_suppress.rb

@@ -19,6 +19,12 @@ class SuppressOutputTest < Test::Unit::TestCase
     add_tag_prefix sp.
   ]
 
+  CONFIG_TAG_ONLY = %[
+    interval       10
+    num            2
+    add_tag_prefix sp.
+  ]
+
   def create_driver(conf = CONFIG, tag='test.info')
     Fluent::Test::OutputTestDriver.new(Fluent::SuppressOutput, tag).configure(conf)
   end
@@ -72,4 +78,28 @@ class SuppressOutputTest < Test::Unit::TestCase
     assert_equal ["sp.test.info", time + 13, {"id"=>7, "data" => {"host"=>"web01", "message"=>"error!!"}}], emits[4]
 
   end
+
+  def test_emit_tagonly
+    d = create_driver(CONFIG_TAG_ONLY)
+
+    time = Time.parse("2012-11-22 11:22:33 UTC").to_i
+    d.run do
+      d.emit({"id" => 1, "host" => "web01", "message" => "1 error!!"}, time + 1)
+      d.emit({"id" => 2, "host" => "web02", "message" => "2 error!!"}, time + 2)
+      d.emit({"id" => 3, "host" => "web03", "message" => "3 error!!"}, time + 3)
+      d.emit({"id" => 4, "host" => "web04", "message" => "4 error!!"}, time + 4)
+      d.emit({"id" => 5, "host" => "app05", "message" => "5 error!!"}, time + 4)
+      d.emit({"id" => 6, "host" => "web06", "message" => "6 error!!"}, time + 12)
+      d.emit({"id" => 7, "host" => "web07", "message" => "7 error!!"}, time + 13)
+      d.emit({"id" => 8, "host" => "web08", "message" => "8 error!!"}, time + 14)
+    end
+
+    emits = d.emits
+    assert_equal 4, emits.length
+    assert_equal ["sp.test.info", time + 1,  {"id"=>1, "host"=>"web01", "message"=>"1 error!!"}], emits[0]
+    assert_equal ["sp.test.info", time + 2,  {"id"=>2, "host"=>"web02", "message"=>"2 error!!"}], emits[1]
+    assert_equal ["sp.test.info", time + 12, {"id"=>6, "host"=>"web06", "message"=>"6 error!!"}], emits[2]
+    assert_equal ["sp.test.info", time + 13, {"id"=>7, "host"=>"web07", "message"=>"7 error!!"}], emits[3]
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-suppress
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd