Paladox has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/361228 )
Change subject: Fix host name in notifications ...................................................................... Fix host name in notifications Change-Id: I04cbf0931a99c42a80598ad19dbadc3daa44d2aa --- M templates/mail-service-notification.sh.erb M templates/ores-mail-service-notification.sh.erb 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved diff --git a/templates/mail-service-notification.sh.erb b/templates/mail-service-notification.sh.erb index 35890b4..83bcd18 100644 --- a/templates/mail-service-notification.sh.erb +++ b/templates/mail-service-notification.sh.erb @@ -19,4 +19,4 @@ # /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - $HOSTDISPLAYNAME - $SERVICEDISPLAYNAME is $SERVICESTATE" $USEREMAIL -/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: $SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT $NOTIFICATIONAUTHORNAME $NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc.log +/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTALIAS is $SERVICESTATE: $SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT $NOTIFICATIONAUTHORNAME $NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc.log diff --git a/templates/ores-mail-service-notification.sh.erb b/templates/ores-mail-service-notification.sh.erb index 9a9e88e..dda71a4 100644 --- a/templates/ores-mail-service-notification.sh.erb +++ b/templates/ores-mail-service-notification.sh.erb @@ -19,4 +19,4 @@ # /usr/bin/printf "%b" "$template" | mail -s "$NOTIFICATIONTYPE - $HOSTDISPLAYNAME - $SERVICEDISPLAYNAME is $SERVICESTATE" $USEREMAIL -/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTNAME is $SERVICESTATE: $SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT $NOTIFICATIONAUTHORNAME $NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc-ores.log +/bin/echo "$NOTIFICATIONTYPE - $SERVICEDESC on $HOSTALIAS is $SERVICESTATE: $SERVICEOUTPUT $SERVICEACKAUTHOR $SERVICEACKCOMMENT $NOTIFICATIONAUTHORNAME $NOTIFICATIONCOMMENT" >> /var/log/icinga2/irc-ores.log -- To view, visit https://gerrit.wikimedia.org/r/361228 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04cbf0931a99c42a80598ad19dbadc3daa44d2aa Gerrit-PatchSet: 2 Gerrit-Project: labs/icinga2 Gerrit-Branch: master Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
