fluent-plugin-snmp 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGYwZThlYWJhZTFhNmVhZmUzNmE0OGRhM2NmNzRkZDM2ZjNhZDc2Mg==
-  data.tar.gz: !binary |-
-    N2E3MTk1YTJjZWY1MzBkYmY1NTFlNDE0MGM0MTIzNzE2ZDg5MGRmOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YzFmMTM3ZTc4MGU1YWE1ZWM0MmYyYWIyZGZhYmYwMTAxOGFlOTJkZDg2ZmQ0
-    NWU5ODUxZDgyYzJlZDkzZjM3ZGRkZWVkMjA0M2E5NzNmZDJlZGEwOTgxNmEy
-    MGIyNDQyOThkOWU4YTYzNmYyZjAwMGIxOTQ0ZTI2YjU1NjkwZWY=
-  data.tar.gz: !binary |-
-    Njg0MmY1MDE1ODcwNmRkZWQ3OTFkYTg4MDIxYmJhNjkxNDhlYTE2ODUwYzE0
-    ZDliN2E3NTBiNmM5N2ZmNWFkNDcwN2Q3NmY1NDA0NDM0NzZiNWY5ZDBiZDhh
-    MzVhN2ZiNzU4ZTk1ZDA5NDQyMzNhZDJjYWMxYjJiMWQ4NjljNGE=
+SHA1:
+  metadata.gz: fbf4f6aea588052f179cb8bb809937efe48a5eb1
+  data.tar.gz: 90280ffe549a38dd122c9488e41472ef5783fb26
+SHA512:
+  metadata.gz: 75e4fc90bc40575af0f2b55e1fa8797f0bc92dac8cf83ae9e0363da75f919e954cdf4625d49324f820f13f8be9faf59bf6a49ffccaa5edab51c56291eee4f7b7
+  data.tar.gz: bf4a4889d90481063def2e6b365490eedd55457133224a541d7fc3e6b6ed2c00e46ce785a845944a738166bf315fc15859cba8865dd597715d543e074a66fd94

data/Gemfile

@@ -2,4 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in fluent-plugin-snmp.gemspec
 gemspec
-gem 'mocha'

data/README.md

@@ -1,16 +1,24 @@
-# Fluent::Plugin::Snmp
+# Fluent::Plugin::Snmp, a plugin for [Fluentd](http://fluentd.org)
 
 Fluentd snmp input plugin
 
-## Installation
+## Installation possibilities
 
-Add this line to your application's Gemfile:
+- With your application's Gemfile:
 
-    gem 'fluent-plugin-snmp'
+    `gem 'fluent-plugin-snmp'`
 
-Or install it yourself as:
+- Install it yourself as:
 
-    $ gem install fluent-plugin-snmp
+    `$ gem install fluent-plugin-snmp`
+
+- Intall with td-agent:
+
+    `$ td-agent-gem install fluent-plugin-snmp`
+
+- If you are using vanilla Fluentd:
+
+    `$ fluent-gem install fluent-plugin-snmp`
 
 ## Usage
 

data/fluent-plugin-snmp.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-snmp"
-  gem.version       = "0.0.8"
+  gem.version       = "0.0.9"
   gem.authors       = ["hiro-su"]
   gem.email         = ["h-sugimoto@iij.ad.jp"]
   gem.description   = %q{Input plugin to snmp}
@@ -14,10 +14,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency "fluentd"
-  gem.add_development_dependency "snmp"
-  gem.add_development_dependency "polling"
-  gem.add_runtime_dependency "fluentd"
-  gem.add_runtime_dependency "snmp"
-  gem.add_runtime_dependency "polling"
+  gem.add_runtime_dependency "fluentd", ">= 0.10.58"
+  gem.add_runtime_dependency "snmp", "~> 1.2.0"
+  gem.add_runtime_dependency "polling", "0.1.5"
+
+  gem.add_development_dependency "bundler", "~> 1.12"
+  gem.add_development_dependency "rake", "~> 10.0"
+  gem.add_development_dependency "mocha", "~> 1.1.0"
 end

data/lib/fluent/plugin/in_snmp.rb

@@ -1,3 +1,4 @@
+require 'fluent/input'
 require 'snmp' # http://snmplib.rubyforge.org/doc/index.html
 require 'polling'
 
@@ -13,7 +14,6 @@ module Fluent
     config_param :polling_time, :string, :default => nil
     config_param :polling_offset, :time, :default => 0
     config_param :polling_type, :string, :default => "run" #or async_run
-    config_param :host_name, :string, :default => nil
     config_param :method_type, :string, :default => "walk" #or get
     config_param :out_executor, :string, :default => nil
 
@@ -99,23 +99,16 @@ module Fluent
             :nodes       => @nodes,
             :conf        => conf
           }
-          Fluent::SnmpInput.new.out_exec(manager, opts)
+          out_exec(manager, opts)
         end
       end
     end
 
-    def starter
-      @starter = Thread.new do
-        yield
-      end
-    end
-
     def start
-      starter do
-        @manager = SNMP::Manager.new(@snmp_init_params)
-        @thread = Thread.new(&method(:run))
-        @end_flag = false
-      end
+      super
+      @manager = SNMP::Manager.new(@snmp_init_params)
+      @thread = Thread.new(&method(:run))
+      @end_flag = false
     end
 
     def run
@@ -140,10 +133,6 @@ module Fluent
         @thread.join
         @thread = nil
       end
-      if @starter
-        @starter.join 
-        @starter = nil
-      end
       if @manager
         @manager.close 
       end
@@ -184,7 +173,7 @@ module Fluent
           else
             nodes.each{|param| record[param] = check_type(vb.__send__(param))}
           end
-          Engine.emit(@tag, time, record)
+          router.emit(@tag, time, record)
           return {:time => time, :record => record} if test
         end
       end
@@ -202,7 +191,7 @@ module Fluent
         else
           nodes.each{|param| record[param] = check_type(vb.__send__(param))}
         end
-        Engine.emit(@tag, time, record)
+        router.emit(@tag, time, record)
         return {:time => time, :record => record} if test
       end
     rescue => ex
@@ -213,6 +202,8 @@ module Fluent
     def check_type(value)
       if value =~ /^\d+(\.\d+)?$/ 
         return value.to_f
+      elsif SNMP::Integer === value
+        return value.to_i
       else
         return value.to_s
       end

data/sample/out_exec.rb.sample

@@ -8,7 +8,7 @@ module Fluent
         row.each do |vb|
           record["name"] = vb.name.to_s
           record["value"] = vb.value.to_s
-          Engine.emit opts[:tag], time, record
+          router.emit opts[:tag], time, record
         end
       end
     end

data/sample/snmp.conf.sample

@@ -1,5 +1,5 @@
 <source>
-  type snmp
+  @type snmp
   tag snmp.server1
   nodes name, value
   host localhost
@@ -11,7 +11,7 @@
 </source>
 
 <source>
-  type snmp
+  @type snmp
   tag snmp.server2
   host localhost
   community public
@@ -22,5 +22,5 @@
 </source>
 
 <match snmp.server*>
-  type stdout
+  @type stdout
 </match>

data/test/plugin/test_in_snmp.rb

@@ -6,7 +6,7 @@ class SnmpInputTest < Test::Unit::TestCase
 
   def setup
     Fluent::Test.setup
-    @obj = Fluent::SnmpInput.new
+    #@obj = Fluent::SnmpInput.new
   end
 
   CONFIG = %[
@@ -16,11 +16,8 @@ class SnmpInputTest < Test::Unit::TestCase
     polling_time 0,10,20,30,40,50
     polling_offset 0
     host localhost
-    host_name test_host
     community public
     mib_modules HOST-RESOURCES-MIB, IF-MIB
-    retry 0
-    retry_interval 2
     timeout 3s
     method_type walk
     out_executor sample/out_exec.rb.sample
@@ -40,19 +37,16 @@ class SnmpInputTest < Test::Unit::TestCase
     assert_equal ["0","10","20","30","40","50"], d.instance.polling_time
     assert_equal 0, d.instance.polling_offset
     assert_equal "walk", d.instance.method_type
-    assert_equal 2, d.instance.retry_interval
     assert_equal "sample/out_exec.rb.sample", d.instance.out_executor
 
     # SNMP Lib Params
     assert_equal "localhost", d.instance.host
-    assert_equal "test_host", d.instance.host_name
     assert_nil d.instance.port
     assert_nil d.instance.trap_port
     assert_equal "public", d.instance.community
     assert_nil d.instance.write_community
     assert_equal :SNMPv2c, d.instance.version
     assert_equal 3, d.instance.timeout
-    assert_equal 0, d.instance.retry
     assert_nil d.instance.transport
     assert_nil d.instance.max_recv_bytes
     assert_nil d.instance.mib_dir
@@ -61,18 +55,22 @@ class SnmpInputTest < Test::Unit::TestCase
   end
 
   def test_check_type
-    assert_equal "test", @obj.__send__(:check_type,"test")
-    assert_equal "utrh0", @obj.__send__(:check_type,"utrh0")
-    assert_equal "sensorValue_degC", @obj.__send__(:check_type,"sensorValue_degC")
-    assert_equal "sensorValue_%RH", @obj.__send__(:check_type,"sensorValue_%RH")
-    assert_equal 12.00, @obj.__send__(:check_type,"12")
-    assert_equal 12.34, @obj.__send__(:check_type,"12.34")
-    assert_equal String, @obj.__send__(:check_type,"test").class
-    assert_equal String, @obj.__send__(:check_type,"utrh0").class
-    assert_equal String, @obj.__send__(:check_type,"sensorValue_degC").class
-    assert_equal String, @obj.__send__(:check_type,"sensorValue_%RH").class
-    assert_equal Float, @obj.__send__(:check_type,"12").class
-    assert_equal Float, @obj.__send__(:check_type,"12.34").class
+    d = create_driver
+
+    assert_equal "test", d.instance.__send__(:check_type, "test")
+    assert_equal "utrh0", d.instance.__send__(:check_type, "utrh0")
+    assert_equal "sensorValue_degC", d.instance.__send__(:check_type, "sensorValue_degC")
+    assert_equal "sensorValue_%RH", d.instance.__send__(:check_type, "sensorValue_%RH")
+    assert_equal 12.00, d.instance.__send__(:check_type, "12")
+    assert_equal 12.34, d.instance.__send__(:check_type, "12.34")
+    assert_equal 12, d.instance.__send__(:check_type, SNMP::Integer.new("12"))
+    assert_equal String, d.instance.__send__(:check_type, "test").class
+    assert_equal String, d.instance.__send__(:check_type, "utrh0").class
+    assert_equal String, d.instance.__send__(:check_type, "sensorValue_degC").class
+    assert_equal String, d.instance.__send__(:check_type, "sensorValue_%RH").class
+    assert_equal Float, d.instance.__send__(:check_type, "12").class
+    assert_equal Float, d.instance.__send__(:check_type, "12.34").class
+    assert_equal Fixnum, d.instance.__send__(:check_type, SNMP::Integer.new("12")).class
   end
 
   def test_snmp_walk
@@ -93,15 +91,14 @@ class SnmpInputTest < Test::Unit::TestCase
     Time.stubs(:now).returns(Time.parse "2012/12/31 23:59:50")
     manager = SNMP::Manager.new(snmp_init_params)
 
-    data = @obj.__send__(:snmp_walk, manager, mib, nodes, true)
+    data = d.instance.__send__(:snmp_walk, manager, mib, nodes, true)
     record = data[:record]
 
     assert_equal 1356965990, data[:time]
-    assert_equal "HOST-RESOURCES-MIB::hrStorageIndex.31", record["name"]
-    assert_equal "31", record["value"]
+    assert_equal "HOST-RESOURCES-MIB::hrStorageIndex.1", record["name"]
+    assert_equal 1, record["value"]
   end
 
-
   def test_snmp_get
     d = create_driver %[
       tag snmp.server1
@@ -128,12 +125,12 @@ class SnmpInputTest < Test::Unit::TestCase
     Time.stubs(:now).returns(Time.parse "2012/12/31 23:59:50")
     manager = SNMP::Manager.new(snmp_init_params)
 
-    data = @obj.__send__(:snmp_get, manager, mib, nodes, true)
+    data = d.instance.__send__(:snmp_get, manager, mib, nodes, true)
     record = data[:record]
 
     assert_equal 1356965990, data[:time]
     assert_equal "HOST-RESOURCES-MIB::hrStorageIndex.31", record["name"]
-    assert_equal "31", record["value"]
+    assert_equal 31, record["value"]
   end
 
   def test_exec_snmp
@@ -157,7 +154,7 @@ class SnmpInputTest < Test::Unit::TestCase
       :test => true
     }
 
-    exec = @obj.__send__(:exec_snmp, opts)
-    assert_equal 0, exec
+    exec = d.instance.__send__(:exec_snmp, opts)
+    assert_equal nil, exec
   end
 end

metadata

@@ -1,99 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-snmp
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - hiro-su
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2016-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.10.58
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.58
 - !ruby/object:Gem::Dependency
   name: snmp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: polling
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.1.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
-  name: fluentd
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '1.12'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: snmp
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: polling
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: 1.1.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 description: Input plugin to snmp
 email:
 - h-sugimoto@iij.ad.jp
@@ -101,7 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -121,17 +121,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Input plugin to snmp