self-hosted/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-12-01 23:11:35 +02:00
Code Issues Actions 5 Releases Activity

feat: structured logging (JSON) (#5118)
Some checks failed
Merge Conflict Labeler / Labeling (push) Has been skipped
Details
json-yaml-validate / json-yaml-validate (push) Successful in 12s
Details
Auto Test / check-linters (push) Failing after 22m10s
Details
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Details
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Details
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Details
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Details
Auto Test / auto-test (20.5, ARM64) (push) Has been cancelled
Details
Auto Test / auto-test (20.5, macos-latest) (push) Has been cancelled
Details
Auto Test / auto-test (20.5, ubuntu-latest) (push) Has been cancelled
Details
Auto Test / auto-test (20.5, windows-latest) (push) Has been cancelled
Details
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Details
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Details
Auto Test / e2e-test (push) Has been cancelled
Details
Automatically close stale issues / stale (push) Successful in 16s
Details
CodeQL / Analyze (go) (push) Failing after 56s
Details
CodeQL / Analyze (javascript-typescript) (push) Failing after 27s
Details

Browse Source
This commit is contained in:
Cassandra
2024-09-24 11:51:21 +02:00
committed by GitHub
parent dd75890364
commit b287a25de7
27 changed files with 186 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/model/monitor.js
View File

@@ -4,7 +4,7 @@ const { Prometheus } = require("../prometheus");
const { log, UP, DOWN, PENDING, MAINTENANCE, flipStatus, MAX_INTERVAL_SECOND, MIN_INTERVAL_SECOND,
SQL_DATETIME_FORMAT, evaluateJsonQuery
} = require("../../src/util");
const { tcping, ping, checkCertificate, checkStatusCode, getTotalClientInRoom, setting, mssqlQuery, postgresQuery, mysqlQuery, setSetting, httpNtlm, radius, grpcQuery,
const { tcping, ping, checkCertificate, checkStatusCode, getTotalClientInRoom, mssqlQuery, postgresQuery, mysqlQuery, httpNtlm, radius, grpcQuery,
redisPingAsync, kafkaProducerAsync, getOidcTokenClientCredentials, rootCertificatesFingerprints, axiosAbortSignal
} = require("../util-server");
const { R } = require("redbean-node");
@@ -24,6 +24,7 @@ const { CookieJar } = require("tough-cookie");
const { HttpsCookieAgent } = require("http-cookie-agent/http");
const https = require("https");
const http = require("http");
const { Settings } = require("../settings");
const rootCertificates = rootCertificatesFingerprints();
@@ -672,7 +673,7 @@ class Monitor extends BeanModel {
} else if (this.type === "steam") {
const steamApiUrl = "https://api.steampowered.com/IGameServersService/GetServerList/v1/";
const steamAPIKey = await setting("steamAPIKey");
const steamAPIKey = await Settings.get("steamAPIKey");
const filter = `addr\\${this.hostname}:${this.port}`;
if (!steamAPIKey) {
@@ -1379,11 +1380,12 @@ class Monitor extends BeanModel {
return;
}
let notifyDays = await setting("tlsExpiryNotifyDays");
let notifyDays = await Settings.get("tlsExpiryNotifyDays");
if (notifyDays == null || !Array.isArray(notifyDays)) {
// Reset Default
await setSetting("tlsExpiryNotifyDays", [ 7, 14, 21 ], "general");
await Settings.set("tlsExpiryNotifyDays", [ 7, 14, 21 ], "general");
notifyDays = [ 7, 14, 21 ];
await Settings.set("tlsExpiryNotifyDays", notifyDays, "general");
}
if (Array.isArray(notifyDays)) {