sensu-extensions-snmp-trap 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d5ef1ace4e6db46ada2a1af63d43ec120423aa0
-  data.tar.gz: 0e5192ef22a7c8c72d1552f4ab8ec1036459f161
+  metadata.gz: 9f6c37e7057ea6418096af61a7d5b28a8d1ab57f
+  data.tar.gz: 334392511173b5aa5b8857f077727dd2a977a6f4
 SHA512:
-  metadata.gz: 12221123c60ed7e98bb028e53e6bc7e36e942894a28a01bd54cc8d8886d5ac8f5697a4abc7effa39b5759249f8a0839bf87a8ea4f3e1a4fab40df011a7b2af22
-  data.tar.gz: 3a706a9964258ea92cdeca593a8abe174086f11adf6c4010b39e557e71b4b2e63e0869b42decd7dd504dd7e9b2893e49ec11de622bc68f06fe3990e592aa0e5d
+  metadata.gz: c802a393ef637b9a3193d6dec4c9910c20fe2ff3561bbfac529e6628f3684daac8394d168540b7f816f7a899d452f8aa3586a96307d71ee48b1bd3168045a093
+  data.tar.gz: bab934bd6a75637532f129a7b27b9aaac36798e01444409c9cb300541a4171082bf85e9561604acf9ba36097485e08d2a4651cc4708acae5c6164acea2fca0e6

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

@@ -68,22 +68,22 @@ module Sensu
 
       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]
+        if @mibs_map[module_name]
+          @mibs_map[module_name][:imports].each do |import|
+            if @mibs_map[import]
+              preload << @mibs_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)
+          @logger.warn("snmp trap check extension unknown mib preload module", :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 = {}
+      def create_mibs_map!
+        @logger.info("snmp trap check extension creating mibs map", :mibs_dir => options[:mibs_dir])
+        @mibs_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
@@ -91,27 +91,23 @@ module Sensu
             :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", {
+          if @mibs_map.has_key?(module_name)
+            @logger.warn("snmp trap check extension overriding mib map entry", {
               :module_name => module_name,
               :details => details
             })
           end
-          @mib_map[module_name] = details
+          @mibs_map[module_name] = details
         end
-        @mib_map.each_key do |module_name|
-          @mib_map[module_name][:preload] = determine_mib_preload(module_name)
+        @mibs_map.each_key do |module_name|
+          @mibs_map[module_name][:preload] = determine_mib_preload(module_name)
         end
-        puts @mib_map
-        @mib_map
+        @mibs_map
       end
 
-      def load_mibs!
-        @logger.debug("snmp trap check extension importing mibs", {
-          :mibs_dir => options[:mibs_dir],
-          :imported_dir => options[:imported_dir]
-        })
-        @mib_map.each do |module_name, details|
+      def import_mibs!
+        @logger.info("snmp trap check extension importing mibs", :mibs_dir => options[:mibs_dir])
+        @mibs_map.each do |module_name, details|
           @logger.debug("snmp trap check extension importing mib", {
             :module_name => module_name,
             :details => details
@@ -136,6 +132,10 @@ module Sensu
             })
           end
         end
+      end
+
+      def load_mibs!
+        @logger.info("snmp trap check extension loading mibs", :imported_dir => options[:imported_dir])
         @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|
@@ -212,7 +212,8 @@ module Sensu
 
       def start_trap_processor!
         @processor = Thread.new do
-          create_mib_map!
+          create_mibs_map!
+          import_mibs!
           load_mibs!
           loop do
             process_trap(@traps.pop)

metadata

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