Skip to content

Commit 203853f

Browse files
committed
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
1 parent a5e58d4 commit 203853f

File tree

9 files changed

+5
-22
lines changed

9 files changed

+5
-22
lines changed

lgsm/modules/alert_discord.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,6 @@ json=$(
4747
"value": "\`${alertip}:${port}\`",
4848
"inline": true
4949
},
50-
{
51-
"name": "Hostname",
52-
"value": "${HOSTNAME}",
53-
"inline": true
54-
},
5550
{
5651
"name": "Server Time",
5752
"value": "$(date)",

lgsm/modules/alert_gotify.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ json=$(
1111
cat << EOF
1212
{
1313
"title": "${alerttitle}",
14-
"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
14+
"message": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\n
1515
EOF
1616
)
1717

lgsm/modules/alert_ifttt.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ json=$(
1212
{
1313
"value1": "${selfname}",
1414
"value2": "${alerttitle}",
15-
"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
15+
"value3": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\n
1616
EOF
1717
)
1818

lgsm/modules/alert_ntfy.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ ${gamename}
4848
Server IP
4949
${alertip}:${port}
5050
51-
Hostname
52-
${HOSTNAME}
53-
5451
Server Time
5552
$(date)"
5653

lgsm/modules/alert_pushbullet.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ json=$(
1313
"channel_tag": "${channeltag}",
1414
"type": "note",
1515
"title": "${alerttitle}",
16-
"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
16+
"body": "Server Name\n${servername}\n\nInformation\n${alertmessage}\n\nGame\n${gamename}\n\nServer IP\n${alertip}:${port}\n\n
1717
EOF
1818
)
1919

lgsm/modules/alert_pushover.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ else
2222
alertpriority="0"
2323
fi
2424

25-
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>"
25+
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>"
2626

2727
if [ -n "${querytype}" ]; then
2828
message+="<b>Is my Game Server Online?</b><br><a href='https://ismygameserver.online/${imgsoquerytype}/${alertip}:${queryport}'>Check here</a><br><br>"

lgsm/modules/alert_rocketchat.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ json=$(
4141
"short": false,
4242
"title": "Server IP",
4343
"value": "\`${alertip}:${port}\`"
44-
},
45-
{
46-
"short": false,
47-
"title": "Hostname",
48-
"value": "${HOSTNAME}"
4944
}
5045
EOF
5146
)

lgsm/modules/alert_slack.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ json=$(
5050
"type": "mrkdwn",
5151
"text": "*Server IP*\n\`${alertip}:${port}\`"
5252
},
53-
{
54-
"type": "mrkdwn",
55-
"text": "*Hostname*\n${HOSTNAME}"
56-
},
5753
{
5854
"type": "mrkdwn",
5955
"text": "*Server Time*\n$(date)"

lgsm/modules/alert_telegram.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ json=$(
1414
"message_thread_id": "${telegramthreadid}",
1515
"parse_mode": "HTML",
1616
"disable_notification": "${telegramdisablenotification}",
17-
"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
17+
"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
1818
EOF
1919
)
2020

0 commit comments

Comments
 (0)