sensu-extensions-snmp-trap 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05c593de31023cd607a14e7df9a9b43378684a41
-  data.tar.gz: 94ac44c50553cdf049a0c0aced15c5a2f340b99e
+  metadata.gz: 9f0973bb3ae00e0a0ce2cb2c73f791647e1c0cc6
+  data.tar.gz: dfb3cddff9fdd957baebc60eb66f98ca0abc5122
 SHA512:
-  metadata.gz: 2000c69d0fb8bcd358c623e92ff0d27fb064821905a77aafbc086aabce910dc5b047752ac3b5dd9028d627dc64381e6bba5f849d4dd0bdefc042bc875046ee29
-  data.tar.gz: 3cfe7fa539c732e6bb99c11c057bfe692230e1aacd99be9bc25df15366c4f1844fec4ade394c8e30f67209cffd39dc43094c9228558f637fe02d31bd96fbebcc
+  metadata.gz: 9821e8c84870558c58d524457e7755cc03d64ed0bf4669bf0b8278de07588d96cd602531a998fe7c8a99ac7a35112b58cbebc6f302a723c067804afd126bb28f
+  data.tar.gz: c16dff9fa82c6a204858921c49449bd0ef4881e1ac441cc93236322dc1032d86cc29087bf2c99826a76586b3baad2c64d0bcf48dc6d4789c63843809f8ae0fbd

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

@@ -71,10 +71,12 @@ module Sensu
           :mibs_dir => options[:mibs_dir],
           :imported_dir => options[:imported_dir]
         })
-        Dir.glob(File.join(options[:mibs_dir], "*")) do |mib_file|
+        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)
           begin
-            SNMP::MIB.import_module(mib_file, options[:imported_dir])
+            preload = mib_files - [mib_file]
+            SNMP::MIB.import_module(mib_file, options[:imported_dir], preload)
           rescue StandardError, SyntaxError => error
             @logger.debug("snmp trap check extension failed to import mib", {
               :mib_file => mib_file,

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

@@ -13,11 +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)
+      def import_module(module_file, mib_dir=DEFAULT_MIB_PATH, mib_preload=[])
         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: redirect STDERR to /dev/null
-        mib_hash = `smidump -k -f python #{module_file} 2>/dev/null`
+        mib_hash = `smidump#{preload} -k -f python #{module_file} 2>/dev/null`
         mib = eval_mib_data(mib_hash)
         if mib
           module_name = mib["moduleName"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-extensions-snmp-trap
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Sensu-Extensions and contributors