===================================================================
RCS file: /cvs/nagios/alert/alert,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -r1.4 -r1.6
--- nagios/alert/alert	2010/02/16 17:58:35	1.4
+++ nagios/alert/alert	2010/02/18 19:17:42	1.6
@@ -1,5 +1,5 @@
 #!/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 _method=$2
 local _contact=$3
@@ -27,7 +27,7 @@
 local _long_host="Date/Time: $NAGIOS_LONGDATETIME
 $_notification
 
-Host: $NAGIOS_HOSTALIAS [$NAGIOS_HOSTADDRESS]
+Host:  $NAGIOS_HOSTNAME [$NAGIOS_HOSTADDRESS] $NAGIOS_HOSTALIAS
 State: $NAGIOS_HOSTSTATE (for $NAGIOS_HOSTDURATION)
 $NAGIOS_HOSTOUTPUT
 
@@ -40,9 +40,9 @@
 local _long_svc="Date/Time: $NAGIOS_LONGDATETIME
 $_notification
 
+Host:    $NAGIOS_HOSTNAME [$NAGIOS_HOSTADDRESS] $NAGIOS_HOSTALIAS
+State:   $NAGIOS_SERVICESTATE (for $NAGIOS_SERVICEDURATION)
 Service: $NAGIOS_SERVICEDESC
-Host: $NAGIOS_HOSTALIAS ($NAGIOS_HOSTADDRESS)
-State: $NAGIOS_SERVICESTATE (for $NAGIOS_SERVICEDURATION)
 $NAGIOS_SERVICEOUTPUT
 
 https://stats.redrivernet.com/cgi-bin/nagios/extinfo.cgi?type=2&host=$NAGIOS_HOSTNAME&service=`echo $NAGIOS_SERVICEDESC | sed -e 's/ /+/g'`
@@ -72,10 +72,10 @@
 esac
 
 if [ X"$NAGIOS_NOTIFICATIONTYPE" == X"ACKNOWLEDGEMENT" ]; then
-    _state=$NAGIOS_NOTIFICATIONTYPE
+    _state=ACK
 fi
 
-_short="$_state: $_short"
+_short="`echo $_state | cut -c 1-4`: $_short"
 _long=`echo "$_long" | awk '{ gsub(/<br *\/?>/,"\n") }1'`
 
 case $_method in