tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5502 from mcktr/mcktr/fix/notification-scripts 

Fix duplicate variable in notification scripts
This commit is contained in:
Michael Friedrich 2017-08-14 17:36:08 +02:00 committed by GitHub
parent c3ecc96820 e2bf7516bb
commit 301b72ceef
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/icinga2/scripts/mail-host-notification.sh
View File

@ -3,7 +3,7 @@
# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/) # Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
PROG="`basename $0`" PROG="`basename $0`"
HOSTNAME="`hostname`" ICINGA2HOST="`hostname`"
MAILBIN="mail" MAILBIN="mail"
if [ -z "`which $MAILBIN`" ] ; then if [ -z "`which $MAILBIN`" ] ; then
@ -93,7 +93,7 @@ SUBJECT="[$NOTIFICATIONTYPE] Host $HOSTDISPLAYNAME is $HOSTSTATE!"
## Build the notification message ## Build the notification message
NOTIFICATION_MESSAGE=`cat << EOF NOTIFICATION_MESSAGE=`cat << EOF
***** Host Monitoring on $HOSTNAME ***** ***** Host Monitoring on $ICINGA2HOST *****
$HOSTDISPLAYNAME is $HOSTSTATE! $HOSTDISPLAYNAME is $HOSTSTATE!

4
etc/icinga2/scripts/mail-service-notification.sh
View File

@ -3,7 +3,7 @@
# Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/) # Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)
PROG="`basename $0`" PROG="`basename $0`"
HOSTNAME="`hostname`" ICINGA2HOST="`hostname`"
MAILBIN="mail" MAILBIN="mail"
if [ -z "`which $MAILBIN`" ] ; then if [ -z "`which $MAILBIN`" ] ; then
@ -98,7 +98,7 @@ SUBJECT="[$NOTIFICATIONTYPE] $SERVICEDISPLAYNAME on $HOSTDISPLAYNAME is $SERVICE
## Build the notification message ## Build the notification message
NOTIFICATION_MESSAGE=`cat << EOF NOTIFICATION_MESSAGE=`cat << EOF
***** Service Monitoring on $HOSTNAME ***** ***** Service Monitoring on $ICINGA2HOST *****
$SERVICEDISPLAYNAME on $HOSTDISPLAYNAME is $SERVICESTATE! $SERVICEDISPLAYNAME on $HOSTDISPLAYNAME is $SERVICESTATE!