7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-07 17:01:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key

Browse Source 
# Conflicts:
#	src/lang/en.json
This commit is contained in:
Louis Lam
2023-02-25 00:06:25 +08:00
parent b8720b46c3 e873fea86d
commit ef64077980
59 changed files with 1964 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/server.js
View File

@@ -678,9 +678,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;
@@ -730,6 +727,7 @@ let needSetup = false;
bean.radiusCalledStationId = monitor.radiusCalledStationId;
bean.radiusCallingStationId = monitor.radiusCallingStationId;
bean.radiusSecret = monitor.radiusSecret;
bean.httpBodyEncoding = monitor.httpBodyEncoding;
bean.validate();