Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-07-21 22:19:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into doubles-ss_master

Browse source 
# Conflicts:
#	server/database.js
This commit is contained in:
Louis Lam 2023-02-25 17:57:25 +08:00
commit f32d3af62c
92 changed files with 6623 additions and 1875 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server/server.js
View file

@ -677,9 +677,6 @@ let needSetup = false;
throw new Error("Permission denied.");
}
// Reset Prometheus labels
server.monitorList[monitor.id]?.prometheus()?.remove();
bean.name = monitor.name;
bean.type = monitor.type;
bean.url = monitor.url;
@ -732,6 +729,7 @@ let needSetup = false;
bean.radiusCalledStationId = monitor.radiusCalledStationId;
bean.radiusCallingStationId = monitor.radiusCallingStationId;
bean.radiusSecret = monitor.radiusSecret;
bean.httpBodyEncoding = monitor.httpBodyEncoding;
bean.validate();