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
Furkan İ
55b2d4b907
Add Bitrix24 Webhook notification ( #3620 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2024-05-19 23:33:32 +02:00
Damon
168d1ca24f
refactor: upload check label when monitor empty ( #3661 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-05-19 23:17:09 +02:00
Nelson Chan
a581a85633
Feat: Use UptimeCalculator
for PingChart ( #4264 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-05-19 22:03:32 +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
Laurent Aupse
e856cb6007
Make auto refresh interval customizable ( #4260 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-05-19 21:56:55 +02:00
TheDanniCraft
4e24e96dab
[discord] thread/forum channel support ( #4099 )
2024-05-19 21:14:13 +02:00
Louis Lam
6bfb1be71a
Improve MariaDB's connection ( #4728 )
2024-05-19 22:46:22 +08:00
jmolnar-comparative
237a6e8da9
chore: fixed a typo for internal, unused part of the file upload icon for status page ( #4750 )
2024-05-10 20:35:36 +02: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
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
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
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
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
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
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
9ba0f68a86
Remove supurfluous log.debug
...
Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
2024-04-30 18:19:18 -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
Matt Visnovsky
9d28fcff1a
Update bean model backend
...
Updates appropriate values async when editing the SNMP monitor
2024-04-30 15:13:16 -06:00
Ezhil Shanmugham
988ba79679
feat: keephq notification provider ( #4722 )
2024-04-30 16:17:34 +02:00
Matt Visnovsky
99dc4cfb46
Wrong variable used
...
Thanks for pointing it out @CommanderStorm!
2024-04-29 22:24:51 -06:00
Matt Visnovsky
4a882be6ba
Further SNMP monitor development
...
Further testing of SNMP feat, however I'm running into the issue `Error in SNMP check: RequestTimedOutError: Request timed out` when the check function is called. I am unsure as to why since my local SNMP script works great with very similar code.
2024-04-29 15:59:59 -06:00
Matt Visnovsky
a3cdd69995
Use net-snmp instead of snmp-native
...
net-snmp over snmp-native is:
-more robust
-more popular
-better documented
-supports v3
2024-04-29 13:58:43 -06:00
Joschua Becker
19e8c75c3b
SevenIO Notification Provider ( #4219 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-04-27 23:40:59 +02:00
凯观生活
126d6cd912
Add the ability to notify @everyone
in DingTalk notifications ( #4718 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-04-27 17:16:39 +02:00
Matt Visnovsky
d92003e172
SNMP Initial Commits
...
This commit introduces a new SNMP monitor feature to the application, allowing users to monitor devices using SNMP (Simple Network Management Protocol).
2024-04-26 19:05:56 -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
27bcc968ec
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2024-04-25 23:45:30 +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
BigBoot
bab427f715
Add loginRequired
SocketIO event ( #4636 )
2024-04-21 20:39:44 +02:00
Louis Lam
7a9e2f5de6
Merge pull request from GHSA-23q2-5gf8-gjpp
2024-04-19 01:08:31 +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
Edoardo Ridolfi
822ce5384b
Add support for Whapi notification provider ( #4323 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-04-03 02:22:01 +02:00
Merlin
937c8a9a7b
New notification provider: CallMeBot API ( #4605 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-04-02 21:39:45 +02:00
Daan Meijer
effd0197ac
[Slack] restructure alert actions, add 'visit site' button ( #3886 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
2024-04-02 02:43:54 +02:00
Nelson Chan
ee7f8680c1
Fix: Add missing FK for monitor-tls-info table [1.23.X] ( #4631 )
2024-03-31 12:05:38 +08:00
Nelson Chan
08f75b0b99
Fix: Add missing FK for monitor-tls-info table ( #4632 )
2024-03-31 12:04:22 +08:00
Simon Nilsson
0923d05317
Cellsynt mobile services ( #4625 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-03-29 16:27:54 +01:00
Nelson Chan
b8858f4605
Feat: Handle maintenance in UptimeCalculator
( #4406 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-03-27 10:19:25 +08:00
Christoph Fichtmüller
49b6dacb4d
Add gtxmessaging Notification Support ( #4481 )
...
Signed-off-by: Christoph Fichtmüller <cf@cfichtmueller.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-03-26 23:59:09 +01:00
Louis Lam
e927327bad
Some minor changes for 2.0.0 ( #4621 )
2024-03-26 15:17:52 +08:00
Elliot Matson
5bc68fe0a7
Google chat cards ( #3928 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-03-20 12:58:28 +01:00
OptimusGREEN
bc077cc536
add notification channel for home assistant ( #4541 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Seb <144435+rmtsrc@users.noreply.github.com>
2024-03-18 23:31:37 +01:00
Frank Elsinga
975761b448
made sure to use Promise.allSettled
instead of sleeping for 500ms after login ( #4592 )
2024-03-19 00:16:04 +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
a9a1cf1353
Chore: General notification reformatting ( #3182 )
...
- I unified where in file the name of `NotificationProvider.name` is placed
- I made sure that all the providers adhere to the signature of `NotificationProvider.send()`
- I made sure that all the providers use `okMsg` if returning success messages directly from the function.
Here a discussion should be had:
Should this be refactored into a constant of `NotificationProvider`? I could imagine that `NotificationProvider.SENDING_SUCCESSFULL` could be a suitable alternative.
- I made sure all providers have the URL they `POST`/`GET` to be extraced into a variable.
=> refactored this way due to Nelsons suggestion
2024-03-14 14:21:15 +01:00
Frank Elsinga
1db750a2e1
Merge branch 'master' into hevans/add-heii-on-call-notification-provider
2024-03-11 20:49:42 +01:00
Frank Elsinga
ca14c34977
Set mqtt
-clientId
to uptime-kuma_..
instead of mqttjs_..
( #4503 )
2024-03-10 15:16:07 +01:00
Frank Elsinga
2a3a2201e6
make monitor start() and stop() async ( #2830 )
2024-03-09 23:36:00 +01:00
taschenuhr
9789931edf
Merge branch 'master' into feature/msteams-adaptivecards
2024-03-07 15:30:26 +01:00
taschenuhr
4aaa0b92fb
fix test notification after method refactoring
2024-03-07 15:11:19 +01:00
Frank Elsinga
e2239bc7b7
Merge branch 'master' into hevans/add-heii-on-call-notification-provider
2024-03-05 19:20:14 +01:00
Frank Elsinga
da92400401
[Ntfy] Only include action link if monitor url is defined #3274 ( #4411 )
2024-03-05 19:19:18 +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
taschenuhr
8bd69d78a8
some more tweaking of the card content and notification summary
2024-02-28 17:41:00 +01:00
taschenuhr
cc09147b4b
fix adding optional ActionSet
2024-02-28 16:31:47 +01:00
taschenuhr
b8941403d1
code cleanup
2024-02-28 16:30:48 +01:00
taschenuhr
5b87da94b3
push notificationMessage to card header and add action button to dashboard
2024-02-28 14:19:32 +01:00
Nelson Chan
c7b8bb9e4a
Fix: Incorrect handling of status page not found ( #4537 )
2024-02-28 18:57:58 +08:00
taschenuhr
7756070c57
refactor MS-Teams notification to use adaptive cards
2024-02-28 09:47:14 +01:00
Stefan Heine
6bfc58674a
MQTT monitor, set the MQTT clientId to make it easier in the MQTT broker to identify where the connections are coming from
2024-02-19 07:57:34 +01:00
Stefan Heine
1b293f2754
MQTT monitor, set the MQTT clientId to make it easier in the MQTT broker to identify where the connections are coming from
2024-02-19 07:42:37 +01:00
Frank Elsinga
1fdb7e48ed
Formatting fixes
2024-02-14 23:45:23 +01:00
Frank Elsinga
cc000117ca
Updated the code to look more like the other notification providers
2024-02-14 23:41:35 +01:00
Humberto Evans
5a9c3ad353
move try/catch into main control flow and more from code review comments
2024-02-13 17:27:59 -08:00
Humberto Evans
4cdc8f344b
Apply suggestions from code review
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-02-13 16:54:52 -08:00
Humberto Evans
f254940b64
spell things correctly
2024-02-12 18:01:06 -08:00
Humberto Evans
71dd5e2369
do not assume missing heartbeat is a test
2024-02-12 17:54:36 -08:00
Humberto Evans
246316f55b
Undo my overzelous linter
2024-02-12 17:24:42 -08:00
Humberto Evans
80bdc455da
lint
2024-02-12 16:31:58 -08:00
Humberto Evans
e8fada9386
set url to heii on call prod
2024-02-12 16:14:41 -08:00
Humberto Evans
93ac212aef
Add Heii On-Call
2024-02-12 15:58:54 -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
Nelson Chan
cf075a8793
Fix: missing await in getRemoteBrowser()
( #4418 )
2024-01-26 06:53:15 +08:00
Nelson Chan
288cab6dd7
Fix: Make sure browser is connected before returning ( #4417 )
2024-01-25 07:59:42 +08:00
Philip Klostermann
95125cc417
[Ntfy] don't include url action with defaut URL value
2024-01-23 11:16:10 -05:00
Philip Klostermann
20b69acde2
[Ntfy] Only include action link if monitor url is defined #3274
2024-01-23 10:10:31 -05:00
AnnAngela
b4e45c7ce8
fix(notification-dingding): throw error when failed ( #3598 )
2024-01-20 03:29:13 +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
Louis Lam
9356e7dd4f
Update clear stats ( #4324 )
2024-01-05 20:51:05 +08:00
Ben Scobie
25cb78796a
Fix incorrect ping log ( #4322 )
2024-01-05 20:43:03 +08:00
Nelson Chan
bf1e3a3d5e
Feat: Add stat_hourly
& min. max. ping ( #4267 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-01-05 20:42:24 +08:00
Louis Lam
2a315d4c84
Merge branch '1.23.X' into merge
...
# Conflicts:
# package-lock.json
# package.json
2024-01-03 02:10:01 +08:00
Nelson Chan
c9fe6b5d01
Feat: Refresh login token for the client initiating password change ( #4214 )
2023-12-18 19:52:49 +08:00
Louis Lam
996ff28ed9
Playwright + Native Node Test Runner ( #3893 )
2023-12-17 19:02:22 +08:00
HdroguettA
f24c3583fb
Attempt an OAuth2 Refresh on 401 ( #3903 )
2023-12-17 17:21:07 +08:00
Louis Lam
8151ac0e25
Fix Async child process output issue ( #4231 )
2023-12-14 04:54:34 +08:00
Louis Lam
1a47563eb8
Merge branch '1.23.X' into version-merge
...
# Conflicts:
# package-lock.json
# package.json
# server/server.js
# server/uptime-kuma-server.js
2023-12-13 01:54:08 +08:00
Nelson Chan
4185ec20b0
Fix: Origin undefined on error handling ( #4224 )
2023-12-13 01:35:39 +08:00
Louis Lam
f861a48dfc
Smoothing the update for origin check ( #4216 )
2023-12-12 16:23:41 +08:00
Louis Lam
fa1214ae5e
Rebse #4213 ( #4215 )
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
2023-12-11 19:30:01 +08:00
Nelson Chan
99adac3eb9
Fix: typo for disconnectAllSocketClients
( #4213 )
2023-12-11 19:26:20 +08:00
Nelson Chan
89beb5f264
Fix: Handle trailing slash for status page routing ( #4185 )
...
* Fix: Handle trailing slash
* Chore: Add desc for default slug
* Chore: Use margin instead of space
* Minor
2023-12-11 03:05:13 +08:00
Louis Lam
719ef856e8
Merge manually
2023-12-11 02:36:08 +08:00
Louis Lam
869ee8ec50
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# .github/workflows/auto-test.yml
# extra/reset-password.js
# package-lock.json
# package.json
# server/routers/status-page-router.js
# server/server.js
# server/socket-handlers/general-socket-handler.js
# server/uptime-kuma-server.js
# src/components/ActionInput.vue
# src/util.js
# src/util.ts
2023-12-11 02:13:47 +08:00
Louis Lam
530c8e5328
Drop cacheable-lookup ( #4178 )
...
* WIP
* WIP
2023-12-11 02:01:56 +08:00
Louis Lam
482049c72b
Merge pull request from GHSA-88j4-pcx8-q4q3
...
* WIP, still need to handle npm run reset-password
* Implement it for "npm run reset-password"
Bug fixes and change along with this commit
- Move `ssl`, `hostname`, `port` to ./server/config.js, so `reset-password` is able to read it
- Fix: FBSD is missing, no idea who dropped it.
- Fix: Frontend code should not require any backend code (./server/config.js), moved "badgeConstants" to the common util (./src/util.ts) and drop vite-common.js
* Minor
2023-12-10 20:40:40 +08:00
Louis Lam
2815cc73cf
Merge pull request from GHSA-mj22-23ff-2hrr
...
* WIP
* WIP
* Handle parsing error
* Fix matching origin issue
2023-12-10 20:39:43 +08:00
Louis Lam
ad4629cb03
Fix UPTIME_KUMA_DB_NAME issue ( #4169 )
2023-12-05 05:16:55 +08:00
DevMirza
db7a92a74c
🐛 fix(remote-browser): Remove unused test() function ( #4155 )
...
* fix
* fix lint
* Update Notifications.vue
* Update ActionInput.vue
2023-12-03 20:27:09 +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
Nelson Chan
35479c7690
Fix: Disable timezone conversion for mariadb ( #3756 )
2023-12-03 01:34:26 +08:00
Louis Lam
c5d9c54a04
Merge branch 'master' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# package.json
2023-12-02 18:43:06 +08:00
Louis Lam
81c9900e23
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# docker/debian-base.dockerfile
2023-12-01 15:50:35 +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
Louis Lam
9fb95fe95e
Add support for /snap/bin/chromium ( #4141 )
2023-12-01 14:25:41 +08:00
Louis Lam
1708b67949
Change execSync/spawnSync to async ( #4123 )
...
* WIP
* Add missing await
* Update package-lock.json
2023-11-30 16:12:04 +08:00
Nenad Gal
01855e0ffe
monitor path as a notification title mattermost ( #3801 )
2023-11-30 15:58:01 +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
Nelson Chan
b8bd17ddbd
Fix: Add timeout to testDockerHost ( #4097 )
2023-11-26 18:47:56 +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
60be875edd
Fix a merge issue
2023-11-25 03:28:45 +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
711380bbbe
Merge pull request #4095 from louislam/update-3
...
Rewrite Tailscale ping using spawnSync
2023-11-24 17:44:24 +08:00
Louis Lam
9536c6aa6a
Minor
2023-11-24 17:33:13 +08:00
Louis Lam
4255496b11
Rewrite Tailscale ping using spawnSync
2023-11-24 17:29:42 +08:00
Louis Lam
f28dccf4e1
Merge pull request from GHSA-v4v2-8h88-65qj
2023-11-24 17:18:01 +08:00
Louis Lam
b689733d59
Fix getGameList, testChrome without checkLogin
2023-11-24 16:37:52 +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
8e61158758
Close the client postgresql connection after rejection. ( #4084 )
...
Co-authored-by: Manuel Vázquez Acosta <manuel@merchise.org>
2023-11-22 19:50:03 +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
Nelson Chan
9964b6c4d8
Fix: Update monitor object on pause ( #4032 )
2023-11-16 20:41:35 +08:00
Louis Lam
188fdcb6ad
Merge branch 'master' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# server/model/monitor.js
# server/util-server.js
2023-11-13 21:25:49 +08:00