ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-27 16:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
5184 commits 30 branches 115 tags 66 MiB
Commit graph

1627 commits

Author SHA1 Message Date
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
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
Louis Lam
65cbc7b318 Migrate kafka_producer patch 2023-11-13 21:19:43 +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
Nelson Chan
38efd97b28
Fix: Support float ping in push route (#3987) 2023-11-09 23:39:44 +08:00
Nelson Chan
b534fde265
Fix: Use ActionSelect for Docker Host & validate input (#3864) 
* Fix: Use ActionSelect Docker Host & validate input

* Fix: Handle docker host deleted while editing

* UI: Use add for ActionSelect & prevent delete instead
 2023-11-03 21:25:28 +08:00
Louis Lam
ce0ba6c0ca
Fix/axios abort signal for 1.23.X (#3971) 
* Fix: Add axios abort signal

* Chore: Fix comment

---------

Co-authored-by: Nelson Chan <chakflying@hotmail.com>
 2023-11-01 10:10:48 +08:00
Nelson Chan
fdfb572e09
Fix: Add axios abort signal (#3961) 
* Fix: Add axios abort signal

* Chore: Fix comment
 2023-11-01 09:48:13 +08:00