Commit graph

1568 commits

Author SHA1 Message Date
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
cf075a8793
Fix: missing await in getRemoteBrowser() (#4418) 2024-01-26 06:53:15 +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
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