From b24d4cab8f90f600f1e8001627eba59e736b3b37 Mon Sep 17 00:00:00 2001 From: Jordan Sissel Date: Sat, 24 Aug 2013 23:43:20 -0700 Subject: [PATCH] - fix nagios output (refactor for new event methods, etc) --- lib/logstash/outputs/nagios.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/logstash/outputs/nagios.rb b/lib/logstash/outputs/nagios.rb index a885b05fd..2081e3bd1 100644 --- a/lib/logstash/outputs/nagios.rb +++ b/lib/logstash/outputs/nagios.rb @@ -109,13 +109,12 @@ class LogStash::Outputs::Nagios < LogStash::Outputs::Base end end - cmd = "[#{Time.now.to_i}] PROCESS_SERVICE_CHECK_RESULT;#{host[0]};#{service[0]};#{level};" + cmd = "[#{Time.now.to_i}] PROCESS_SERVICE_CHECK_RESULT;#{host};#{service};#{level};" if annotation - cmd += "#{annotation[0]}: " + cmd += "#{annotation}: " end - cmd += "#{event.source}: " # In the multi-line case, escape the newlines for the nagios command file - cmd += event.message.gsub("\n", "\\n") + cmd += (event["message"] || "").gsub("\n", "\\n") @logger.debug("Opening nagios command file", :commandfile => @commandfile, :nagios_command => cmd)