sensu-extensions-snmp-trap 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f0973bb3ae00e0a0ce2cb2c73f791647e1c0cc6
-  data.tar.gz: dfb3cddff9fdd957baebc60eb66f98ca0abc5122
+  metadata.gz: 5d5ef1ace4e6db46ada2a1af63d43ec120423aa0
+  data.tar.gz: 0e5192ef22a7c8c72d1552f4ab8ec1036459f161
 SHA512:
-  metadata.gz: 9821e8c84870558c58d524457e7755cc03d64ed0bf4669bf0b8278de07588d96cd602531a998fe7c8a99ac7a35112b58cbebc6f302a723c067804afd126bb28f
-  data.tar.gz: c16dff9fa82c6a204858921c49449bd0ef4881e1ac441cc93236322dc1032d86cc29087bf2c99826a76586b3baad2c64d0bcf48dc6d4789c63843809f8ae0fbd
+  metadata.gz: 12221123c60ed7e98bb028e53e6bc7e36e942894a28a01bd54cc8d8886d5ac8f5697a4abc7effa39b5759249f8a0839bf87a8ea4f3e1a4fab40df011a7b2af22
+  data.tar.gz: 3a706a9964258ea92cdeca593a8abe174086f11adf6c4010b39e557e71b4b2e63e0869b42decd7dd504dd7e9b2893e49ec11de622bc68f06fe3990e592aa0e5d

data/lib/sensu/extensions/snmp-trap.rb

@@ -66,20 +66,72 @@ module Sensu
         end
       end
 
+      def determine_mib_preload(module_name)
+        preload = []
+        if @mib_map[module_name]
+          @mib_map[module_name][:imports].each do |import|
+            if @mib_map[import]
+              preload << @mib_map[import][:mib_file]
+            end
+            preload << determine_mib_preload(import)
+          end
+        else
+          @logger.fatal("snmp trap check extension unknown mib preload", :module_name => module_name)
+        end
+        preload.flatten
+      end
+
+      def create_mib_map!
+        @logger.debug("snmp trap check extension creating mib map", :mibs_dir => options[:mibs_dir])
+        @mib_map = {}
+        Dir.glob(File.join(options[:mibs_dir], "*")).each do |mib_file|
+          mib_contents = IO.read(mib_file)
+          module_name = mib_contents.scan(/([\w-]+)\s+DEFINITIONS\s+::=\s+BEGIN/).flatten.first
+          details = {
+            :mib_file => mib_file,
+            :imports => mib_contents.scan(/FROM\s+([\w-]+)/).flatten
+          }
+          if @mib_map.has_key?(module_name)
+            @logger.debug("snmp trap check extension overriding mib map entry", {
+              :module_name => module_name,
+              :details => details
+            })
+          end
+          @mib_map[module_name] = details
+        end
+        @mib_map.each_key do |module_name|
+          @mib_map[module_name][:preload] = determine_mib_preload(module_name)
+        end
+        puts @mib_map
+        @mib_map
+      end
+
       def load_mibs!
         @logger.debug("snmp trap check extension importing mibs", {
           :mibs_dir => options[:mibs_dir],
           :imported_dir => options[:imported_dir]
         })
-        mib_files = Dir.glob(File.join(options[:mibs_dir], "*"))
-        mib_files.each do |mib_file|
-          @logger.debug("snmp trap check extension importing mib", :mib_file => mib_file)
+        @mib_map.each do |module_name, details|
+          @logger.debug("snmp trap check extension importing mib", {
+            :module_name => module_name,
+            :details => details
+          })
           begin
-            preload = mib_files - [mib_file]
-            SNMP::MIB.import_module(mib_file, options[:imported_dir], preload)
+            @logger.debug("snmp trap check extension mib dependencies", {
+              :module_name => module_name,
+              :details => details
+            })
+            unless details[:preload].empty?
+              arguments = "-p "
+              arguments << details[:preload].map { |preload| preload }.join(" -p ")
+            else
+              arguments = nil
+            end
+            SNMP::MIB.import_module(details[:mib_file], options[:imported_dir], arguments)
           rescue StandardError, SyntaxError => error
             @logger.debug("snmp trap check extension failed to import mib", {
-              :mib_file => mib_file,
+              :module_name => module_name,
+              :details => details,
               :error => error
             })
           end
@@ -160,6 +212,7 @@ module Sensu
 
       def start_trap_processor!
         @processor = Thread.new do
+          create_mib_map!
           load_mibs!
           loop do
             process_trap(@traps.pop)

data/lib/sensu/extensions/snmp-trap/snmp-patch.rb

@@ -13,13 +13,13 @@ module SNMP
         @sensu_logger.warn("snmp trap check extension mib warning", :warning => message.downcase)
       end
 
-      def import_module(module_file, mib_dir=DEFAULT_MIB_PATH, mib_preload=[])
+      def import_module(module_file, mib_dir=DEFAULT_MIB_PATH, raw_arguments=nil)
         raise "smidump tool must be installed" unless import_supported?
         FileUtils.makedirs mib_dir
-        # PATCH: add preload support
-        preload = mib_preload.map {|mib_file| " -p #{mib_file}"}.join("")
+        # PATCH: add arguments support
+        arguments = raw_arguments ? " #{raw_arguments}" : ""
         # PATCH: redirect STDERR to /dev/null
-        mib_hash = `smidump#{preload} -k -f python #{module_file} 2>/dev/null`
+        mib_hash = `smidump#{arguments} -k -f python #{module_file} 2>/dev/null`
         mib = eval_mib_data(mib_hash)
         if mib
           module_name = mib["moduleName"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-extensions-snmp-trap
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Sensu-Extensions and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-extension