tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-27 07:34:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added host.notes and service.notes output if specified

Browse Source
This commit is contained in:
Silas 2023-03-01 11:48:39 +01:00 committed by Alexander A. Klimov
parent cf517050bc
commit 31710e1162
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,7 @@ Required parameters:
Optional parameters: Optional parameters:
-4 HOSTADDRESS (\$address\$) -4 HOSTADDRESS (\$address\$)
-6 HOSTADDRESS6 (\$address6\$) -6 HOSTADDRESS6 (\$address6\$)
-X HOSTNOTES (\$host.notes\$)
-b NOTIFICATIONAUTHORNAME (\$notification.author\$) -b NOTIFICATIONAUTHORNAME (\$notification.author\$)
-c NOTIFICATIONCOMMENT (\$notification.comment\$) -c NOTIFICATIONCOMMENT (\$notification.comment\$)
-i ICINGAWEB2URL (\$notification_icingaweb2url\$, Default: unset) -i ICINGAWEB2URL (\$notification_icingaweb2url\$, Default: unset)
@ -63,7 +64,7 @@ urlencode() {
} }
## Main ## Main
while getopts 4:6::b:c:d:f:hi:l:n:o:r:s:t:v: opt while getopts 4:6::b:c:d:f:hi:l:n:o:r:s:t:v:X: opt
do do
case "$opt" in case "$opt" in
4) HOSTADDRESS=$OPTARG ;; 4) HOSTADDRESS=$OPTARG ;;
@ -77,6 +78,7 @@ do
l) HOSTNAME=$OPTARG ;; # required l) HOSTNAME=$OPTARG ;; # required
n) HOSTDISPLAYNAME=$OPTARG ;; # required n) HOSTDISPLAYNAME=$OPTARG ;; # required
o) HOSTOUTPUT=$OPTARG ;; # required o) HOSTOUTPUT=$OPTARG ;; # required
X) HOSTNOTES="${OPTARG}" ;;
r) USEREMAIL=$OPTARG ;; # required r) USEREMAIL=$OPTARG ;; # required
s) HOSTSTATE=$OPTARG ;; # required s) HOSTSTATE=$OPTARG ;; # required
t) NOTIFICATIONTYPE=$OPTARG ;; # required t) NOTIFICATIONTYPE=$OPTARG ;; # required
@ -129,6 +131,12 @@ if [ -n "$HOSTADDRESS6" ] ; then
IPv6: $HOSTADDRESS6" IPv6: $HOSTADDRESS6"
fi fi
## Check whether host notes was specified.
if [ -n "$HOSTNOTES" ] ; then
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
Host-Notes: $HOSTNOTES"
fi
## Check whether author and comment was specified. ## Check whether author and comment was specified.
if [ -n "$NOTIFICATIONCOMMENT" ] ; then if [ -n "$NOTIFICATIONCOMMENT" ] ; then
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE

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

@ -29,6 +29,8 @@ Required parameters:
Optional parameters: Optional parameters:
-4 HOSTADDRESS (\$address\$) -4 HOSTADDRESS (\$address\$)
-6 HOSTADDRESS6 (\$address6\$) -6 HOSTADDRESS6 (\$address6\$)
-X HOSTNOTES (\$host.notes\$)
-x SERVICENOTES (\$service.notes\$)
-b NOTIFICATIONAUTHORNAME (\$notification.author\$) -b NOTIFICATIONAUTHORNAME (\$notification.author\$)
-c NOTIFICATIONCOMMENT (\$notification.comment\$) -c NOTIFICATIONCOMMENT (\$notification.comment\$)
-i ICINGAWEB2URL (\$notification_icingaweb2url\$, Default: unset) -i ICINGAWEB2URL (\$notification_icingaweb2url\$, Default: unset)
@ -65,7 +67,7 @@ urlencode() {
} }
## Main ## Main
while getopts 4:6:b:c:d:e:f:hi:l:n:o:r:s:t:u:v: opt while getopts 4:6:b:c:d:e:f:hi:l:n:o:r:s:t:u:v:X:x: opt
do do
case "$opt" in case "$opt" in
4) HOSTADDRESS=$OPTARG ;; 4) HOSTADDRESS=$OPTARG ;;
@ -79,6 +81,8 @@ do
i) ICINGAWEB2URL=$OPTARG ;; i) ICINGAWEB2URL=$OPTARG ;;
l) HOSTNAME=$OPTARG ;; # required l) HOSTNAME=$OPTARG ;; # required
n) HOSTDISPLAYNAME=$OPTARG ;; # required n) HOSTDISPLAYNAME=$OPTARG ;; # required
X) HOSTNOTES=$OPTARG ;;
x) SERVICENOTES=$OPTARG ;;
o) SERVICEOUTPUT=$OPTARG ;; # required o) SERVICEOUTPUT=$OPTARG ;; # required
r) USEREMAIL=$OPTARG ;; # required r) USEREMAIL=$OPTARG ;; # required
s) SERVICESTATE=$OPTARG ;; # required s) SERVICESTATE=$OPTARG ;; # required
@ -134,6 +138,18 @@ if [ -n "$HOSTADDRESS6" ] ; then
IPv6: $HOSTADDRESS6" IPv6: $HOSTADDRESS6"
fi fi
## Check whether host notes was specified.
if [ -n "${HOSTNOTES}" ] ; then
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
Host-Notes: $HOSTNOTES"
fi
## Check whether service notes was specified.
if [ -n "${SERVICENOTES}" ] ; then
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
Service-Notes: $SERVICENOTES"
fi
## Check whether author and comment was specified. ## Check whether author and comment was specified.
if [ -n "$NOTIFICATIONCOMMENT" ] ; then if [ -n "$NOTIFICATIONCOMMENT" ] ; then
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE