bin/check-rds-events.rb in sensu-plugins-aws-2.0.1 vs bin/check-rds-events.rb in sensu-plugins-aws-2.1.0

@@ -62,11 +62,11 @@
   def run
     clusters = maint_clusters
     if clusters.empty?
       ok
     else
-      critical("Clusters w/ critical events: #{clusters.join(',')}")
+      critical("Clusters w/ critical events: #{clusters.join(', ')}")
     end
   end
 
   def maint_clusters
     rds = AWS::RDS::Client.new aws_config
@@ -80,10 +80,11 @@
       clusters.each do |cluster_name|
         events_record = rds.describe_events(start_time: (Time.now - 7200).iso8601, source_type: 'db-instance', source_identifier: cluster_name)
         next if events_record[:events].empty?
 
         # if the last event is a start maint event then the cluster is still in maint
-        maint_clusters.push(cluster_name) if events_record[:events][-1][:message] =~ /has started|is being|off-line|shutdown/
+        cluster_name_long = "#{cluster_name} (#{aws_config[:region]}) #{events_record[:events][-1][:message]}"
+        maint_clusters.push(cluster_name_long) if events_record[:events][-1][:message] =~ /has started|is being|off-line|shutdown/
       end
     rescue => e
       unknown "An error occurred processing AWS RDS API: #{e.message}"
     end
     maint_clusters