Frank Elsinga
71f9384c09
Merge branch 'master' into snmp-monitor
2024-07-15 21:57:12 +02:00
Louis Lam
dc15443716
Revert "Fix: Use retryInterval when a monitor is DOWN" ( #4875 )
2024-06-23 23:46:52 +08:00
Frank Elsinga
248aec8803
Formtting fix
2024-06-12 23:24:01 +02:00
Matt Visnovsky
b5a73e5ad7
Apply suggestions from code review
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-06-12 14:25:25 -06:00
Frank Elsinga
5dc4bb64d5
Merge branch 'master' into snmp-monitor
2024-06-12 19:55:31 +02: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
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
7eee5db4d2
Variable changes
...
-Reuse expected_value for snmpControlValue
-Create jsonPathOperator for snmpCondition
2024-06-05 15:37:47 -06:00
Frank Elsinga
10ebdcacaa
Fix: Use retryInterval when a monitor is DOWN ( #4476 )
2024-06-03 21:47:43 +02:00
HdroguettA
daca38a554
Ignore TLS/SSL error for Redis ( #3878 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-05-19 23:34:01 +02:00
Sebastian Lang
a3ac954140
Add support for custom mongodb commands ( #4445 )
...
Co-authored-by: Sebastian Lang <sebastian.lang@damovo.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-05-19 21:59:57 +02:00
Matt Visnovsky
1c4740748c
Re-use monitor.radiusPassword for community string
2024-05-08 11:00:10 -06:00
Frank Elsinga
b4bd003626
Merge branch 'master' into snmp-monitor
2024-05-01 00:01:03 +02:00
Matt Visnovsky
9d28fcff1a
Update bean model backend
...
Updates appropriate values async when editing the SNMP monitor
2024-04-30 15:13:16 -06:00
Louis Lam
1d091739c8
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2024-04-26 15:01:03 +08:00
Louis Lam
c0db036187
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2024-04-25 23:45:24 +08:00
Louis Lam
63a380326d
Merge branch '1.23.X' into 1.23.13-to-2.0.0
...
# Conflicts:
# .github/workflows/auto-test.yml
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/monitor-types/real-browser-monitor-type.js
# server/util-server.js
# test/cypress/unit/i18n.spec.js
2024-04-25 15:42:53 +08:00
Nelson Chan
1490443618
Fix: Getting TLS certificate through proxy & prometheus update ( #4700 )
2024-04-24 14:37:17 +08:00
CoolCu
b25ac55a2f
chore: fix some typos in comments ( #4679 )
...
Signed-off-by: CoolCu <coolcui@qq.com>
2024-04-16 16:59:07 +02:00
Nelson Chan
893278bd3d
Feat: Use keylog event to obtain TLS certificate for better reliability [1.23.X] ( #4630 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-04-06 18:43:08 +08:00
Frank Elsinga
0e3b3a9ab8
Made sure that more of the async usages are awaited ( #4574 )
2024-03-15 15:02:55 +01:00
Frank Elsinga
2a3a2201e6
make monitor start() and stop() async ( #2830 )
2024-03-09 23:36:00 +01:00
Andi Pätzold
a0c62d8ab0
Fix: handle monitor names with slashes ( #4472 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-03-03 17:59:38 +08:00
Frank Elsinga
81e465f418
Removed debug statement
2024-02-11 20:02:09 +01:00
Neel Bhanushali
a5d0f7a7db
console added with double quotes and semicolons. console added with username so i can remove later
2024-02-11 21:42:20 +05:30
Neel Bhanushali
a16b42f98c
poc done
2024-02-11 21:33:58 +05:30
Frank Elsinga
dc3abc68f0
Fixed type anotation
2024-01-30 17:54:04 +01:00
Frank Elsinga
89158be7de
Merge branch 'master' into monitor_async_start_stop
2024-01-30 17:53:21 +01:00
Nelson Chan
2b8f55194f
Fix: [JSON-Query] Prevent parsing string-only JSON ( #4425 )
2024-01-28 03:18:24 +08:00
Adam Stachowicz
458cdf9f9b
Fix encodeBase64 for empty password or user in HTTP Basic Authentication ( #4326 )
2024-01-07 02:06:06 +08:00
HdroguettA
f24c3583fb
Attempt an OAuth2 Refresh on 401 ( #3903 )
2023-12-17 17:21:07 +08:00
Louis Lam
530c8e5328
Drop cacheable-lookup ( #4178 )
...
* WIP
* WIP
2023-12-11 02:01:56 +08:00
Nelson Chan
46432618e1
Feat: Add json-query to MQTT monitor type ( #3857 )
...
* Feat: Add json-query MQTT monitor type
* Fix: Allow result to be null
* Fix: Remove unused parameter
* Chore: Update JSDoc
* Fix: Add default if checkType is not set
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-12-03 01:36:19 +08:00
Adam Hancock
62780001f7
Feature: remote browser support ( #3904 )
...
* [empty commit] pull request for remote browser support
* Remote browser: Added UI screens and DB tables.
* Remote browser working
* Fixing tests
* Fix tests
* Fix tests
* fix tests
* Test browser
* revert init_db.js
* Changed drop down to ActionSelect
* Fix translations
* added remote browsers toggle
* revert changes package-lock
* Fix bad english
* Set default remote browser
* Remote browsers Requested changes
* fixed description.
2023-12-01 15:29:10 +08:00
dakriy
80efe9b831
Handle cookies on redirection ( #3589 )
...
* feat: Set and send cookies on redirection (louislam#3587).
* feat: Make proxy agents handle cookies
* Merge package-lock.json
* Merge package-lock.json
* Fix lint
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-11-29 17:25:33 +08:00
Louis Lam
5bc8c0c66f
Merge 1.23.7 ( #4102 )
...
1.23.x merge to 2.x.x
2023-11-25 03:32:12 +08:00
Louis Lam
e9bf02fc2c
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# package-lock.json
# package.json
# server/model/monitor.js
# server/monitor-types/tailscale-ping.js
# server/socket-handlers/general-socket-handler.js
# server/uptime-kuma-server.js
2023-11-25 03:25:03 +08:00
Nelson Chan
67250d6302
Feat: Retries persistence ( #3814 )
...
* Feat: Retries persistence
* Fix: Set duration for first beat of push monitor
* Feat: Update UptimeCalculator in push route
* Fix: Handle resend in push route
* Chore: Remove debug log
2023-11-24 18:11:36 +08:00
Louis Lam
121d1a11af
Revert "Restart running monitors if no heartbeat ( #3952 )" ( #4088 )
...
This reverts commit c43223a16d
2023-11-24 02:23:38 +08:00
Louis Lam
bf58838b89
+10 seconds for Abort signal ( #4053 )
...
* Debug only
* Remove debug
2023-11-22 16:03:03 +08:00
Nelson Chan
33ce0ef02c
Fix: Improve error message on timeout ( #4054 )
...
* Fix: Improve error message on timeout
* Chore: Format
2023-11-21 23:56:17 +08:00
Louis Lam
92e0eec6d4
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# package.json
# server/model/monitor.js
2023-11-20 14:49:45 +08:00
Louis Lam
954e05b72f
Fix #4051
2023-11-18 11:33:34 +08:00
Louis Lam
2aa15ea635
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# server/database.js
2023-11-18 01:37:30 +08:00
Louis Lam
f0975cd929
Should be a final ulitmate fix for request timeout issue ( #4045 )
...
* Try to fix timeout again
* Ops
2023-11-18 01:17:54 +08:00
Louis Lam
b383392e8f
Remains Node.js 16' SSL behavior for 1.23.X ( #4044 )
2023-11-17 15:21:08 +08:00
Louis Lam
ace1fe00c2
Merge branch 'master' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# docker/debian-base.dockerfile
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/uptime-kuma-server.js
# server/util-server.js
2023-11-13 21:15:51 +08:00
Louis Lam
8e3ff25f7b
Followup #3864 , rebase for 1.23.x ( #4016 )
...
* Fix: Use ActionSelect Docker Host & validate input
* Fix: Handle docker host deleted while editing
* UI: Use add for ActionSelect & prevent delete instead
---------
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
2023-11-12 20:32:40 +08:00
Louis Lam
6e80c850f4
Should be an ulitmate fix for request timeout issue ( #4011 )
2023-11-12 13:50:51 +08:00
