nagios: better error reporting, less noise

1 files changed, 3 insertions, 7 deletions

diff --git a/jobs/nagios.rb b/jobs/nagios.rb
index 687ac32..34a5487 100644
--- a/jobs/nagios.rb
+++ b/jobs/nagios.rb
@@ -67,10 +67,8 @@ SCHEDULER.every '10s' do
       unknown_services = Array.new
 
       unacked.each do |alert|
-        puts alert
         next if ! alert["host"].include? env[:domain]
         next if ! tried_at_maximum(alert["attempts"])
-        puts '============='
         if alert["status"].eql? "CRITICAL"
           critical_count += 1
           critical_services << alert["service"]
@@ -98,16 +96,14 @@ SCHEDULER.every '10s' do
         end
       end
 
-      puts key.to_s + ": " + critical_count.to_s
-      puts critical_services.join(", ")
-      puts
+      puts "#{key}: #{critical_count} (#{critical_services.join(', ')})"
 
     rescue => error
-      error.backtrace
       puts 'Could not query nagios at '+env[:query_url]
+      puts error
       status = "red"
       critical_count = 1
-      critical_services = ['Could not query nagios']
+      critical_services = ["Could not query nagios #{error}"]
 
     end
     send_event('nagios-' + key.to_s, {