===================================================================
RCS file: /cvs/nagios/alert/alert,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -r1.1 -r1.6
--- nagios/alert/alert	2010/02/16 16:48:01	1.1
+++ nagios/alert/alert	2010/02/18 19:17:42	1.6
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1$
+# $AFresh1: alert,v 1.5 2010/02/17 16:54:14 andrew Exp $
 local _type=$1
 local _method=$2
 local _contact=$3
@@ -13,47 +13,57 @@
 fi
 
 
+local _notification=$NAGIOS_NOTIFICATIONTYPE
+if [ X"" != X"$NAGIOS_NOTIFICATIONCOMMENT" ]; then
+    _notification="$_notification $NAGIOS_NOTIFICATIONCOMMENT"
+fi
+if [ X"" != X"$NAGIOS_NOTIFICATIONAUTHOR" ]; then
+    _notification="$_notification ($NAGIOS_NOTIFICATIONAUTHOR)"
+fi
 
 ### HOST Descriptions ###
 
-local _short_host="$NAGIOS_HOSTSTATE: $NAGIOS_HOSTNAME"
+local _short_host="$NAGIOS_HOSTNAME"
 local _long_host="Date/Time: $NAGIOS_LONGDATETIME
-Notification Type: $NAGIOS_NOTIFICATIONTYPE
+$_notification
 
-Host: $NAGIOS_HOSTALIAS ($NAGIOS_HOSTADDRESS)
+Host:  $NAGIOS_HOSTNAME [$NAGIOS_HOSTADDRESS] $NAGIOS_HOSTALIAS
 State: $NAGIOS_HOSTSTATE (for $NAGIOS_HOSTDURATION)
+$NAGIOS_HOSTOUTPUT
 
 https://stats.redrivernet.com/CGi-bin/nagios/extinfo.cgi?type=1&host=$NAGIOS_HOSTNAME
 "
 
 ### SERVICE Descriptions ###
 
-local _short_svc="$NAGIOS_SERVICESTATE: $NAGIOS_HOSTNAME $NAGIOS_SERVICEDESC ($NAGIOS_SERVICEOUTPUT)"
+local _short_svc="$NAGIOS_HOSTNAME $NAGIOS_SERVICEDESC"
 local _long_svc="Date/Time: $NAGIOS_LONGDATETIME
-Notification Type: $NAGIOS_NOTIFICATIONTYPE
+$_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'`
 "
 
 ### Actions ###
 
-local _additional_vars=NOTIFICATIONCOMMENT
+local _state
 local _short
 local _long
+
 case $_type in
 	HOST)
+        _state=$NAGIOS_HOSTSTATE
 		_short=$_short_host
 		_long=$_long_host
-		_additional_vars="$_additional_vars HOSTOUTPUT HOSTACKCOMMENT"
 		;;
 	SERVICE)
+        _state=$NAGIOS_SERVICESTATE
 		_short=$_short_svc
 		_long=$_long_svc
-		_additional_vars="$_additional_vars SERVICEOUTPUT SERVICEACKCOMMENT"
 		;;
 	*)
 		echo "Unknown type $_type"
@@ -61,20 +71,12 @@
 		;;
 esac
 
-local _add
-local _a
-for _a in $_additional_vars; do
-    local _val
-	eval _val=\${NAGIOS_${_a}}
-	if [ X"" != X"$_val" ]; then
-		_add="$_add\n$_val"
-	fi
-done
-
-if [ X"" != X"$_add" ]; then
-	_long="$_long\nAdditional Info: $_add"
+if [ X"$NAGIOS_NOTIFICATIONTYPE" == X"ACKNOWLEDGEMENT" ]; then
+    _state=ACK
 fi
 
+_short="`echo $_state | cut -c 1-4`: $_short"
+_long=`echo "$_long" | awk '{ gsub(/<br *\/?>/,"\n") }1'`
 
 case $_method in
 	mail)