sensu-extensions-snmp-trap 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1feffd81f40101785f75574c00c40f1702553e9d
-  data.tar.gz: 0e6ef279d3409262325a6550c25ec5d3b0fe2888
+  metadata.gz: 8890629f1fedb002fc46d386528bb9de7465895d
+  data.tar.gz: 1a0795a4bd1fa1205cc0548abb2bec16a9a14086
 SHA512:
-  metadata.gz: df71e80e71ecf77a079a65dbe1f7d85641e1723294562ce4f42471bd84a2c062575b8106eec7fce6d59eba4516be8a3bd4c0da36398402b9c117f272a0d9d7b9
-  data.tar.gz: 215f99cd917e491e2913ace52b3a5f74e72461aad41d365a95e18c865ce25445d9dd74058db4f9146a0a5b3bb29347ae385f0f169608006c3233038878d359cb
+  metadata.gz: a86a80855366388b84a060cb1a88fc1cfa1c236f0de69ede1fb605ff071466d22c2ddecbacfd710f23aa9e7d4db5f08d9d773f832414d6125ffe4f70e08b7776
+  data.tar.gz: b54cf90420362077e0c01417311bdf0f5cb88662bf2f89022fddeaf1a214f97fd306c9a4ee2c4a6ab5c993d81d43f6dcab324b1f1ca8b6369240f79de49f0f3e

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

@@ -187,38 +187,37 @@ module Sensu
         end
       end
 
-      def trap_varbind_list(trap)
-        trap.varbind_list.map { |varbind|
-          begin
-            symbolic_name = @mibs.name(varbind.name.to_oid)
-            "#{symbolic_name} -> #{varbind.value}"
-          rescue
-            "#{varbind.name} -> #{varbind.value}"
-          end
-        }.join(" | ")
-      end
-
       def process_trap(trap)
         @logger.debug("snmp trap check extension processing a v2 trap")
         result = {
           :source => determine_hostname(trap.source_ip),
-          :handlers => options[:handlers]
+          :handlers => options[:handlers],
+          :snmp_trap => {}
         }
         trap.varbind_list.each do |varbind|
           symbolic_name = @mibs.name(varbind.name.to_oid)
-          mapping = RESULT_MAP.detect do |mapping|
-            symbolic_name =~ mapping.first
-          end
-          if mapping && !result[mapping.last]
-            type_conversion = RUBY_ASN1_MAP[varbind.value.asn1_type]
-            if type_conversion
-              result[mapping.last] = varbind.value.send(type_conversion)
+          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|
+              symbolic_name =~ mapping.first
+            end
+            if mapping && !result[mapping.last]
+              type_conversion = RUBY_ASN1_MAP[varbind.value.asn1_type]
+              result[mapping.last] = value
             end
+          else
+            @logger.error("snmp trap check extension failed to convert varbind", {
+              :symbolic_name => symbolic_name,
+              :asn1_type => varbind.value.asn1_type,
+              :raw_value => varbind.value
+            })
           end
         end
         result[:name] ||= determine_trap_oid(trap)
-        result[:output] ||= trap_varbind_list(trap)
-        result[:status] ||= 3
+        result[:output] ||= "received snmp trap"
+        result[:status] ||= 0
         send_result(result)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-extensions-snmp-trap
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Sensu-Extensions and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-19 00:00:00.000000000 Z
+date: 2016-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sensu-extension