fluent-plugin-conditional_filter 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cab6711bb735bb3f4cdba2f091567ce6d432645d
-  data.tar.gz: 85e70261a231649cc302071c8a49459df4712432
+  metadata.gz: da5d5a07de7eecf356626bd2cf0bdd88c300f39e
+  data.tar.gz: 8ad55890d05c1e1ecc37264d2003c9d139968318
 SHA512:
-  metadata.gz: ad91077d850402e1d1a5c373920d92218459b7607a999a382d521e5bfa259b7f8c9c696def3f849daa415b413d6b16483eab9deb8da95a3339b90f8bb8e9f5cd
-  data.tar.gz: d29859f4d660c79ed199c5cecc071a5123e692057c2646250020ed827a4bf32d5a1efaaead58b44fa3429071de5be25bf883086242fbf47f1f7e8e386ed9501f
+  metadata.gz: 4002c8649cb44d8a05f1219483c9998cff8d3158e489c58769f7b31b2e8f698dd292ec30c81ba8e610e3f14282762bb5cc298d17a72dfddba1ddb6313457dda0
+  data.tar.gz: 785a93b79ba285fd2c948c2d0456cf83ddd8cb8c38f3d1080c4d927605399ed353dfc764cbbbd1e8f975ab56f54eaf77bf99181639779ff1757dbc9e3c983451

data/README.md

@@ -1,10 +1,10 @@
-# Fluent::Plugin::ConditionalFilter [![BuildStatus](https://secure.travis-ci.org/kentaro/fluent-plugin-conditional_filter)](http://travis-ci.org/kentaro/fluent-plugin-conditional_filter)
+# Fluent::Plugin::ConditionalFilter [![BuildStatus](https://secure.travis-ci.org/kentaro/fluent-plugin-conditional_filter.png)](http://travis-ci.org/kentaro/fluent-plugin-conditional_filter)
 
 ## Component
 
 ### ConditionalFilterOutput
 
-fluent-plugin-conditional_filter provides a simple filter that filters out key/value pairs that don't match a condition.
+fluent-plugin-conditional_filter provides a simple filter that filters out key/value pairs that don't satisfy a given condition.
 
 ## Usage
 
@@ -12,9 +12,10 @@ fluent-plugin-conditional_filter provides a simple filter that filters out key/v
 
 ```
 <match test.**>
-  key_pattern @example.com$
-  condition   10
-  filter      numeric_upward
+  add_tag_prefix filtered.
+  key_pattern    @example\.com$
+  condition      10
+  filter         numeric_upward
 </match>
 ```
 
@@ -24,7 +25,7 @@ fluent-plugin-conditional_filter provides a simple filter that filters out key/v
 
 Key pattern to check.
 
-#### `condition` (optional: default = 'http')
+#### `condition` (required)
 
 Condition for the filter below.
 
@@ -36,6 +37,20 @@ Set filtering strategy.
 
 You can also use the params above inherited from [Fluent::HandleTagNameMixin](https://github.com/fluent/fluentd/blob/master/lib/fluent/mixin.rb).
 
+### Filters
+
+#### numeric_upward
+
+Filter out such key/value pairs whose value aren't greater than or equal to the given value as float value.
+
+#### numeric_downward
+
+Filter out such key/value pairs whose value aren't smaller than or equal to the given value as float value
+
+#### string_match
+
+Filter out such key/value pairs whose value don't match the given value as string.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/fluent-plugin-conditional_filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'fluent-plugin-conditional_filter'
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ['Kentaro Kuribayashi']
   spec.email         = ['kentarok@gmail.com']
   spec.description   = %q{A fluent plugin that provides conditional filters}

data/lib/fluent/plugin/out_conditional_filter.rb

@@ -17,7 +17,7 @@ class Fluent::ConditionalFilterOutput < Fluent::Output
       )
     end
 
-    @key_pattern_regexp = /#{key_pattern}/
+    @key_pattern_regexp = Regexp.new(key_pattern)
   end
 
   def emit(tag, es, chain)
@@ -40,7 +40,17 @@ class Fluent::ConditionalFilterOutput < Fluent::Output
     when 'numeric_upward'
       filter_record = record.select do |key, value|
         key.match(@key_pattern_regexp) &&
-          record[key].to_f >= condition.to_f
+        record[key].to_f >= condition.to_f
+      end
+    when 'numeric_downward'
+      filter_record = record.select do |key, value|
+        key.match(@key_pattern_regexp) &&
+        record[key].to_f <= condition.to_f
+      end
+    when 'string_match'
+      filter_record = record.select do |key, value|
+        key.match(@key_pattern_regexp) &&
+        record[key].match(Regexp.new(condition))
       end
     else
       raise ArgumentError.new("[out_conditional_filter] no such filter: #{filter}")

data/spec/lib/out_conditional_filter_spec.rb

@@ -6,7 +6,7 @@ describe Fluent::ConditionalFilterOutput do
     context "success" do
       let(:conf) {
         %[
-          key_pattern @example.com$
+          key_pattern @example\.com$
           condition   10
           filter      numeric_upward
         ]
@@ -19,7 +19,7 @@ describe Fluent::ConditionalFilterOutput do
 
       it {
         expect(subject).to be_an_instance_of described_class
-        expect(subject.key_pattern).to be == '@example.com$'
+        expect(subject.key_pattern).to be == "@example\.com$"
         expect(subject.instance_variable_get(:@key_pattern_regexp)).to be == /@example.com$/
       }
     end
@@ -123,6 +123,108 @@ describe Fluent::ConditionalFilterOutput do
         }
       end
     end
+
+    context('numeric_downward') do
+      let(:conf) {
+        %[
+          key_pattern @example.com$
+          condition   10
+          filter      numeric_downward
+        ]
+      }
+
+      let(:driver) { Fluent::Test::OutputTestDriver.new(described_class, 'test').configure(conf) }
+      subject {
+        driver.instance
+      }
+
+      context('with 0 matched key/value pair') do
+        before {
+          driver.run {
+            driver.emit('foo@example.com' => 18, 'bar@example.com' => 26, 'baz@baz.com' => 15)
+          }
+        }
+
+        it {
+          expect(driver.emits[0]).to be_nil
+        }
+      end
+
+      context('with 1 matched key/value pair') do
+        before {
+          driver.run {
+            driver.emit('foo@example.com' => 11, 'bar@example.com' => 6, 'baz@baz.com' => 5)
+          }
+        }
+
+        it {
+          expect(driver.emits[0][2].keys.length).to be == 1
+        }
+      end
+
+      context('with 2 matched key/value pairs') do
+        before {
+          driver.run {
+            driver.emit('foo@example.com' => 10, 'bar@example.com' => 5, 'baz@baz.com' => 5)
+          }
+        }
+
+        it {
+          expect(driver.emits[0][2].keys.length).to be == 2
+        }
+      end
+    end
+
+    context('string_match') do
+      let(:conf) {
+        %[
+          key_pattern @example.com$
+          condition   (staff|user)
+          filter      string_match
+        ]
+      }
+
+      let(:driver) { Fluent::Test::OutputTestDriver.new(described_class, 'test').configure(conf) }
+      subject {
+        driver.instance
+      }
+
+      context('with 0 matched key/value pair') do
+        before {
+          driver.run {
+            driver.emit('foo@example.com' => 'guest', 'bar@example.com' => 'guest', 'baz@baz.com' => 'staff')
+          }
+        }
+
+        it {
+          expect(driver.emits[0]).to be_nil
+        }
+      end
+
+      context('with 1 matched key/value pair') do
+        before {
+          driver.run {
+            driver.emit('foo@example.com' => 'staff', 'bar@example.com' => 'guest', 'baz@baz.com' => 'user')
+          }
+        }
+
+        it {
+          expect(driver.emits[0][2].keys.length).to be == 1
+        }
+      end
+
+      context('with 2 matched key/value pairs') do
+        before {
+          driver.run {
+            driver.emit('foo@example.com' => 'staff', 'bar@example.com' => 'user', 'baz@baz.com' => 'staff')
+          }
+        }
+
+        it {
+          expect(driver.emits[0][2].keys.length).to be == 2
+        }
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-conditional_filter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kentaro Kuribayashi