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 #5468 from cycloon/master 

Make notification mails more readable. Remove redundancy and cruft.
This commit is contained in:
Michael Friedrich 2017-08-14 17:30:14 +02:00 committed by GitHub
parent b4b3509818 0f0b6f1df9
commit c3ecc96820
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,14 +93,14 @@ SUBJECT="[$NOTIFICATIONTYPE] Host $HOSTDISPLAYNAME is $HOSTSTATE!"
## Build the notification message ## Build the notification message
NOTIFICATION_MESSAGE=`cat << EOF NOTIFICATION_MESSAGE=`cat << EOF
***** Icinga 2 Host Monitoring on $HOSTNAME ***** ***** Host Monitoring on $HOSTNAME *****
==> $HOSTDISPLAYNAME ($HOSTNAME) is $HOSTSTATE! <== $HOSTDISPLAYNAME is $HOSTSTATE!
Info: $HOSTOUTPUT Info: $HOSTOUTPUT
When: $LONGDATETIME When: $LONGDATETIME
Host: $HOSTNAME (Display Name: "$HOSTDISPLAYNAME") Host: $HOSTNAME
EOF EOF
` `
@ -128,8 +128,7 @@ fi
if [ -n "$ICINGAWEB2URL" ] ; then if [ -n "$ICINGAWEB2URL" ] ; then
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
URL: $ICINGAWEB2URL/monitoring/host/show?host=$HOSTNAME"
$ICINGAWEB2URL/monitoring/host/show?host=$HOSTNAME"
fi fi
## Check whether verbose mode was enabled and log to syslog. ## Check whether verbose mode was enabled and log to syslog.

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

@ -98,15 +98,15 @@ SUBJECT="[$NOTIFICATIONTYPE] $SERVICEDISPLAYNAME on $HOSTDISPLAYNAME is $SERVICE
## Build the notification message ## Build the notification message
NOTIFICATION_MESSAGE=`cat << EOF NOTIFICATION_MESSAGE=`cat << EOF
***** Icinga 2 Service Monitoring on $HOSTNAME ***** ***** Service Monitoring on $HOSTNAME *****
==> $SERVICEDISPLAYNAME on $HOSTDISPLAYNAME is $SERVICESTATE! <== $SERVICEDISPLAYNAME on $HOSTDISPLAYNAME is $SERVICESTATE!
Info: $SERVICEOUTPUT Info: $SERVICEOUTPUT
When: $LONGDATETIME When: $LONGDATETIME
Service: $SERVICENAME (Display Name: "$SERVICEDISPLAYNAME") Service: $SERVICENAME
Host: $HOSTNAME (Display Name: "$HOSTDISPLAYNAME") Host: $HOSTNAME
EOF EOF
` `
@ -134,8 +134,7 @@ fi
if [ -n "$ICINGAWEB2URL" ] ; then if [ -n "$ICINGAWEB2URL" ] ; then
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
URL: $ICINGAWEB2URL/monitoring/service/show?host=$HOSTNAME&service=$SERVICENAME"
$ICINGAWEB2URL/monitoring/service/show?host=$HOSTNAME&service=$SERVICENAME"
fi fi
## Check whether verbose mode was enabled and log to syslog. ## Check whether verbose mode was enabled and log to syslog.