[Pkg-nagios-changes] [pkg-nagios] r875 - nagios2/trunk/debian

[Marc Haber]

Author: zugschlus
Date: 2006-03-31 11:45:50 +0000 (Fri, 31 Mar 2006)
New Revision: 875

Modified:
   nagios2/trunk/debian/cfg-misccommands.cfg.diff
   nagios2/trunk/debian/changelog
Log:
  * re-work notifications to be slightly more verbose. For example, an
    acknowledgement notification now actually includes the comment.



Modified: nagios2/trunk/debian/cfg-misccommands.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-misccommands.cfg.diff	2006-03-31 11:34:02 UTC (rev 874)
+++ nagios2/trunk/debian/cfg-misccommands.cfg.diff	2006-03-31 11:45:50 UTC (rev 875)
@@ -1,5 +1,5 @@
---- sample-config/template-object/misccommands.cfg	2006-02-04 15:16:05.000000000 +0100
-+++ debian-configs/misccommands.cfg	2006-02-04 15:16:05.000000000 +0100
+--- sample-config/template-object/misccommands.cfg	2006-03-31 11:43:30.000000000 +0000
++++ debian-configs/misccommands.cfg	2006-03-31 11:40:10.000000000 +0000
 @@ -1,12 +1,5 @@
  ################################################################################
 -# Sample object config file for Nagios 
@@ -26,8 +26,48 @@
  #
  ################################################################################
  
-@@ -78,9 +68,9 @@
+@@ -49,9 +39,25 @@
+ # 'host-notify-by-email' command definition
+ define command{
+ 	command_name	host-notify-by-email
+-	command_line	/usr/bin/printf "%b" "***** Nagios  *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /usr/bin/mail -s "Host $HOSTSTATE$ alert for $HOSTNAME$!" $CONTACTEMAIL$
++	command_line	/usr/bin/printf "%b" "***** Nagios  *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTALIAS$\nState: $HOSTSTATE$ for $HOSTDURATION$\nAddress: $HOSTADDRESS$\nInfo:\n\n$HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n\nACK by: $HOSTACKAUTHOR$\nComment: $HOSTACKCOMMENT$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ alert $NOTIFICATIONNUMBER$ - $HOSTALIAS$ host is $HOSTSTATE$ **" $CONTACTEMAIL$
++	}
++
++# 'notify-by-email' command definition
++define command{
++	command_name	notify-by-email
++	command_line	/usr/bin/printf "%b" "***** Nagios  *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nState: $SERVICESTATE$ for $SERVICEDURATION$\nAddress: $HOSTADDRESS$\n\nInfo:\n\n$SERVICEOUTPUT$\n\nDate/Time: $LONGDATETIME$\n\nACK by: $SERVICEACKAUTHOR$\nComment: $SERVICEACKCOMMENT$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ alert $NOTIFICATIONNUMBER$ - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
+ 	}
  
++#define command{
++#  	command_name	notify-by-email
++# 	command_line	/usr/bin/printf "%b" "***** Nagios  *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
++# 	}
++ 
++#define command{
++#	command_name	host-notify-by-email
++#	command_line	/usr/bin/printf "%b" "***** Nagios  *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /usr/bin/mail -s "Host $HOSTSTATE$ alert for $HOSTNAME$!" $CONTACTEMAIL$
++#	}
++
+ 
+ # 'host-notify-by-epager' command definition
+ define command{
+@@ -59,12 +65,6 @@
+ 	command_line	/usr/bin/printf "%b" "Host '$HOSTALIAS$' is $HOSTSTATE$\nInfo: $HOSTOUTPUT$\nTime: $LONGDATETIME$" | /usr/bin/mail -s "$NOTIFICATIONTYPE$ alert - Host $HOSTNAME$ is $HOSTSTATE$" $CONTACTPAGER$
+ 	}
+ 
+-# 'notify-by-email' command definition
+-define command{
+-	command_name	notify-by-email
+-	command_line	/usr/bin/printf "%b" "***** Nagios  *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
+-	}
+-
+ 
+ # 'notify-by-epager' command definition
+ define command{
+@@ -78,9 +78,9 @@
+ 
  ################################################################################
  #
 -# SAMPLE PERFORMANCE DATA COMMANDS

Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2006-03-31 11:34:02 UTC (rev 874)
+++ nagios2/trunk/debian/changelog	2006-03-31 11:45:50 UTC (rev 875)
@@ -4,8 +4,10 @@
   * nagios2.prerm: replace "|| exit 0" with "|| true" (see #337664,
     but we had the offending code in the script verbatim)
   * move nagios2-doc to section docs
+  * re-work notifications to be slightly more verbose. For example, an
+    acknowledgement notification now actually includes the comment.
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Fri, 31 Mar 2006 11:33:40 +0000
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Fri, 31 Mar 2006 11:44:49 +0000
 
 nagios2 (2.0-1) unstable; urgency=low