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

Variable changes

Browse Source 
-Reuse expected_value for snmpControlValue
-Create jsonPathOperator for snmpCondition
This commit is contained in:
Matt Visnovsky
2024-06-05 15:37:47 -06:00
parent d25ee8f128
commit 7eee5db4d2
5 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/model/monitor.js
View File

@@ -162,8 +162,7 @@ class Monitor extends BeanModel {
screenshot,
remote_browser: this.remote_browser,
snmpOid: this.snmpOid,
snmpCondition: this.snmpCondition,
snmpControlValue: this.snmpControlValue,
jsonPathOperator: this.jsonPathOperator,
snmpVersion: this.snmpVersion,
};

16
server/monitor-types/snmp.js
View File

@@ -50,16 +50,16 @@ class SNMPMonitorType extends MonitorType {
const value = varbinds[0].value;
// Check if inputs are numeric. If not, re-parse as strings. This ensures comparisons are handled correctly.
let snmpValue = isNaN(value) ? value.toString() : parseFloat(value);
let snmpControlValue = isNaN(monitor.snmpControlValue) ? monitor.snmpControlValue.toString() : parseFloat(monitor.snmpControlValue);
const expectedValue = isNaN(monitor.expectedValue) ? monitor.expectedValue.toString() : parseFloat(monitor.expectedValue);
let snmpResponse = isNaN(value) ? value.toString() : parseFloat(value);
let jsonQueryExpression;
switch (monitor.snmpCondition) {
switch (monitor.jsonPathOperator) {
case ">":
case ">=":
case "<":
case "<=":
jsonQueryExpression = `$.value ${monitor.snmpCondition} $.control`;
jsonQueryExpression = `$.value ${monitor.jsonPathOperator} $.control`;
break;
case "==":
jsonQueryExpression = "$string($.value) = $string($.control)";
@@ -68,13 +68,13 @@ class SNMPMonitorType extends MonitorType {
jsonQueryExpression = "$contains($string($.value), $string($.control))";
break;
default:
throw new Error(`Invalid condition ${monitor.snmpCondition}`);
throw new Error(`Invalid condition ${monitor.jsonPathOperator}`);
}
const expression = jsonata(jsonQueryExpression);
const result = await expression.evaluate({
value: snmpValue,
control: monitor.snmpControlValue
const evaluation = await expression.evaluate({
value: snmpResponse,
control: expectedValue
});
heartbeat.status = result ? UP : DOWN;
heartbeat.msg = `SNMP value ${result ? "passes" : "does not pass"} comparison: ${snmpValue} ${monitor.snmpCondition} ${snmpControlValue}`;

3
server/server.js
View File

@@ -832,8 +832,7 @@ let needSetup = false;
bean.remote_browser = monitor.remote_browser;
bean.snmpVersion = monitor.snmpVersion;
bean.snmpOid = monitor.snmpOid;
bean.snmpCondition = monitor.snmpCondition;
bean.snmpControlValue = monitor.snmpControlValue;
bean.jsonPathOperator = monitor.jsonPathOperator;
bean.timeout = monitor.timeout;
bean.validate();