Infra-Mirrors/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-04-20 15:46:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

inline ping validation constants

Browse Source
This commit is contained in:
filippolauria 2025-03-06 16:32:20 +01:00
parent f275d5611b
commit d12a0b3178
3 changed files with 22 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/model/monitor.js
View File

@ -2,8 +2,11 @@ const dayjs = require("dayjs");
const axios = require("axios");
const { Prometheus } = require("../prometheus");
const { log, UP, DOWN, PENDING, MAINTENANCE, flipStatus, MAX_INTERVAL_SECOND, MIN_INTERVAL_SECOND,
SQL_DATETIME_FORMAT, evaluateJsonQuery, PING_PACKET_SIZE_MIN, PING_PACKET_SIZE_MAX,
PING_DEADLINE_MIN, PING_DEADLINE_MAX, PING_COUNT_MIN, PING_COUNT_MAX, PING_TIMEOUT_MIN, PING_TIMEOUT_MAX
SQL_DATETIME_FORMAT, evaluateJsonQuery,
PING_PACKET_SIZE_MIN, PING_PACKET_SIZE_MAX, PING_PACKET_SIZE_DEFAULT,
PING_DEADLINE_MIN, PING_DEADLINE_MAX, PING_DEADLINE_DEFAULT,
PING_COUNT_MIN, PING_COUNT_MAX, PING_COUNT_DEFAULT,
PING_TIMEOUT_MIN, PING_TIMEOUT_MAX, PING_TIMEOUT_DEFAULT
} = require("../../src/util");
const { tcping, ping, checkCertificate, checkStatusCode, getTotalClientInRoom, setting, mssqlQuery, postgresQuery, mysqlQuery, setSetting, httpNtlm, radius, grpcQuery,
redisPingAsync, kafkaProducerAsync, getOidcTokenClientCredentials, rootCertificatesFingerprints, axiosAbortSignal
@ -1517,19 +1520,19 @@ class Monitor extends BeanModel {
}
if (this.packetSize && (this.packetSize < PING_PACKET_SIZE_MIN || this.packetSize > PING_PACKET_SIZE_MAX)) {
throw new Error(`Packet size must be between ${PING_PACKET_SIZE_MIN} and ${PING_PACKET_SIZE_MAX}`);
throw new Error(`Packet size must be between ${PING_PACKET_SIZE_MIN} and ${PING_PACKET_SIZE_MAX} (default: ${PING_PACKET_SIZE_DEFAULT})`);
}
if (this.ping_deadline && (this.ping_deadline < PING_DEADLINE_MIN || this.ping_deadline > PING_DEADLINE_MAX)) {
throw new Error(`Deadline must be between ${PING_DEADLINE_MIN} and ${PING_DEADLINE_MAX} seconds`);
throw new Error(`Deadline must be between ${PING_DEADLINE_MIN} and ${PING_DEADLINE_MAX} seconds (default: ${PING_DEADLINE_DEFAULT})`);
}
if (this.ping_count && (this.ping_count < PING_COUNT_MIN || this.ping_count > PING_COUNT_MAX)) {
throw new Error(`Echo requests count must be between ${PING_COUNT_MIN} and ${PING_COUNT_MAX}`);
throw new Error(`Echo requests count must be between ${PING_COUNT_MIN} and ${PING_COUNT_MAX} (default: ${PING_COUNT_DEFAULT})`);
}
if (this.ping_timeout && (this.ping_timeout < PING_TIMEOUT_MIN || this.ping_timeout > PING_TIMEOUT_MAX)) {
throw new Error(`Timeout must be between ${PING_TIMEOUT_MIN} and ${PING_TIMEOUT_MAX} seconds`);
throw new Error(`Timeout must be between ${PING_TIMEOUT_MIN} and ${PING_TIMEOUT_MAX} seconds (default: ${PING_TIMEOUT_DEFAULT})`);
}
}

36
src/pages/EditMonitor.vue
View File

@ -663,7 +663,7 @@
<!-- Max Packets / Count -->
<div v-if="monitor.type === 'ping'" class="my-3">
<label for="ping-count" class="form-label">{{ $t("pingCountLabel") }}</label>
<input id="ping-count" v-model="monitor.ping_count" type="number" class="form-control" required :min="ping_count_min" :max="ping_count_max" step="1">
<input id="ping-count" v-model="monitor.ping_count" type="number" class="form-control" required min="1" max="100" step="1">
<div class="form-text">
{{ $t("pingCountDescription") }}
</div>
@ -683,13 +683,13 @@
<!-- Packet size -->
<div v-if="monitor.type === 'ping'" class="my-3">
<label for="packet-size" class="form-label">{{ $t("Packet Size") }}</label>
<input id="packet-size" v-model="monitor.packetSize" type="number" class="form-control" required :min="packetSize_min" :max="packetSize_max" step="1">
<input id="packet-size" v-model="monitor.packetSize" type="number" class="form-control" required min="1" :max="65500" step="1">
</div>
<!-- Max Duration / Deadline -->
<div v-if="monitor.type === 'ping'" class="my-3">
<label for="ping_deadline" class="form-label">{{ $t("pingDeadlineLabel") }}</label>
<input id="ping_deadline" v-model="monitor.ping_deadline" type="number" class="form-control" required :min="ping_deadline_min" :max="ping_deadline_max" step="1">
<input id="ping_deadline" v-model="monitor.ping_deadline" type="number" class="form-control" required min="0" max="300" step="1">
<div class="form-text">
{{ $t("pingDeadlineDescription") }}
</div>
@ -698,7 +698,7 @@
<!-- Response Timeout -->
<div v-if="monitor.type === 'ping'" class="my-3">
<label for="ping_timeout" class="form-label">{{ $t("pingTimeoutLabel") }}</label>
<input id="ping_timeout" v-model="monitor.ping_timeout" type="number" class="form-control" required :min="ping_timeout_min" :max="ping_timeout_max" step="1">
<input id="ping_timeout" v-model="monitor.ping_timeout" type="number" class="form-control" required min="1" max="60" step="1">
<div class="form-text">
{{ $t("pingTimeoutDescription") }}
</div>
@ -1104,18 +1104,6 @@ import {
MAX_INTERVAL_SECOND,
MIN_INTERVAL_SECOND,
sleep,
PING_PACKET_SIZE_MIN,
PING_PACKET_SIZE_MAX,
PING_PACKET_SIZE_DEFAULT,
PING_DEADLINE_MIN,
PING_DEADLINE_MAX,
PING_DEADLINE_DEFAULT,
PING_COUNT_MIN,
PING_COUNT_MAX,
PING_COUNT_DEFAULT,
PING_TIMEOUT_MIN,
PING_TIMEOUT_MAX,
PING_TIMEOUT_DEFAULT
} from "../util.ts";
import { hostNameRegexPattern } from "../util-frontend";
import HiddenInput from "../components/HiddenInput.vue";
@ -1188,14 +1176,6 @@ export default {
return {
minInterval: MIN_INTERVAL_SECOND,
maxInterval: MAX_INTERVAL_SECOND,
ping_count_min: PING_COUNT_MIN,
ping_count_max: PING_COUNT_MAX,
packetSize_min: PING_PACKET_SIZE_MIN,
packetSize_max: PING_PACKET_SIZE_MAX,
ping_deadline_min: PING_DEADLINE_MIN,
ping_deadline_max: PING_DEADLINE_MAX,
ping_timeout_min: PING_TIMEOUT_MIN,
ping_timeout_max: PING_TIMEOUT_MAX,
processing: false,
monitor: {
notificationIDList: {},
@ -1628,11 +1608,11 @@ message HealthCheckResponse {
this.monitor = {
...monitorDefaults,
ping_count: PING_COUNT_DEFAULT,
ping_count: 3,
ping_numeric: true,
packetSize: PING_PACKET_SIZE_DEFAULT,
ping_deadline: PING_DEADLINE_DEFAULT,
ping_timeout: PING_TIMEOUT_DEFAULT,
packetSize: 56,
ping_deadline: 10,
ping_timeout: 2,
};
if (this.$root.proxyList && !this.monitor.proxyId) {

10
src/util.js
View File

@ -55,15 +55,15 @@ exports.MIN_INTERVAL_SECOND = 20;
exports.PING_PACKET_SIZE_MIN = 1;
exports.PING_PACKET_SIZE_MAX = 65500;
exports.PING_PACKET_SIZE_DEFAULT = 56;
exports.PING_DEADLINE_MIN = 0;
exports.PING_DEADLINE_MIN = 1;
exports.PING_DEADLINE_MAX = 300;
exports.PING_DEADLINE_DEFAULT = 0;
exports.PING_DEADLINE_DEFAULT = 10;
exports.PING_COUNT_MIN = 1;
exports.PING_COUNT_MAX = 100;
exports.PING_COUNT_DEFAULT = 3;
exports.PING_TIMEOUT_MIN_TIMEOU = 0;
exports.PING_COUNT_DEFAULT = 1;
exports.PING_TIMEOUT_MIN = 1;
exports.PING_TIMEOUT_MAX = 60;
exports.PING_TIMEOUT_DEFAULT = 0;
exports.PING_TIMEOUT_DEFAULT = 2;
exports.CONSOLE_STYLE_Reset = "\x1b[0m";
exports.CONSOLE_STYLE_Bright = "\x1b[1m";
exports.CONSOLE_STYLE_Dim = "\x1b[2m";