Compare commits

...

3 commits

Author SHA1 Message Date
John W Higgins
15c2f7df1d
Merge 02af171ec9 into 4228dd0a29 2024-11-19 00:29:48 +00:00
Ionys
4228dd0a29
Fix the timeout value (#5352)
Some checks failed
validate / validate (push) Has been cancelled
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Auto Test / check-linters (push) Has been cancelled
Auto Test / e2e-test (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
validate / json-yaml-validate (push) Has been cancelled
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20, ARM64) (push) Has been cancelled
Auto Test / auto-test (20, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20, windows-latest) (push) Has been cancelled
2024-11-19 01:29:35 +01:00
John W Higgins
02af171ec9 Fix #2946 - allow push monitors to update prometheus 2024-01-03 13:17:34 -08:00
2 changed files with 11 additions and 4 deletions

View file

@ -645,6 +645,10 @@ class Monitor extends BeanModel {
retries = 0; retries = 0;
log.debug("monitor", `[${this.name}] timeout = ${timeout}`); log.debug("monitor", `[${this.name}] timeout = ${timeout}`);
this.heartbeatInterval = setTimeout(safeBeat, timeout); this.heartbeatInterval = setTimeout(safeBeat, timeout);
bean.status = UP;
this.prometheus?.update(bean, tlsInfo);
return; return;
} }
} else { } else {

View file

@ -1443,12 +1443,15 @@ message HealthCheckResponse {
} }
} }
// Set a default timeout if the monitor type has changed or if it's a new monitor
if (oldType || this.isAdd) {
if (this.monitor.type === "snmp") { if (this.monitor.type === "snmp") {
// snmp is not expected to be executed via the internet => we can choose a lower default timeout // snmp is not expected to be executed via the internet => we can choose a lower default timeout
this.monitor.timeout = 5; this.monitor.timeout = 5;
} else { } else {
this.monitor.timeout = 48; this.monitor.timeout = 48;
} }
}
// Set default SNMP version // Set default SNMP version
if (!this.monitor.snmpVersion) { if (!this.monitor.snmpVersion) {