sensu-extensions-snmp-trap 0.0.29 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fe24a3cec32cec72abb25b7c029c1505f72689d
-  data.tar.gz: b3be12a352cd9484bd7ebc7e993b155e55fb30f6
+  metadata.gz: 685c31eceffb21bc8acbd3ed90424b912524a154
+  data.tar.gz: 6899b9c27bbdb66b276ed9d2cb25c5e63e8ade5d
 SHA512:
-  metadata.gz: a7bd382470f3c7ce7b401a0a739c45007b83785106168d767246a03a727be8fa710813275d83e4da6a8f7d91e0f535cf7476edc18c8b57d3b87fc5b232cfe3ef
-  data.tar.gz: 9542c7465a2568b12b845cc36084d85d9b8a35b56bf1455b15fe41dead6ce2d8da641b2603ecfa4730a2c336d8b3b4d6df505af99f8db7bca8a6e40dcae4b77f
+  metadata.gz: 07f81872568a1a16412d77b761f47cbcd0666a944fd50ee7c6cdf93fbeb1d112e5cb5efa00926006c7062f9919a55e740f06979ec7c533b674fbd96d62f34dca
+  data.tar.gz: e499acae86185bd041973e0a30ef3147af8d74e7424d7ccf08b2e4b665fba43f015036941b50b9f7b2977a4971b5365848f86e2ed2808fb1d5e09a3037b842c4

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

@@ -7,11 +7,11 @@ module Sensu
     class SNMPTrap < Check
 
       RESULT_MAP = [
-        [/checkname/i, :name],
-        [/notification/i, :output],
-        [/description/i, :output],
-        [/pansystemseverity/i, Proc.new { |value| value > 3 ? 2 : 0 }, :status],
-        [/severity/i, :status]
+        [/checkname/i, "name"],
+        [/notification/i, "output"],
+        [/description/i, "output"],
+        [/pansystemseverity/i, Proc.new { |value| value > 3 ? 2 : 0 }, "status"],
+        [/severity/i, "status"]
       ]
 
       RESULT_STATUS_MAP = [
@@ -56,12 +56,40 @@ module Sensu
           :handlers => ["default"],
           :mibs_dir => "/etc/sensu/mibs",
           :imported_dir => File.join(Dir.tmpdir, "sensu_snmp_imported_mibs"),
-          :custom_attributes => {}
+          :result_attributes => {},
+          :mappings => {
+            :result => [],
+            :result_status => []
+          }
         }
         @options.merge!(@settings[:snmp_trap]) if @settings[:snmp_trap].is_a?(Hash)
         @options
       end
 
+      def result_map
+        return @result_map if @result_map
+        if options[:mappings] &&
+            options[:mappings].is_a?(Hash) &&
+            options[:mappings][:result] &&
+            options[:mappings][:result].is_a?(Array)
+          @result_map = options[:mappings][:result] + RESULT_MAP
+        else
+          @result_map = RESULT_MAP
+        end
+      end
+
+      def result_status_map
+        return @result_status_map if @result_status_map
+        if options[:mappings] &&
+            options[:mappings].is_a?(Hash) &&
+            options[:mappings][:result_status] &&
+            options[:mappings][:result_status].is_a?(Array)
+          @result_status_map = options[:mappings][:result_status] + RESULT_STATUS_MAP
+        else
+          @result_status_map = RESULT_STATUS_MAP
+        end
+      end
+
       def start_snmpv2_listener!
         @listener = SNMP::TrapListener.new(
           :host => options[:bind],
@@ -242,7 +270,7 @@ module Sensu
 
       def determine_trap_status(trap)
         oid_symbolic_name = determine_trap_oid(trap)
-        mapping = RESULT_STATUS_MAP.detect do |mapping|
+        mapping = result_status_map.detect do |mapping|
           oid_symbolic_name =~ mapping.first
         end
         mapping ? mapping.last : 0
@@ -250,11 +278,11 @@ module Sensu
 
       def process_trap(trap)
         @logger.debug("snmp trap check extension processing a v2 trap")
-        result = options[:custom_attributes].merge(
+        result = options[:result_attributes].merge(
           {
-            :source => determine_hostname(trap.source_ip),
-            :handlers => options[:handlers],
-            :snmp_trap => {}
+            "source" => determine_hostname(trap.source_ip),
+            "handlers" => options[:handlers],
+            "snmp_trap" => {}
           }
         )
         trap.varbind_list.each do |varbind|
@@ -262,8 +290,8 @@ module Sensu
           type_conversion = RUBY_ASN1_MAP[varbind.value.asn1_type]
           if type_conversion
             value = varbind.value.send(type_conversion)
-            result[:snmp_trap][symbolic_name] = value
-            mapping = RESULT_MAP.detect do |mapping|
+            result["snmp_trap"][symbolic_name] = value
+            mapping = result_map.detect do |mapping|
               symbolic_name =~ mapping.first
             end
             if mapping && !result[mapping.last]
@@ -281,9 +309,9 @@ module Sensu
             })
           end
         end
-        result[:name] ||= determine_trap_name(trap)
-        result[:output] ||= determine_trap_output(trap)
-        result[:status] ||= determine_trap_status(trap)
+        result["name"] ||= determine_trap_name(trap)
+        result["output"] ||= determine_trap_output(trap)
+        result["status"] ||= determine_trap_status(trap)
         send_result(result)
       end
 

metadata

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