fluent-plugin-proc_count 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65cf9683795c5e95e8930157f62738313453df9f
-  data.tar.gz: 0a20921c1ddb7c8ad1a572e6e2d2829b29b0b760
+  metadata.gz: 87e0030594a618600414b01345d83440eb16f7a2
+  data.tar.gz: 7b2bae56a1d04b2e4f3fe24b5cd65cbe9d053459
 SHA512:
-  metadata.gz: 4faf563de09bd3560d12e9d27fa16c3024353ce6d30c5b54915d320419b194f848c509c845ddb2b6de63f5fe3e7248063b3029267a2b04081b0280916e12a529
-  data.tar.gz: cd0242d1f8e3cabf384f0fc15d7a660d391ca294e82f4a94fdd1005c5b0eeb5d3f5e5dd6518c36b4ed83b144f5cea8c715b71a8fa0dcaab81cbb4e8448a05e62
+  metadata.gz: 1be406576b5d193951f9942a7c1788ab0b8ed319dfe5b1aa52f0fd8bb3d69b0fc054f641507cab94c4b394b404740f9faa4fdc49e643391ef638c5cd8f3c2984
+  data.tar.gz: bf1cdc126d71d13ee7f7f9828d3ca44621ca103560cd81ed4617bc9866a68328bce4278a4264ac41988cb8d61049ff0f3be358238a56812c5f427506ce95a141

data/.travis.yml

@@ -1,13 +1,12 @@
 language: ruby
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-
+  - 2.1.*
+  - 2.2.*
+  - 2.3.2
+  - 2.4.1
 os:
   - linux
-  - osx
 
 gemfile:
   - Gemfile

data/README.md

@@ -1,4 +1,6 @@
 # fluent-plugin-proc_count
+[![Gem Version](https://badge.fury.io/rb/fluent-plugin-proc_count.svg)](http://badge.fury.io/rb/fluent-plugin-proc_count)
+[![Build Status](https://secure.travis-ci.org/toyama0919/fluent-plugin-proc_count.png?branch=master)](http://travis-ci.org/toyama0919/fluent-plugin-proc_count)
 
 process count check plugin for fluentd
 

data/fluent-plugin-proc_count.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-proc_count"
-  gem.version       = "0.0.1"
+  gem.version       = "0.0.2"
   gem.summary       = %q{process count check plugin for fluentd.}
   gem.description   = %q{process count check plugin for fluentd.}
   gem.license       = "MIT"
@@ -24,5 +24,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rubocop'
   gem.add_development_dependency 'rubygems-tasks'
+  gem.add_development_dependency 'test-unit'
   gem.add_development_dependency 'yard'
 end

data/lib/fluent/plugin/in_proc_count.rb

@@ -1,3 +1,4 @@
+require 'fluent/input'
 require 'sys/proctable'
 require 'ostruct'
 
@@ -16,15 +17,18 @@ module Fluent
       config_param :tag, :string
       config_param :regexp, :string
       config_param :proc_count, :integer, default: 1
+      config_param :operator_name, :string, default: "equal"
     end
 
     def configure(conf)
       super
-      @processes = @processes.map { |process| 
+      @processes = @processes.map { |process|
         s = OpenStruct.new
         s.regexp = Regexp.new(process.regexp)
         s.proc_count = process.proc_count
         s.tag = process.tag
+        s.operator_name = process.operator_name
+        s.operator = select_operator(process.operator_name)
         s
       }
     end
@@ -47,27 +51,49 @@ module Fluent
     end
 
     def emit_proc_count
-      begin
-        @processes.each do |process_spec|
-          records = get_processes(process_spec)
-          if process_spec.proc_count != records.size
+      @processes.each do |process_spec|
+        begin
+          record_size = get_processes(process_spec).size
+          if !correct_process?(process_spec, record_size)
             router.emit(
               process_spec.tag,
               Fluent::Engine.now,
               {
                 regexp: process_spec.regexp.source,
-                proc_count: records.size,
+                proc_count: record_size,
                 expect_proc_count: process_spec.proc_count,
+                operator_name: process_spec.operator_name,
                 hostname: Socket.gethostname
               }
             )
           end
+        rescue => e
+          log.error e
         end
-      rescue => e
-        log.error e
       end
     end
 
+    def select_operator(operator_name)
+      case operator_name.to_sym
+      when :equal
+        "=="
+      when :gather_than
+        ">"
+      when :gather_equal
+        ">="
+      when :less_than
+        "<"
+      when :less_equal
+        "<="
+      else
+        raise Fluent::ConfigError, "proc_count operator allows equal/gather_than/gather_equal/less_than/less_equal"
+      end
+    end
+
+    def correct_process?(process_spec, expect_proc_count)
+      expect_proc_count.public_send(process_spec.operator, process_spec.proc_count.to_i)
+    end
+
     def get_processes(process_spec)
       processes = []
       ProcTable.ps do |process|

data/test/plugin/test_in_proc_count.rb

@@ -5,7 +5,17 @@ class ProcCountInputTest < Test::Unit::TestCase
     Fluent::Test.setup
   end
 
-  def create_driver(conf)
+  CONFIG = %q{
+    interval 60s
+
+    <process>
+      tag proc_count.test
+      regexp foobarbuzz
+      proc_count 0
+    </process>
+    }
+
+  def create_driver(conf = CONFIG)
     Fluent::Test::InputTestDriver.new(Fluent::ProcCountInput).configure(conf)
   end
 
@@ -23,12 +33,22 @@ class ProcCountInputTest < Test::Unit::TestCase
         tag proc_count.embulk
         regexp embulk
         proc_count 1
+        operator_name less_than
       </process>
     }
 
-    assert_equal 'test', d.instance.tag
-    assert_equal 10 * 60, d.instance.interval
-    assert_equal 'hoge', d.instance.instance_variable_get(:@hoge)
+    assert_equal 60, d.instance.interval
+
+    process_conf1 =  d.instance.processes.first
+    assert_equal 'proc_count.fluentd', process_conf1.tag
+    assert_equal 'bin/fluentd', process_conf1.regexp.match('bin/fluentd -c')[0]
+    assert_equal 'equal', process_conf1.operator_name
+    assert_equal '==', process_conf1.operator
+
+    process_conf2 =  d.instance.processes.last
+    assert_equal 'proc_count.embulk', process_conf2.tag
+    assert_equal 'less_than', process_conf2.operator_name
+    assert_equal '<', process_conf2.operator
   end
 
   def test_configure_error_when_config_is_empty
@@ -45,8 +65,7 @@ class ProcCountInputTest < Test::Unit::TestCase
     end
 
     emits = d.emits
-    assert_equal true, emits.length > 0
-    assert_equal "tag1", emits[0].first
-    assert_equal ({"k1"=>"ok"}), emits[0].last
+    assert_equal true, emits.length.zero?
+    assert_equal true, emits[0].nil?
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-proc_count
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - toyama0919
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-17 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -176,11 +190,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: process count check plugin for fluentd.
 test_files:
 - test/helper.rb
 - test/plugin/test_in_proc_count.rb
-has_rdoc: