fluent-plugin-grepcounter 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cceea9a84d43542c30eda8ae0b2d3127d3a8ee8a
-  data.tar.gz: ed10007f880499d164493b9c42a5edaefb0525c4
+  metadata.gz: 96a67e39368ff883543e1999186e185e8ad6159f
+  data.tar.gz: 8e4ff3eb1e5d9660ddd08a04bedbbcebf5098f14
 SHA512:
-  metadata.gz: 66b848914ad05a5f45ddc55cdd3e3e0c01dbd5046879cd1bef6a910f194e23cf6b3ce631a9b008b03d0ce5fc27747e64b049ed10d08ce7768334250c637014b3
-  data.tar.gz: f5f6c761d747e58dc7ed9f14e94383221e7476376bf1764e22ac777e14c42aa86d54f538fe77a35ce1e2ad01748ce70164543e44a1faf0e42677b7c441c55b80
+  metadata.gz: 5fb377c61e7318b2efa53d1cc76de6831d982736df5755d17b49bbcc9b869e24cdff3d28afbdbdfa21db99c960bcb3cd65083fde8a9c934030157d3b39c7558b
+  data.tar.gz: 323bdaf536cba05342c8b395599bf1235937a3cbbcb383da0a6a801d79d6a6f803e5f223b122012e9f9595049ae9d4d6a3645a3480d90e3f455fc49e4e7c3698

data/README.md

@@ -76,9 +76,10 @@ Then, output bocomes as belows (indented). You can see the `message` field is jo
 
     The threshold number to emit
 
-- comparison
+- comparator
 
-    The comparison operator for the threshold (either of `>=` or `<=`). Default is `>=`, i.e., emit if count >= threshold. 
+    The comparation operator for the threshold (either of `>=` or `<=`). Default is `>=`, i.e., emit if count >= threshold. 
+    NOTE: 0 count message will not be emitted even if `<=` is specified because standby nodes receive no message usually.
 
 - output\_with\_joined\_delimiter
 

data/fluent-plugin-grepcounter.gemspec

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

data/lib/fluent/plugin/out_grepcounter.rb

@@ -7,7 +7,7 @@ class Fluent::GrepCounterOutput < Fluent::Output
   config_param :count_interval, :time, :default => 5
   config_param :exclude, :string, :default => nil
   config_param :threshold, :integer, :default => 1
-  config_param :comparison, :string, :default => '>='
+  config_param :comparator, :string, :default => '>='
   config_param :output_tag, :string, :default => nil
   config_param :add_tag_prefix, :string, :default => 'count'
   config_param :output_with_joined_delimiter, :string, :default => nil
@@ -26,8 +26,8 @@ class Fluent::GrepCounterOutput < Fluent::Output
     @exclude = Regexp.compile(@exclude) if @exclude
     @threshold = @threshold.to_i
 
-    unless ['>=', '<='].include?(@comparison)
-      raise Fluent::ConfigError, "grepcounter: comparison allows >=, <="
+    unless ['>=', '<='].include?(@comparator)
+      raise Fluent::ConfigError, "grepcounter: comparator allows >=, <="
     end
 
     unless ['tag', 'all'].include?(@aggregate)
@@ -124,7 +124,8 @@ class Fluent::GrepCounterOutput < Fluent::Output
 
   def generate_output(count, matches, tag = nil)
     return nil if count.nil?
-    return nil unless eval("#{count} #{@comparison} #{@threshold}")
+    return nil if count == 0 # ignore 0 because standby nodes receive no message usually
+    return nil unless eval("#{count} #{@comparator} #{@threshold}")
     output = {}
     output['count'] = count
     output['message'] = @output_with_joined_delimiter.nil? ? matches : matches.join(@output_with_joined_delimiter)

data/spec/out_grepcounter_spec.rb

@@ -41,10 +41,10 @@ describe Fluent::GrepCounterOutput do
         it { expect { driver }.to raise_error(Fluent::ConfigError) }
       end
 
-      context 'invalid comparison' do
+      context 'invalid comparator' do
         let(:config) do
           CONFIG + %[
-          comparison foo
+          comparator foo
           ]
         end
         it { expect { driver }.to raise_error(Fluent::ConfigError) }
@@ -61,7 +61,7 @@ describe Fluent::GrepCounterOutput do
         its(:regexp) { should be_nil }
         its(:exclude) { should be_nil }
         its(:threshold) { should == 1 }
-        its(:comparison) { should == '>=' }
+        its(:comparator) { should == '>=' }
         its(:output_tag) { should be_nil }
         its(:add_tag_prefix) { should == 'count' }
       end
@@ -259,13 +259,13 @@ describe Fluent::GrepCounterOutput do
       it { expect { emit }.not_to raise_error(ArgumentError) }
     end
 
-    describe "comparison <=" do
+    describe "comparator <=" do
       context 'threshold (hit)' do
         let(:config) do
           CONFIG + %[
           regexp WARN
           threshold 3
-          comparison <=
+          comparator <=
           ]
         end
         before do
@@ -284,7 +284,7 @@ describe Fluent::GrepCounterOutput do
           CONFIG + %[
           regexp WARN
           threshold 2
-          comparison <=
+          comparator <=
           ]
         end
         before do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-grepcounter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Naotoshi SEO