sensu-extensions-snmp-trap 0.0.30 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 685c31eceffb21bc8acbd3ed90424b912524a154
-  data.tar.gz: 6899b9c27bbdb66b276ed9d2cb25c5e63e8ade5d
+  metadata.gz: 17e9844d75b6724daf2d8e32267c1906c439c1f7
+  data.tar.gz: 81e48a1e828bbc194c1618b3eb978308248b3ab9
 SHA512:
-  metadata.gz: 07f81872568a1a16412d77b761f47cbcd0666a944fd50ee7c6cdf93fbeb1d112e5cb5efa00926006c7062f9919a55e740f06979ec7c533b674fbd96d62f34dca
-  data.tar.gz: e499acae86185bd041973e0a30ef3147af8d74e7424d7ccf08b2e4b665fba43f015036941b50b9f7b2977a4971b5365848f86e2ed2808fb1d5e09a3037b842c4
+  metadata.gz: 307d5098b043b4333f40b8b8e8feaf4b20cc4dbc0ec6bdfe491c9b0705eb46d9f3129f41aec87e4b4595d667f1ffd32c5727297ec68be58fd9aa4c1cbb738e71
+  data.tar.gz: 87dea0b54f9ac5962f2d665e4a65a99c0677045d2c6d8ec00fba0d91f0974e6e6540f7e529178190f2378e874b9173777dd0eed7a1c56cc66cefb5c5b646b0da

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 = [
@@ -42,8 +42,8 @@ module Sensu
 
       def definition
         {
-          name: name,
-          publish: false
+          :name => name,
+          :publish => false
         }
       end
 
@@ -66,13 +66,20 @@ module Sensu
         @options
       end
 
+      def convert_to_mapping(configured_mapping)
+        configured_mapping.map do |mapping|
+          [Regexp.new(mapping.first), mapping.last.to_sym]
+        end
+      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
+          configured_mapping = options[:mappings][:result]
+          @result_map = convert_to_mapping(configured_mapping) + RESULT_MAP
         else
           @result_map = RESULT_MAP
         end
@@ -84,7 +91,8 @@ module Sensu
             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
+          configured_mapping = options[:mappings][:result_status]
+          @result_status_map = convert_to_mapping(configured_mapping) + RESULT_STATUS_MAP
         else
           @result_status_map = RESULT_STATUS_MAP
         end
@@ -280,9 +288,9 @@ module Sensu
         @logger.debug("snmp trap check extension processing a v2 trap")
         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|
@@ -290,7 +298,7 @@ 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
+            result[:snmp_trap][symbolic_name] = value
             mapping = result_map.detect do |mapping|
               symbolic_name =~ mapping.first
             end
@@ -309,9 +317,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.30
+  version: 0.0.31
 platform: ruby
 authors:
 - Sensu-Extensions and contributors