sensu-plugins-aws 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d3c5e2004707422af5e589968107c2a8a8e08dc
-  data.tar.gz: 70afa3ca1abecb2941ad349e3d7be906e5e02d92
+  metadata.gz: b033a2356552a4236375fa098d94437d9c45ad95
+  data.tar.gz: caf3f47b3699ce4ded5de4be24880fe96d3d82e5
 SHA512:
-  metadata.gz: 9002e1780605aa9d9b6b8c341c3ff9249264ed7f0eaee1c5821e774e3ee6102e1cde3daea0aaa67ea963109d2594b6c16e70f3c2d075545af442d16d21e263f5
-  data.tar.gz: 38bfa408a0ac64c03477611f8f95af494342204b85a734f82ea98d41edc16edd2f981c7ddf31d014150562eec94feea96c81cd5edf36a1d64915a3fe587188c4
+  metadata.gz: 3c97e49b9ba0c8dccaffc218208a4f2a829d6dcc2e0ac5aba7eb83d589f8217bd63aae4e85c6d5e5d2f78ad28415d459c98e0e9c681718a6ae6d5033c1091ea2
+  data.tar.gz: 8a6214038280fd0edd711ec63fc67503daded445fca460f04292b76f59f44dca6039a361dfa1a0447bd77ccd411f71f796e1f1187950e3b0445a759b3daabf9d

data/CHANGELOG.md

@@ -4,6 +4,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 This CHANGELOG follows the format listed at [Keep A Changelog](http://keepachangelog.com/)
 
 ## [Unreleased]
+## [6.0.1] 2017-05-11
+### Fixed
+- check-instance-events.rb: fix instance Name tag retrieval that broke upon aws sdk v2 update, and update output message handling (@swibowo)
+
 ## 6.0.0
 ### Breaking Change
 - check-elb-nodes.rb returns critical instead of unknown if total number of nodes equals zero (@autarchprinceps)
@@ -303,7 +307,8 @@ WARNING:  This release contains major breaking changes that will impact all user
 ### Added
 - initial release
 
-[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/6.0.0...HEAD
+[Unreleased]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/6.0.1...HEAD
+[6.0.1]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/6.0.0...6.0.1
 [6.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/5.1.0...6.0.0
 [5.1.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/5.1.0...5.0.0
 [5.0.0]: https://github.com/sensu-plugins/sensu-plugins-aws/compare/5.0.0...4.1.0

data/bin/check-instance-events.rb

@@ -13,7 +13,7 @@
 #   Linux
 #
 # DEPENDENCIES:
-#   gem: aws-sdk-v1
+#   gem: aws-sdk
 #   gem: sensu-plugin
 #
 # USAGE:
@@ -121,18 +121,22 @@ class CheckInstanceEvents < Sensu::Plugin::Check::CLI
             i[:events].reject { |x| (x[:code] =~ /system-reboot|instance-reboot|instance-stop|system-maintenance/) && (x[:description] =~ /\[Completed\]|\[Canceled\]/) }
 
           unless useful_events.empty?
+            name = ''
             if config[:include_name]
-              name = ''
               begin
                 instance_desc = ec2.describe_instances(instance_ids: [i[:instance_id]])
-                name = instance_desc[:reservation_index][i[:instance_id]][:instances_set][0][:tag_set].select { |tag| tag[:key] == 'Name' }[0][:value]
+                name_tag = instance_desc.reservations[0].instances[0].tags.find { |tag| tag[:key] == 'Name' }
+                name = name_tag.nil? ? '' : name_tag.value
               rescue => e
                 puts "Issue getting instance details for #{i[:instance_id]} (#{r}).  Exception = #{e}"
               end
-              event_instances << "#{name} (#{i[:instance_id]} #{r}) (#{i[:events][0][:code]}) #{i[:events][0][:description]}"
-            else
-              event_instances << "#{i[:instance_id]} (#{r}) (#{i[:events][0][:code]}) #{i[:events][0][:description]}"
             end
+
+            event_instances << if name.empty?
+                                 "#{i[:instance_id]} (#{r}) (#{i[:events][0][:code]}) #{i[:events][0][:description]}"
+                               else
+                                 "#{name} (#{i[:instance_id]} #{r}) (#{i[:events][0][:code]}) #{i[:events][0][:description]}"
+                               end
           end
         end
       rescue => e

data/lib/sensu-plugins-aws/version.rb

@@ -2,7 +2,7 @@ module SensuPluginsAWS
   module Version
     MAJOR = 6
     MINOR = 0
-    PATCH = 0
+    PATCH = 1
     VER_STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sensu-plugins-aws
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Sensu-Plugins and contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk