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

Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X

Browse Source 
# Conflicts:
#	package.json
#	server/model/monitor.js
This commit is contained in:
Louis Lam
2023-11-20 14:49:45 +08:00
parent 2aa15ea635 c1aaad0d85
commit 92e0eec6d4
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/model/monitor.js
View File

@@ -21,6 +21,7 @@ const { DockerHost } = require("../docker");
const Gamedig = require("gamedig");
const jsonata = require("jsonata");
const jwt = require("jsonwebtoken");
const crypto = require("crypto");
const { UptimeCalculator } = require("../uptime-calculator");
const rootCertificates = rootCertificatesFingerprints();