sensu-extensions-snmp-trap 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e88bb4df60a59606ed1ed7e7ba74f52b8834356b
-  data.tar.gz: 4f4df2450f449ec32d83b89d4f4be623058ff6cc
+  metadata.gz: adf65d516cbb7841c38b4b1555b192da5feaf106
+  data.tar.gz: f2d2db96b5faa60585d65508ec96098869be43bf
 SHA512:
-  metadata.gz: cd3739ef443bfbe345f30ba38f0834ba5c64c5750f5a505ab55ee470cef1770b014efde06e3570c8fb94cdf4908dbe713851e0f49dd2b44e54fde92392e73c46
-  data.tar.gz: d3d83256fc279095f599ad7d2aef7345131d023276ff2262640154370850416bc60da49a27fc7da332b6cb15cdd5ed578c7257587f2863027a308a970a504346
+  metadata.gz: 1f8ced94e1b14739ea8f0df8b8124dc64d37d9d26bd343a5b6c8c37248829d617ed55881c6941a324f3d7b56de47d524513972459964f7d5cb5daf2f96eda995
+  data.tar.gz: 4a92c2e7bb8acee58ab37f0e84ad58d15ed630877816ba2caefdbf6ba7247614e98b3c562339454fcdaaecc0fc2fdbb90bf62068d23044e7c689b2c2af96cb0a

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

@@ -198,14 +198,14 @@ module Sensu
       def determine_trap_name(trap)
         oid_symbolic_name = determine_trap_oid(trap)
         if oid_symbolic_name =~ /link(down|up)/i
-          name = "linkStatus"
+          name = "link_status"
           trap.varbind_list.each do |varbind|
             symbolic_name = @mibs.name(varbind.name.to_oid)
             if symbolic_name =~ /ifindex/i || symbolic_name =~ /systemobject/i
               type_conversion = RUBY_ASN1_MAP[varbind.value.asn1_type]
               if type_conversion
                 value = varbind.value.send(type_conversion)
-                name = "#{name}-#{value}"
+                name = "#{name}_#{value}"
               end
             end
           end
@@ -215,6 +215,27 @@ module Sensu
         end
       end
 
+      def determine_trap_output(trap)
+        oid_symbolic_name = determine_trap_oid(trap)
+        if matched = /link(down|up)/i.match(oid_symbolic_name)
+          link_status = matched[1].downcase
+          output = "link is #{link_status}"
+          trap.varbind_list.each do |varbind|
+            symbolic_name = @mibs.name(varbind.name.to_oid)
+            if symbolic_name =~ /ifalias/i || symbolic_name =~ /ifdesc/i
+              type_conversion = RUBY_ASN1_MAP[varbind.value.asn1_type]
+              if type_conversion
+                value = varbind.value.send(type_conversion)
+                output = "#{output} - #{value}"
+              end
+            end
+          end
+          output
+        else
+          "received snmp trap"
+        end
+      end
+
       def determine_trap_status(trap)
         oid_symbolic_name = determine_trap_oid(trap)
         mapping = RESULT_STATUS_MAP.detect do |mapping|
@@ -257,7 +278,7 @@ module Sensu
           end
         end
         result[:name] ||= determine_trap_name(trap)
-        result[:output] ||= "received snmp 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.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Sensu-Extensions and contributors