gsd
/
LinuxGSM
mirror of https://github.com/GameServerManagers/LinuxGSM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

escaped_servername is now standard

pull/3051/head
Daniel Gibbs 5 years ago
parent
09ee2df119
commit
12b0443beb
8 changed files with 66 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      lgsm/functions/alert.sh
  2. 3
      lgsm/functions/alert_discord.sh
  3. 2
      lgsm/functions/alert_ifttt.sh
  4. 2
      lgsm/functions/alert_pushbullet.sh
  5. 2
      lgsm/functions/alert_pushover.sh
  6. 4
      lgsm/functions/alert_rocketchat.sh
  7. 98
      lgsm/functions/alert_slack.sh
  8. 5
      lgsm/functions/alert_telegram.sh

11
lgsm/functions/alert.sh
View File

@ -7,9 +7,6 @@
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
fn_alert_log(){
info_distro.sh
info_config.sh
info_messages.sh
if [ -f "${alertlog}" ]; then
rm -f "${alertlog:?}"
fi
@ -78,6 +75,14 @@ fn_alert_config(){
alertbody="${selfname} has received a new _default.cfg. Check file for changes."
}
info_distro.sh
info_config.sh
info_messages.sh
# JSON-safe escaping string. - use this is json based alerts
escaped_servername=$(echo -n "${servername}" | jq -sRr "@json")
escaped_alertbody=$(echo -n "${alertbody}" | jq -sRr "@json")
if [ "${alert}" == "permissions" ]; then
fn_alert_permissions
elif [ "${alert}" == "restart" ]; then

3
lgsm/functions/alert_discord.sh
View File

@ -12,9 +12,6 @@ if ! command -v jq > /dev/null; then
fn_script_log_fatal "Sending Discord alert: jq is missing."
fi
escaped_servername=$(echo -n "${servername}" | jq -sRr "@json")
escaped_alertbody=$(echo -n "${alertbody}" | jq -sRr "@json")
json=$(cat <<EOF
{
"username":"LinuxGSM",

2
lgsm/functions/alert_ifttt.sh
View File

@ -10,7 +10,7 @@ json=$(cat <<EOF
{
"value1": "${selfname}",
"value2": "${alertemoji} ${alertsubject} ${alertemoji}",
"value3": "Message: \n${alertbody}\n\nGame: \n${gamename}\n\nServer name: \n${servername}\n\nHostname: \n${HOSTNAME}\n\nServer IP: \n${alertip}:${port}\n\nMore info: \n${alerturl}"
"value3": "Message: \n${escaped_alertbody}\n\nGame: \n${gamename}\n\nServer name: \n${escaped_servername}\n\nHostname: \n${HOSTNAME}\n\nServer IP: \n${alertip}:${port}\n\nMore info: \n${alerturl}"
}
EOF
)

2
lgsm/functions/alert_pushbullet.sh
View File

@ -11,7 +11,7 @@ json=$(cat <<EOF
"channel_tag": "${channeltag}",
"type": "note",
"title": "${alertemoji} ${alertsubject} ${alertemoji}",
"body": "Message\n${alertbody}\n\nGame\n${gamename}\n\nServer name\n${servername}\n\nHostname\n${HOSTNAME}\n\nServer IP\n${alertip}:${port}\n\nMore info\n${alerturl}"
"body": "Message\n${escaped_alertbody}\n\nGame\n${gamename}\n\nServer name\n${escaped_servername}\n\nHostname\n${HOSTNAME}\n\nServer IP\n${alertip}:${port}\n\nMore info\n${alerturl}"
}
EOF
)

2
lgsm/functions/alert_pushover.sh
View File

@ -21,7 +21,7 @@ else
alertpriority="0"
fi
pushoversend=$(curl -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}" -F priority="${alertpriority}" -F title="${alertemoji} ${alertsubject} ${alertemoji}" -F message=" <b>Message</b><br>${alertbody}<br><br><b>Game</b><br>${gamename}<br><br><b>Server name</b><br>${servername}<br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a><br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
pushoversend=$(curl -sS -F token="${pushovertoken}" -F user="${pushoveruserkey}" -F html="1" -F sound="${alertsound}" -F priority="${alertpriority}" -F title="${alertemoji} ${alertsubject} ${alertemoji}" -F message=" <b>Message</b><br>${escaped_alertbody}<br><br><b>Game</b><br>${escaped_gamename}<br><br><b>Server name</b><br>${servername}<br><br><b>Hostname</b><br>${HOSTNAME}<br><br><b>Server IP</b><br><a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a><br><br><b>More info</b><br><a href='${alerturl}'>${alerturl}</a>" "https://api.pushover.net/1/messages.json" | grep errors)
if [ "${pushoversend}" ]; then
fn_print_fail_nl "Sending Pushover alert: ${pushoversend}"

4
lgsm/functions/alert_rocketchat.sh
View File

@ -14,7 +14,7 @@ fi
json=$(cat <<EOF
{
"alias":"LinuxGSM",
"text":"*${alertemoji} ${alertsubject} ${alertemoji}* + \n ${alertbody}",
"text":"*${alertemoji} ${alertsubject} ${alertemoji}* + \n ${escaped_alertbody}",
"attachments":[
{
"title":"Linuxgsm Alert",
@ -34,7 +34,7 @@ json=$(cat <<EOF
{
"short":true,
"title":"Server Name:",
"value":"${servername}"
"value":"${escaped_servername}"
}
]
}

98
lgsm/functions/alert_slack.sh
View File

@ -13,54 +13,54 @@ fi
json=$(cat <<EOF
{
"attachments": [
{
"color": "#36a64f",
"blocks": [
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*LinuxGSM Alert*"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*${alertemoji} ${alertsubject}* \n ${alertbody}"
}
},
{
"type": "divider"
},
{
"type": "section",
"fields": [
{
"type": "mrkdwn",
"text": "*Game:* \n ${gamename}"
},
{
"type": "mrkdwn",
"text": "*Server IP:* \n ${alertip}:${port}"
},
{
"type": "mrkdwn",
"text": "*Server Name:* \n ${servername}"
}
]
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "Hostname: ${HOSTNAME} / More info: ${alerturl}"
}
}
]
}
]
"attachments": [
{
"color": "#36a64f",
"blocks": [
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*LinuxGSM Alert*"
}
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*${alertemoji} ${alertsubject} ${alertemoji}* \n ${escaped_alertbody}"
}
},
{
"type": "divider"
},
{
"type": "section",
"fields": [
{
"type": "mrkdwn",
"text": "*Game:* \n ${gamename}"
},
{
"type": "mrkdwn",
"text": "*Server IP:* \n ${alertip}:${port}"
},
{
"type": "mrkdwn",
"text": "*Server Name:* \n ${escaped_servername}"
}
]
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "Hostname: ${HOSTNAME} / More info: ${alerturl}"
}
}
]
}
]
}
EOF
)
@ -73,6 +73,6 @@ if [ "${slacksend}" == "ok" ]; then
fn_print_ok_nl "Sending Slack alert"
fn_script_log_pass "Sending Slack alert"
else
fn_print_fail_nl "Sending Slack alert: ${slacksend}"
fn_print_fail_nl "Sending Slack alert: ${slacksend}"
fn_script_log_fatal "Sending Slack alert: ${slacksend}"
fi

5
lgsm/functions/alert_telegram.sh
View File

@ -6,11 +6,14 @@
functionselfname="$(basename "$(readlink -f "${BASH_SOURCE[0]}")")"
escaped_servername=$(echo -n "${servername}" | jq -sRr "@json")
escaped_alertbody=$(echo -n "${alertbody}" | jq -sRr "@json")
json=$(cat <<EOF
{
"chat_id": "${telegramchatid}",
"parse_mode": "HTML",
"text": "<b>${alertemoji} ${alertsubject} ${alertemoji}</b>\n\n<b>Message</b>\n${alertbody}\n\n<b>Game</b>\n${gamename}\n\n<b>Server name</b>\n${servername}\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
"text": "<b>${alertemoji} ${alertsubject} ${alertemoji}</b>\n\n<b>Message</b>\n${escaped_alertbody}\n\n<b>Game</b>\n${gamename}\n\n<b>Server name</b>\n${escaped_servername}\n\n<b>Hostname</b>\n${HOSTNAME}\n\n<b>Server IP</b>\n<a href='https://www.gametracker.com/server_info/${alertip}:${port}'>${alertip}:${port}</a>\n\n<b>More info</b>\n<a href='${alerturl}'>${alerturl}</a>",
"disable_web_page_preview": "yes",
EOF
)

Write Preview
Loading…
Cancel
Save