sensu-extensions-snmp-trap 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0dff1d37a137dc9122889c532128f94c7748014
-  data.tar.gz: 56564f035ca7c62d9c322e32e19eabb7d567039c
+  metadata.gz: 9c7b813ed4a1a37820c497ae349dab99dc0eb205
+  data.tar.gz: 6734ff33b593ff66d5b2682a4fc54596e5d1d051
 SHA512:
-  metadata.gz: a195e7b3f9d78add757ec13c5586682131da390e6acf125b6b5761765edb20a8690ba4b89fb0bd4051903c4f2fd84c2cf08d11a7171e8613d552ebcf19a372be
-  data.tar.gz: ea9d564056c0f308fa91d4e59c2e28a1628ea79e82981a45a28004300016faebd1f11bb57811b6cc8e2d047b4de619d720aea6028279aef2001451192060eaa8
+  metadata.gz: 4924c3564f6d7b7f81b97a251a90fcddbf7dbc2d1e11e9691b70e0607362fafa9f437af8d13efc56d77ba5d108037c76283956c20c3125dec20de93ecf7f2cf7
+  data.tar.gz: 8f1db493d52108e42954f3ad234a190d67b516ee53c1d9b6486d191a6602df972a30ff2971cdf9b5438087294607448c9aaeb5dafadfbc2d85f726a82854dedd

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

@@ -121,15 +121,24 @@ module Sensu
         end
       end
 
-      def trap_varbind_list(trap)
-        trap.varbind_list.map { |varbind|
+      def trap_json_varbind_list(trap)
+        varbind_list = trap.varbind_list.map do |varbind|
           begin
-            symbolic_name = @mibs.name(varbind.name.to_oid)
-            "#{symbolic_name} #{varbind.name} #{varbind.value}"
+            type_conversion = RUBY_ASN1_MAP[varbind.value.asn1_type]
+            value = type_conversion ? varbind.value.send(type_conversion) : varbind.value
+            {
+              :symbolic_name => @mibs.name(varbind.name.to_oid),
+              :name => varbind.name,
+              :value => value
+            }
           rescue
-            "#{varbind.name} #{varbind.value}"
+            {
+              :name => varbind.name,
+              :value => varbind.value
+            }
           end
-        }.join("\n")
+        end
+        Sensu::JSON.dump(varbind_list)
       end
 
       def process_trap(trap)
@@ -151,7 +160,7 @@ module Sensu
           end
         end
         result[:name] ||= determine_trap_oid(trap)
-        result[:output] ||= trap_varbind_list(trap)
+        result[:output] ||= trap_json_varbind_list(trap)
         result[:status] ||= 3
         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.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Sensu-Extensions and contributors