sensu-extensions-snmp-trap 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 982978010dd4af2abce9139ada931452e337f500
-  data.tar.gz: bca9570f5ca959ce68d2b30d293e7b831160fb91
+  metadata.gz: 212d774acc00e64bef553942d8680c458b88b09d
+  data.tar.gz: 6b6cd04e2a294fb67415661b032e0c1055f20edb
 SHA512:
-  metadata.gz: ab7c2c10d6814076994a727d503d9e0f4adea4a572ed6a9429490deaf7361bd9cdd8d2d38a619778f12d424249530d95409418d3b4c774c18a9017689461d337
-  data.tar.gz: 51a51a0437142dd46dc6ded6faa389269fc977f506486f6c37572b0452babcf18e1547a43875c3d2adb93bc867d1d5573a9ce8a117435a00a8c9b3baf1e948bc
+  metadata.gz: a7e00690bb6106b5117cf9305bb4ebbe7721b2ee454005c4580110a032d0b13fae05aab219552ce59f1e8057845088dbbd80d45370fa0e00dc5752c9a4a1a488
+  data.tar.gz: c00a72f69311d0aad8b12992a26cceabc7831afb1e1f816f57c07692a40409dab06c4c4e8e02c1b8133bb7419343bbfa920b550713b444c9f215ac6cbb847251

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

@@ -84,9 +84,13 @@ module Sensu
         end
         @mibs = SNMP::MIB.new
         @logger.debug("snmp trap check extension loading mibs")
+        SNMP::MIB.list_imported(/.*/, SNMP::MIB::DEFAULT_MIB_PATH).each do |module_name|
+          @logger.debug("snmp trap check extension loading mib", :module_name => module_name)
+          @mibs.load_module(module_name, SNMP::MIB::DEFAULT_MIB_PATH)
+        end
         SNMP::MIB.list_imported(/.*/, options[:imported_dir]).each do |module_name|
           @logger.debug("snmp trap check extension loading mib", :module_name => module_name)
-          @mibs.load_module(module_name)
+          @mibs.load_module(module_name, options[:imported_dir])
         end
         @mibs
       end

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

@@ -44,23 +44,6 @@ module SNMP
           nil
         end
       end
-
-      def list_imported(regex=//, mib_dir=nil)
-        list = []
-        # PATCH: always allow importing from the default mib path
-        Dir["#{DEFAULT_MIB_PATH}/*.#{MODULE_EXT}"].each do |name|
-          module_name = File.basename(name, ".*")
-          list << module_name if module_name =~ regex
-        end
-        # PATCH: optionally import from a provided mib path
-        if mib_dir
-          Dir["#{mib_dir}/*.#{MODULE_EXT}"].each do |name|
-            module_name = File.basename(name, ".*")
-            list << module_name if module_name =~ regex
-          end
-        end
-        list
-      end
     end
   end
 end

metadata

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