[BACK]Return to alert CVS log [TXT][DIR] Up to [local] / nagios / alert

Diff for /nagios/alert/alert between version 1.4 and 1.6

version 1.4, 2010/02/16 17:58:35 version 1.6, 2010/02/18 19:17:42
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: alert,v 1.3 2010/02/16 17:18:31 andrew Exp $  # $AFresh1: alert,v 1.5 2010/02/17 16:54:14 andrew Exp $
 local _type=$1  local _type=$1
 local _method=$2  local _method=$2
 local _contact=$3  local _contact=$3
Line 27 
Line 27 
 local _long_host="Date/Time: $NAGIOS_LONGDATETIME  local _long_host="Date/Time: $NAGIOS_LONGDATETIME
 $_notification  $_notification
   
 Host: $NAGIOS_HOSTALIAS [$NAGIOS_HOSTADDRESS]  Host:  $NAGIOS_HOSTNAME [$NAGIOS_HOSTADDRESS] $NAGIOS_HOSTALIAS
 State: $NAGIOS_HOSTSTATE (for $NAGIOS_HOSTDURATION)  State: $NAGIOS_HOSTSTATE (for $NAGIOS_HOSTDURATION)
 $NAGIOS_HOSTOUTPUT  $NAGIOS_HOSTOUTPUT
   
Line 40 
Line 40 
 local _long_svc="Date/Time: $NAGIOS_LONGDATETIME  local _long_svc="Date/Time: $NAGIOS_LONGDATETIME
 $_notification  $_notification
   
   Host:    $NAGIOS_HOSTNAME [$NAGIOS_HOSTADDRESS] $NAGIOS_HOSTALIAS
   State:   $NAGIOS_SERVICESTATE (for $NAGIOS_SERVICEDURATION)
 Service: $NAGIOS_SERVICEDESC  Service: $NAGIOS_SERVICEDESC
 Host: $NAGIOS_HOSTALIAS ($NAGIOS_HOSTADDRESS)  
 State: $NAGIOS_SERVICESTATE (for $NAGIOS_SERVICEDURATION)  
 $NAGIOS_SERVICEOUTPUT  $NAGIOS_SERVICEOUTPUT
   
 https://stats.redrivernet.com/cgi-bin/nagios/extinfo.cgi?type=2&host=$NAGIOS_HOSTNAME&service=`echo $NAGIOS_SERVICEDESC | sed -e 's/ /+/g'`  https://stats.redrivernet.com/cgi-bin/nagios/extinfo.cgi?type=2&host=$NAGIOS_HOSTNAME&service=`echo $NAGIOS_SERVICEDESC | sed -e 's/ /+/g'`
Line 72 
Line 72 
 esac  esac
   
 if [ X"$NAGIOS_NOTIFICATIONTYPE" == X"ACKNOWLEDGEMENT" ]; then  if [ X"$NAGIOS_NOTIFICATIONTYPE" == X"ACKNOWLEDGEMENT" ]; then
     _state=$NAGIOS_NOTIFICATIONTYPE      _state=ACK
 fi  fi
   
 _short="$_state: $_short"  _short="`echo $_state | cut -c 1-4`: $_short"
 _long=`echo "$_long" | awk '{ gsub(/<br *\/?>/,"\n") }1'`  _long=`echo "$_long" | awk '{ gsub(/<br *\/?>/,"\n") }1'`
   
 case $_method in  case $_method in
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.6
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>