Jonny007-MKD/icinga2-notification-telegram
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Improve output

Browse source
This commit is contained in:
Jonny007-MKD 2020-10-19 21:39:36 +02:00
parent e974f45990
commit b4bc721640
2 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
host-by-telegram.sh
View file

@ -21,6 +21,7 @@
PROG="`basename $0`" PROG="`basename $0`"
HOSTNAME="`hostname`" HOSTNAME="`hostname`"
TRANSPORT="curl" TRANSPORT="curl"
LF=$'\n'
unset DEBUG unset DEBUG
if [ -z "`which $TRANSPORT`" ] ; then if [ -z "`which $TRANSPORT`" ] ; then
@ -110,15 +111,15 @@ fi
date=${LONGDATETIME#} date=${LONGDATETIME#}
if [ $ageInDays -gt 0 ]; then if [ $ageInDays -gt 0 ]; then
age="${ageInDays}d $(($ageInHours-$ageInDays*24))h ($LONGDATETIME)" age="Since ${ageInDays}d $(($ageInHours-$ageInDays*24))h ($LONGDATETIME)$LF"
elif [ $ageInHours -gt 0 ]; then elif [ $ageInHours -gt 0 ]; then
age="${ageInHours}h $(($ageInMin-$ageInHours*60))min ($LONGDATETIME)" age="Since ${ageInHours}h $(($ageInMin-$ageInHours*60))m ($LONGDATETIME)$LF"
elif [ $ageInMin -gt 0 ]; then elif [ $ageInMin -gt 0 ]; then
age="${ageInMin}min $(($ageInSec-$ageInMin*60))s" age="Since ${ageInMin}m $(($ageInSec-$ageInMin*60))s$LF"
elif [ $ageInSec -gt 5 ]; then elif [ $ageInSec -gt 5 ]; then
age="${ageInSec}s" age="Since ${ageInSec}s$LF"
else elif [ $ageInSec -lt 0 ]; then
age="$LONGDATETIME" age="Since $LONGDATETIME$LF"
fi fi
if [ "$HOSTALIAS" == "$HOSTDISPLAYNAME" ]; then if [ "$HOSTALIAS" == "$HOSTDISPLAYNAME" ]; then
@ -130,8 +131,7 @@ fi
## Build the message itself ## Build the message itself
NOTIFICATION_MESSAGE=$(cat << EOF NOTIFICATION_MESSAGE=$(cat << EOF
$HOSTSTATEICON<b>$HOSTDISPLAYNAME</b>$HOSTALIAS2 is $HOSTSTATE! $HOSTSTATEICON<b>$HOSTDISPLAYNAME</b>$HOSTALIAS2 is $HOSTSTATE!
Since $age ${age}Info $HOSTOUTPUT
Info $HOSTOUTPUT
IPv4 $HOSTADDRESS IPv4 $HOSTADDRESS
EOF EOF
) )
@ -150,7 +150,7 @@ fi
## Are we using Icinga Web 2? Put the URL into the message! ## Are we using Icinga Web 2? Put the URL into the message!
if [ -n "$HAS_ICINGAWEB2" ] ; then if [ -n "$HAS_ICINGAWEB2" ] ; then
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
<a href='$HAS_ICINGAWEB2/monitoring/host/show?host=$HOSTALIAS'>Icinga Web</a>" <a href='$HAS_ICINGAWEB2/monitoring/host/show?host=$HOSTALIAS'>$HAS_ICINGAWEB2</a>"
fi fi
## Are we verbose? Then put a message to syslog... ## Are we verbose? Then put a message to syslog...

22
service-by-telegram.sh
View file

@ -114,28 +114,28 @@ fi
date=${LONGDATETIME#} date=${LONGDATETIME#}
if [ $ageInDays -gt 0 ]; then if [ $ageInDays -gt 0 ]; then
age="${ageInDays}d $(($ageInHours-$ageInDays*24))h ($LONGDATETIME)" age=" since ${ageInDays}d $(($ageInHours-$ageInDays*24))h ($LONGDATETIME)"
elif [ $ageInHours -gt 0 ]; then elif [ $ageInHours -gt 0 ]; then
age="${ageInHours}h $(($ageInMin-$ageInHours*60))min ($LONGDATETIME)" age=" since ${ageInHours}h $(($ageInMin-$ageInHours*60))m ($LONGDATETIME)"
elif [ $ageInMin -gt 0 ]; then elif [ $ageInMin -gt 0 ]; then
age="${ageInMin}min $(($ageInSec-$ageInMin*60))s" age=" since ${ageInMin}m $(($ageInSec-$ageInMin*60))s"
elif [ $ageInSec -gt 5 ]; then elif [ $ageInSec -gt 5 ]; then
age="${ageInSec}s" age=" since ${ageInSec}s"
else elif [ $ageInSec -lt 0 ]; then
age="$LONGDATETIME" age=" since $LONGDATETIME"
fi fi
## Build the message itself ## Build the message itself
NOTIFICATION_MESSAGE=$(cat << EOF NOTIFICATION_MESSAGE=$(cat << EOF
$SERVICESTATEICON <b>$SERVICEDISPLAYNAME</b> is ${SERVICESTATE} since $age $SERVICESTATEICON <b>$SERVICEDISPLAYNAME</b> is ${SERVICESTATE}$age
Host: <b>$HOSTALIAS</b> (IPv4 $HOSTADDRESS Host: <b>$HOSTALIAS</b> (IPv4 <code>$HOSTADDRESS</code>
EOF EOF
) )
## Is this host IPv6 capable? ## Is this host IPv6 capable?
if [ -n "$HOSTADDRESS6" ] ; then if [ -n "$HOSTADDRESS6" ] ; then
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE, IPv6 $HOSTADDRESS6" NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE, IPv6 <code>$HOSTADDRESS6</code>"
fi fi
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE)" NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE)"
@ -145,7 +145,6 @@ More info: $SERVICEOUTPUT"
## Are there any comments? Put them into the message! ## Are there any comments? Put them into the message!
if [ -n "$NOTIFICATIONCOMMENT" ] ; then if [ -n "$NOTIFICATIONCOMMENT" ] ; then
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
Comment by $NOTIFICATIONAUTHORNAME: Comment by $NOTIFICATIONAUTHORNAME:
$NOTIFICATIONCOMMENT" $NOTIFICATIONCOMMENT"
fi fi
@ -153,8 +152,7 @@ fi
## Are we using Icinga Web 2? Put the URL into the message! ## Are we using Icinga Web 2? Put the URL into the message!
if [ -n "$HAS_ICINGAWEB2" ] ; then if [ -n "$HAS_ICINGAWEB2" ] ; then
NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE
<a href='$HAS_ICINGAWEB2/monitoring/host/show?host=$HOSTALIAS'>$HAS_ICINGAWEB2</a>"
<a href='$HAS_ICINGAWEB2/monitoring/host/show?host=$HOSTALIAS'>Icinga Web</a>"
fi fi
## Are we verbose? Then put a message to syslog... ## Are we verbose? Then put a message to syslog...