sensu-extensions-snmp-trap 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbf13970cc88fe9d95e2f7ec93e0c179a56f9492
-  data.tar.gz: 934dcd6ad4697e076ccac8cae2e5098e3d76ac4c
+  metadata.gz: deb2d73b39cf91c5709d0dbe0493d9172d603c7e
+  data.tar.gz: cf009e01e2a987f56d8ac242c0ce5899aeba9ace
 SHA512:
-  metadata.gz: ab7853f5e4157c38dda6ef8f6ef729044999de93250bbe78d92870109dbd00c77d2f5ee1596c951190f9317161ebc03e66f016f7c241e3dc994e69fd563009cb
-  data.tar.gz: c323d3046528b5d491f667e6aafc485a301b50131f0045c57d3b6998c751ccd904f6e59894ac4783d51a756da50923d0a4f78c19444c56152eda4d5d3841eaff
+  metadata.gz: f625aa909ee29dea1bc5491ec666f73ade3e87213f5346d276c9bcaca4f89a434a779227649b9089dece956b343934943e285cfc7c773c3e95f7554d0081e423
+  data.tar.gz: 893f57fb730621f6368d9273a26159100a43abd73818313c7a4c3828e62e2e277702c6eddc33a82dcbaf8081d19b899f39a900550ce90ba07f68474e771296a6

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

@@ -192,6 +192,26 @@ module Sensu
         end
       end
 
+      def determine_trap_name(trap)
+        oid_symbolic_name = determine_trap_oid(trap)
+        if oid_symbolic_name =~ /link(down|up)/i
+          name = "linkStatus"
+          trap.varbind_list.each do |varbind|
+            symbolic_name = @mibs.name(varbind.name.to_oid)
+            if symbolic_name =~ /ifdescr/i
+              type_conversion = RUBY_ASN1_MAP[varbind.value.asn1_type]
+              if type_conversion
+                value = varbind.value.send(type_conversion)
+                name = "#{name}-#{value}"
+              end
+            end
+          end
+          name
+        else
+          oid_symbolic_name
+        end
+      end
+
       def determine_trap_status(trap)
         oid_symbolic_name = determine_trap_oid(trap)
         mapping = RESULT_STATUS_MAP.detect do |mapping|
@@ -217,7 +237,6 @@ module Sensu
               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
@@ -228,7 +247,7 @@ module Sensu
             })
           end
         end
-        result[:name] ||= determine_trap_oid(trap)
+        result[:name] ||= determine_trap_name(trap)
         result[:output] ||= "received snmp trap"
         result[:status] ||= determine_trap_status(trap)
         send_result(result)

metadata

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