Browse Source

Removes Hostname from alert messages

Removes the Hostname field from various alert messages (Discord, Gotify, IFTTT, ntfy, Pushbullet, Pushover, Rocketchat, Slack, Telegram).

The hostname was deemed redundant or unnecessary in the context of these alerts.

Relates to #4696
pull/4854/head
Daniel Gibbs 4 months ago
parent
commit
203853fc85
Failed to extract signature
  1. 5
      lgsm/modules/alert_discord.sh
  2. 2
      lgsm/modules/alert_gotify.sh
  3. 2
      lgsm/modules/alert_ifttt.sh
  4. 3
      lgsm/modules/alert_ntfy.sh
  5. 2
      lgsm/modules/alert_pushbullet.sh
  6. 2
      lgsm/modules/alert_pushover.sh
  7. 5
      lgsm/modules/alert_rocketchat.sh
  8. 4
      lgsm/modules/alert_slack.sh
  9. 2
      lgsm/modules/alert_telegram.sh

5
lgsm/modules/alert_discord.sh

@ -47,11 +47,6 @@ json=$(
"value": "\`${alertip}:${port}\`", "value": "\`${alertip}:${port}\`",
"inline": true "inline": true
}, },
{
"name": "Hostname",
"value": "${HOSTNAME}",
"inline": true
},
{ {
"name": "Server Time", "name": "Server Time",
"value": "$(date)", "value": "$(date)",

2
lgsm/modules/alert_gotify.sh

@ -11,7 +11,7 @@ json=$(
cat << EOF cat << EOF
{ {
"title": "${alerttitle}", "title": "${alerttitle}",
"message": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\n "message": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\n
EOF EOF
) )

2
lgsm/modules/alert_ifttt.sh

@ -12,7 +12,7 @@ json=$(
{ {
"value1": "${selfname}", "value1": "${selfname}",
"value2": "${alerttitle}", "value2": "${alerttitle}",
"value3": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\n "value3": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\n
EOF EOF
) )

3
lgsm/modules/alert_ntfy.sh

@ -48,9 +48,6 @@ ${gamename}
Server IP Server IP
${alertip}:${port} ${alertip}:${port}
Hostname
${HOSTNAME}
Server Time Server Time
$(date)" $(date)"

2
lgsm/modules/alert_pushbullet.sh

@ -13,7 +13,7 @@ json=$(
"channel_tag": "${channeltag}", "channel_tag": "${channeltag}",
"type": "note", "type": "note",
"title": "${alerttitle}", "title": "${alerttitle}",
"body": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\nHostname\n${HOSTNAME}\n\n "body": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\n
EOF EOF
) )

2
lgsm/modules/alert_pushover.sh

@ -22,7 +22,7 @@ else
alertpriority="0" alertpriority="0"
fi fi
message=" <b>Server Name</b><br>${servername}<br><br><b>Information</b><br>${alertmessage}<br><br><b>Game</b><br>${gamename}<br><br><b>Server IP</b><br>${alertip}:${port}<br><br><b>Hostname</b><br>${HOSTNAME}<br><br>" message=" <b>Server Name</b><br>${servername}<br><br><b>Information</b><br>${alertmessage}<br><br><b>Game</b><br>${gamename}<br><br><b>Server IP</b><br>${alertip}:${port}<br><br>"
if [ -n "${querytype}" ]; then if [ -n "${querytype}" ]; then
message+="<b>Is my Game Server Online?</b><br><a href='https://ismygameserver.online/${imgsoquerytype}/${alertip}:${queryport}'>Check here</a><br><br>" message+="<b>Is my Game Server Online?</b><br><a href='https://ismygameserver.online/${imgsoquerytype}/${alertip}:${queryport}'>Check here</a><br><br>"

5
lgsm/modules/alert_rocketchat.sh

@ -41,11 +41,6 @@ json=$(
"short": false, "short": false,
"title": "Server IP", "title": "Server IP",
"value": "\`${alertip}:${port}\`" "value": "\`${alertip}:${port}\`"
},
{
"short": false,
"title": "Hostname",
"value": "${HOSTNAME}"
} }
EOF EOF
) )

4
lgsm/modules/alert_slack.sh

@ -50,10 +50,6 @@ json=$(
"type": "mrkdwn", "type": "mrkdwn",
"text": "*Server IP*\n\`${alertip}:${port}\`" "text": "*Server IP*\n\`${alertip}:${port}\`"
}, },
{
"type": "mrkdwn",
"text": "*Hostname*\n${HOSTNAME}"
},
{ {
"type": "mrkdwn", "type": "mrkdwn",
"text": "*Server Time*\n$(date)" "text": "*Server Time*\n$(date)"

2
lgsm/modules/alert_telegram.sh

@ -14,7 +14,7 @@ json=$(
"message_thread_id": "${telegramthreadid}", "message_thread_id": "${telegramthreadid}",
"parse_mode": "HTML", "parse_mode": "HTML",
"disable_notification": "${telegramdisablenotification}", "disable_notification": "${telegramdisablenotification}",
"text": "<b>${alerttitle}</b>\n\n<b>Server Name</b>\n${servername}\n\n<b>Information</b>\n${alertmessage}\n\n<b>Game</b>\n${gamename}\n\n<b>Server IP</b>\n${alertip}:${port}\n\n<b>Hostname</b>\n${HOSTNAME}\n\n "text": "<b>${alerttitle}</b>\n\n<b>Server Name</b>\n${servername}\n\n<b>Information</b>\n${alertmessage}\n\n<b>Game</b>\n${gamename}\n\n<b>Server IP</b>\n${alertip}:${port}\n\n
EOF EOF
) )

Loading…
Cancel
Save