TyleoDvDelaware3217/Kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-06-01 11:22:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into smseagle

Browse source
This commit is contained in:
Frank Elsinga 2025-04-27 18:30:42 +02:00 • committed by GitHub
commit ff6994b2b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server/model/monitor.js
View file

@ -1294,7 +1294,8 @@ class Monitor extends BeanModel {
try { try {
const heartbeatJSON = bean.toJSON(); const heartbeatJSON = bean.toJSON();
const monitorData = [{ id: monitor.id, const monitorData = [{ id: monitor.id,
active: monitor.active active: monitor.active,
name: monitor.name
}]; }];
const preloadData = await Monitor.preparePreloadData(monitorData); const preloadData = await Monitor.preparePreloadData(monitorData);
// Prevent if the msg is undefined, notifications such as Discord cannot send out. // Prevent if the msg is undefined, notifications such as Discord cannot send out.

2
server/notification-providers/mattermost.js
View file

@ -79,13 +79,11 @@ class Mattermost extends NotificationProvider {
fallback: fallback:
"Your " + "Your " +
monitorJSON.pathName + monitorJSON.pathName +
monitorJSON.name +
" service went " + " service went " +
statusText, statusText,
color: color, color: color,
title: title:
monitorJSON.pathName + monitorJSON.pathName +
monitorJSON.name +
" service went " + " service went " +
statusText, statusText,
title_link: monitorJSON.url, title_link: monitorJSON.url,