From 4bcd4462d055842b57d662827ace5f185c69f9f2 Mon Sep 17 00:00:00 2001 From: Will Bradley Date: Sat, 18 Feb 2012 20:47:10 -0700 Subject: [PATCH] Fixed nag.php --- nag.php | 62 +++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/nag.php b/nag.php index daec9d2..02a017a 100644 --- a/nag.php +++ b/nag.php @@ -1,7 +1,6 @@ | // +----------------------------------------------------------------------+ -// $Id: nag.php,v 1.0 2011/12/11 03:76:14 wbradley Exp $ -// $Source: ArduinoNagiosDisplay/nag.php,v $ +// $Id: statusXML.php,v 1.6 2009/02/07 03:32:14 jantman Exp $ +// $Source: /usr/local/cvsroot/admin-portal/nagios/statusXML.php,v $ + -// change the statusFile to the location of status.dat on your Nagios system $statusFile = "/var/cache/nagios3/status.dat"; -// ------------- end config - $nag_version = getFileVersion($statusFile); // returns integer 2 or 3 $created_ts = 0; @@ -71,12 +68,12 @@ $ret = ""; // begin outputting XML //header("Content-type: text/xml"); if($minimal){ - $ret .= "$"; + $ret .= "^"; } else { $ret .= ""."\n"; - $ret .= ''."\n"; - $ret .= ""."\n"; + $ret .= ''."\n"; + $ret .= ""."\n"; } // program status /* @@ -99,8 +96,24 @@ $ret = ""; $ret .= $hostArray['current_state']; } else { - $ret .= "
".$hostArray['host_name']."
"; - $ret .= "
".$hostArray['current_state']."
"; + $ret .= ""; + $ret .= ""; + switch($hostArray['current_state']) { + case 0: + $hoststate = "OK"; + break; + case 1: + $hoststate = "WARNING"; + break; + case 2: + $hoststate = "CRITICAL"; + break; + } + $ret .= ""; + $ret .= ""; + $ret .= ""; } /* $current_state = $hostArray['current_state']; @@ -124,14 +137,33 @@ $ret = ""; $ret .= $serviceArray['current_state']; } else { - $ret .= "
".$serviceArray['host_name']." ".$serviceArray['service_description']."
"; - $ret .= "
".$serviceArray['current_state']."
"; + $ret .= ""; + $ret .= ""; + switch($serviceArray['current_state']) { + case 0: + $servstate = "OK"; + break; + case 1: + $servstate = "WARNING"; + break; + case 2: + $servstate = "CRITICAL"; + break; + } + $ret .= ""; + $ret .= ""; + $ret .= ""; } } } -if(!$minimal){ - $ret .= ""; +if($minimal){ + $ret .= "$"; +} +else{ + $ret .= "
".$hostArray['host_name'].""; + $ret .= $hoststate; + $ret .= "".$hostArray['plugin_output']."
".$serviceArray['host_name']." ".$serviceArray['service_description'].""; + $ret .= $servstate; + $ret .= "".$serviceArray['plugin_output']."
"; } return $ret; }