logstash-input-snmptrap 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f826339bdfade97bc430f9d3482eda7538fd12
-  data.tar.gz: e8cdd9b865a53cf0431d01c861851c10dc1f76c6
+  metadata.gz: c759abcd6c485c8edba0993e3c2df4371b456ebe
+  data.tar.gz: c84414fc3eba899cdea271f7f21ebc15ff425236
 SHA512:
-  metadata.gz: 07d95b9c61dc8f4bdef4c713dd9f1ee3efec8bd92cc48723c3a3b5875c5cd6af18d7c202bffaf0c814f0e1bbd86a67911769bcfb7948000e29c23bee095fe806
-  data.tar.gz: d234efa3c538aa2c9d685b39efbea90e469f1f26e4b6d4d4e3791dab2f81da9ff3a2d2fc1231c67b7f068ebc80e1b0251a77b0eff3bce85e35ae8c9c59a33771
+  metadata.gz: e745c5e8a9679a51aa0c11a56b8d5709429948131caa1e7c97b41400b36d4803a2dee82b9c7fa4e015f5bf0832c4cbb6d7c4425529203d31751243399632c99d
+  data.tar.gz: 4a48277be79c7b899c47a4c92cb142c4015a90dda376ee833c50ff6897ffc1b8ffe3a548c4b35b6a4f7f2b9d7d3905491ebf2fa08445d2f5a8ca6ee02b976456

data/README.md

@@ -1,15 +1,15 @@
 # Logstash Plugin
 
-This is a plugin for [Logstash](https://github.com/elasticsearch/logstash).
+This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.
 
 ## Documentation
 
-Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elasticsearch.org/guide/en/logstash/current/).
+Logstash provides infrastructure to automatically generate documentation for this plugin. We use the asciidoc format to write documentation so any comments in the source code will be first converted into asciidoc and then into html. All plugin documentation are placed under one [central location](http://www.elastic.co/guide/en/logstash/current/).
 
 - For formatting code or config example, you can use the asciidoc `[source,ruby]` directive
-- For more asciidoc formatting tips, see the excellent reference here https://github.com/elasticsearch/docs#asciidoc-guide
+- For more asciidoc formatting tips, see the excellent reference here https://github.com/elastic/docs#asciidoc-guide
 
 ## Need Help?
 
@@ -83,4 +83,4 @@ Programming is not a required skill. Whatever you've seen about open source and
 
 It is more important to the community that you are able to contribute.
 
-For more information about contributing, see the [CONTRIBUTING](https://github.com/elasticsearch/logstash/blob/master/CONTRIBUTING.md) file.
+For more information about contributing, see the [CONTRIBUTING](https://github.com/elastic/logstash/blob/master/CONTRIBUTING.md) file.

data/lib/logstash/inputs/snmptrap.rb

@@ -2,13 +2,15 @@
 require "logstash/inputs/base"
 require "logstash/namespace"
 
+require "snmp"
+
 # Read snmp trap messages as events
 #
 # Resulting `@message` looks like :
 # [source,ruby]
-#   #<SNMP::SNMPv1_Trap:0x6f1a7a4 @varbind_list=[#<SNMP::VarBind:0x2d7bcd8f @value="teststring", 
-#   @name=[1.11.12.13.14.15]>], @timestamp=#<SNMP::TimeTicks:0x1af47e9d @value=55>, @generic_trap=6, 
-#   @enterprise=[1.2.3.4.5.6], @source_ip="127.0.0.1", @agent_addr=#<SNMP::IpAddress:0x29a4833e @value="\xC0\xC1\xC2\xC3">, 
+#   #<SNMP::SNMPv1_Trap:0x6f1a7a4 @varbind_list=[#<SNMP::VarBind:0x2d7bcd8f @value="teststring",
+#   @name=[1.11.12.13.14.15]>], @timestamp=#<SNMP::TimeTicks:0x1af47e9d @value=55>, @generic_trap=6,
+#   @enterprise=[1.2.3.4.5.6], @source_ip="127.0.0.1", @agent_addr=#<SNMP::IpAddress:0x29a4833e @value="\xC0\xC1\xC2\xC3">,
 #   @specific_trap=99>
 #
 
@@ -32,9 +34,7 @@ class LogStash::Inputs::Snmptrap < LogStash::Inputs::Base
     super(*args)
   end # def initialize
 
-  public
   def register
-    require "snmp"
     @snmptrap = nil
     if @yamlmibdir
       @logger.info("checking #{@yamlmibdir} for MIBs")
@@ -47,26 +47,35 @@ class LogStash::Inputs::Snmptrap < LogStash::Inputs::Base
     end
   end # def register
 
-  public
   def run(output_queue)
     begin
       # snmp trap server
       snmptrap_listener(output_queue)
     rescue => e
       @logger.warn("SNMP Trap listener died", :exception => e, :backtrace => e.backtrace)
-      sleep(5)
-      retry
+      Stud.stoppable_sleep(5) { stop? }
+      retry if !stop?
     end # begin
   end # def run
 
+  def stop
+    @snmptrap.exit unless @snmptrap.nil?
+    @snmptrap = nil
+  end
+
   private
-  def snmptrap_listener(output_queue)
+
+  def build_trap_listener
     traplistener_opts = {:Port => @port, :Community => @community, :Host => @host}
     if @yaml_mibs && !@yaml_mibs.empty?
       traplistener_opts.merge!({:MibDir => @yamlmibdir, :MibModules => @yaml_mibs})
     end
     @logger.info("It's a Trap!", traplistener_opts.dup)
     @snmptrap = SNMP::TrapListener.new(traplistener_opts)
+  end
+
+  def snmptrap_listener(output_queue)
+    build_trap_listener
 
     @snmptrap.on_trap_default do |trap|
       begin

data/logstash-input-snmptrap.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-snmptrap'
-  s.version         = '1.0.0'
+  s.version         = '2.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read snmp trap messages as events"
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # Files
-  s.files = `git ls-files`.split($\)+::Dir.glob('vendor/*')
+  s.files = Dir['lib/**/*','spec/**/*','vendor/**/*','*.gemspec','*.md','CONTRIBUTORS','Gemfile','LICENSE','NOTICE.TXT']
 
   # Tests
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
@@ -20,9 +20,10 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", '>= 1.4.0', '< 2.0.0'
+  s.add_runtime_dependency "logstash-core", "~> 2.0.0.snapshot"
 
   s.add_runtime_dependency 'snmp'
+  s.add_runtime_dependency 'logstash-codec-plain'
 
   s.add_development_dependency 'logstash-devutils'
 end

data/spec/inputs/snmptrap_spec.rb

@@ -1 +1,12 @@
 require "logstash/devutils/rspec/spec_helper"
+require 'logstash/inputs/snmptrap'
+
+describe LogStash::Inputs::Snmptrap do
+  it_behaves_like "an interruptible input plugin" do
+    # as there is no mocking the run method will
+    # raise a connection error and put the run method
+    # into the sleep retry section loop
+    # meaning that the stoppable sleep impl is tested
+    let(:config) { {} }
+  end
+end

metadata

@@ -1,77 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-snmptrap
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0.snapshot
   name: logstash-core
+  prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.0.snapshot
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
+  name: snmp
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: snmp
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-codec-plain
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: logstash-devutils
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - CHANGELOG.md
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
 - NOTICE.TXT
 - README.md
-- Rakefile
 - lib/logstash/inputs/snmptrap.rb
 - logstash-input-snmptrap.gemspec
 - spec/inputs/snmptrap_spec.rb
@@ -97,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Read snmp trap messages as events

data/.gitignore

@@ -1,4 +0,0 @@
-*.gem
-Gemfile.lock
-.bundle
-vendor

data/Rakefile

@@ -1,7 +0,0 @@
-@files=[]
-
-task :default do
-  system("rake -T")
-end
-
-require "logstash/devutils/rake"