Commit Graph

5191 Commits

Author SHA1 Message Date
Matt Visnovsky
e2e81091c3 Helpful error when query returns object or array 2024-06-10 12:49:41 -06:00
Matt Visnovsky
82352910bf Fix: Cast to string then eval 2024-06-10 12:25:55 -06:00
Matt Visnovsky
23f844d871 Error handling robustness
Cleanup of some things I missed yesterday...
2024-06-07 16:35:06 -06:00
Matt Visnovsky
fdc145bffd Added Robustness
There are a lot of changes here:
-Fixed a lot of issues encountered during my testing
-JSON path is evaluated BEFORE making comparisons (this was the true intended behavior by @chakflying)
-Variable name changes (cosmetic)
-Added != operator
-Changed jsonQueryDescription (again)
2024-06-06 18:52:33 -06:00
Matt Visnovsky
eaa935cba0 Also return result of the evaluation
-Maximum compatibility with @chakflying's existing json-query monitor code.
2024-06-06 10:09:35 -06:00
Matt Visnovsky
10d3188dd3 Query json directly rather than with $.value
-This is less abstract
-Maximum compatibility with @chakflying's existing json-query monitor code.
2024-06-06 10:08:07 -06:00
Matt Visnovsky
36dc94b8f2 Better type handling 2024-06-06 10:04:20 -06:00
Matt Visnovsky
efb1642e3c Blend json-query and snmp monitors
Utilizes the JSON Query library to handle comparison logic.
2024-06-05 16:09:53 -06:00
Matt Visnovsky
2d2c1866df Fix: a typo 2024-06-05 15:40:07 -06:00
Matt Visnovsky
b2d76bc60a Refactor line for conciseness 2024-06-05 15:39:55 -06:00
Matt Visnovsky
7eee5db4d2 Variable changes
-Reuse expected_value for snmpControlValue
-Create jsonPathOperator for snmpCondition
2024-06-05 15:37:47 -06:00
Matt Visnovsky
d25ee8f128 Using JSON Query Expressions
Equivalent functionality as before, but we're now building json-query expressions for the user.
2024-05-10 10:56:38 -06:00
Matt Visnovsky
c4759948ec Fix ES Lint 2024-05-08 11:00:18 -06:00
Matt Visnovsky
1c4740748c Re-use monitor.radiusPassword for community string 2024-05-08 11:00:10 -06:00
Matt Visnovsky
da8f0d1c31
Apply suggestions from code review
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-05-08 10:06:20 -06:00
Matt Visnovsky
8b4b27f359 Final cleanup of changes to EditMonitor.vue
Reverts unintentional changes committed in: d92003e172
2024-05-07 10:05:36 -06:00
Matt Visnovsky
2015142b00 Maybe don't helptext all the things...
Addresses https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589866321
2024-05-07 09:23:23 -06:00
Matt Visnovsky
e5fb726160 Missed changes leftover from removal of getKey() 2024-05-07 09:16:23 -06:00
Matt Visnovsky
2b5d100cd3 Ensure SNMP session is closed properly
Addresses https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589858252

Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
2024-05-06 15:56:41 -06:00
Matt Visnovsky
f4842ead68 Translation key for OID 2024-05-06 15:38:14 -06:00
Matt Visnovsky
56e7fa8bd5 Helptext ALL THE THINGS 2024-05-06 14:33:48 -06:00
Matt Visnovsky
19f21a9a39 SNMP OID helptext 2024-05-06 14:19:33 -06:00
Matt Visnovsky
4ef66b3760 SNMP version helptext 2024-05-06 14:17:46 -06:00
Matt Visnovsky
e9b52eb0e7 Separate error cases for SNMP varbind returns 2024-05-06 14:06:40 -06:00
Matt Visnovsky
c68b1c6274 Remove unnecessary func getKey 2024-05-06 12:05:12 -06:00
Matt Visnovsky
6037912085 Consistent placeholder text
Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
2024-05-06 09:58:39 -06:00
Matt Visnovsky
433e317eee Simplify error catch
Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
2024-05-06 09:57:13 -06:00
Matt Visnovsky
1fe1bb5864 Given that above throws, the else case is not nessesary
Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
2024-05-06 09:53:14 -06:00
Matt Visnovsky
997791bc78 Default: invalid condition error
Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
2024-05-06 09:51:37 -06:00
Matt Visnovsky
0384b34007 Remove unnecessary func getKey
Addresses:
- https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589856311
- https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589862733
2024-05-06 09:49:36 -06:00
Matt Visnovsky
86b997c664 Limit to <= SNMPv2c for now 2024-05-06 09:47:51 -06:00
Matt Visnovsky
0280b2ad3f A comment about varbinds[0] for clarification
Addresses https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589855126
2024-05-06 09:21:49 -06:00
Matt Visnovsky
4386d0afad Apply suggestions from code review
Addresses:
-https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589805237
-https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589806199
-https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589853470
-https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589854032
2024-05-05 15:47:43 -06:00
Matt Visnovsky
9053b48030
Merge branch 'louislam:master' into snmp-monitor 2024-05-03 16:13:40 -06:00
Matt Visnovsky
407f7291b0 New dependency for net-snmp 2024-05-03 11:58:03 -06:00
Matt Visnovsky
09fd816aae Updated code comments 2024-05-03 11:52:02 -06:00
Matt Visnovsky
c87ac2f043 Move getKey() to util.ts 2024-05-03 11:39:14 -06:00
Matt Visnovsky
8e56a81ef1 Refactor how strings/numerics are parsed
Fixes issue `toString() radix argument must be between 2 and 36` due to `.toString("ascii")` conversion. This issue was introduced in 704ffd3f4b.
2024-05-02 15:11:03 -06:00
Matt Visnovsky
f059d54349 Use frontend timeout
Addresses https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1585616669
2024-05-02 15:07:22 -06:00
Matt Visnovsky
d83c2b90c9 Revert unintentional changes to EditMonitor.vue
Reverts unintentional changes committed in: d92003e172
2024-05-02 09:50:09 -06:00
Frank Elsinga
dbbc79a05a
Fixed a typo introduced in #3836 (#4729)
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
2024-05-02 12:11:49 +08:00
Matt Visnovsky
4699a1ccd8 ES Lint Compliant
Also changed line endings from 'LF' to 'CRLF'
2024-05-01 10:29:13 -06:00
Matt Visnovsky
ba84f01444 Delete .EditMonitor.vue.swp
Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
2024-05-01 09:15:35 -06:00
Matt Visnovsky
9ba0f68a86 Remove supurfluous log.debug
Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
2024-04-30 18:19:18 -06:00
Matt Visnovsky
97a9094d7c ES Lint Compliant 2024-04-30 18:14:58 -06:00
Matt Visnovsky
e944492da8 Corrected down function
b4bd003626 (r1585590243)
2024-04-30 18:06:03 -06:00
Matt Visnovsky
7459654e11 ES Lint Compliant 2024-04-30 18:04:59 -06:00
Matt Visnovsky
ba47aca51f
Apply suggestions from code review
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-04-30 17:54:29 -06:00
Frank Elsinga
b4bd003626
Merge branch 'master' into snmp-monitor 2024-05-01 00:01:03 +02:00
Matt Visnovsky
704ffd3f4b Finalized SNMP monitor 2024-04-30 15:18:25 -06:00