27bcc968ec
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 weeks ago
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
2 weeks ago
893278bd3d
Feat: Use keylog event to obtain TLS certificate for better reliability [1.23.X] ( #4630 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
1 month ago
25cb78796a
Fix incorrect ping log ( #4322 )
4 months ago
996ff28ed9
Playwright + Native Node Test Runner ( #3893 )
5 months ago
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
5 months ago
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
5 months ago
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>
5 months ago
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
5 months ago
8e61158758
Close the client postgresql connection after rejection. ( #4084 )
...
Co-authored-by: Manuel Vázquez Acosta <manuel@merchise.org>
6 months ago
bf58838b89
+10 seconds for Abort signal ( #4053 )
...
* Debug only
* Remove debug
6 months ago
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
6 months ago
6e80c850f4
Should be an ulitmate fix for request timeout issue ( #4011 )
6 months ago
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>
6 months ago
e64bf0e3fe
Fix: Stop notification check on root certs ( #3874 )
...
* Fix: Stop notification check on root certs
* Chore: Use Set for optimization
* Fix: Manually calculate SHA256 to support node v14
7 months ago
18169c59a1
[MySQL monitor] Split password into a standalone field ( #3899 )
7 months ago
1c13a75970
Fix #3868 postgres monitor could possibly crash Uptime Kuma ( #3880 )
...
* Bump pg
* Handle uncaughtException
* Fix parsing issue of postgres connection and fix the query example
7 months ago
aa676150eb
Fix shutdown issue and tidy up
7 months ago
67d0ef571d
🐛 fix: lint warnings & errors ( #3862 )
...
* fix: lint warnings & errors
* fix: lint warning
* fix: lint warnings
* Update user.js
* Update util-server.js
* Update server/util-server.js
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
* Update server/model/user.js
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
---------
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
7 months ago
852b3fa61b
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/server.js
# server/util-server.js
7 months ago
88afab6571
Merge pull request from GHSA-g9v2-wqcj-j99g
...
* Fix attempt
* Update message
7 months ago
2ab21ccf8a
🐛 fix: kafka producer bugs ( #3771 )
...
* 🐛 fix: missing Kafka Producer SSL option in frontend object
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* ♻️ refactor: better error handling of kafka producer
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
8 months ago
076331bf00
Uptime calculation improvement and 1-year uptime ( #2750 )
8 months ago
8a92054c2b
Added JSDoc to ESLint ( #3529 )
...
* Added JSDoc to eslint rules
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Fixed JSDoc eslint errors
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Update the check-linters workflow to Node.js 20
---------
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
9 months ago
3e0f5f4231
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
# server/database.js
# server/util-server.js
9 months ago
71fca3f0c3
Fixed #3520 Validate accepted status codes type ( #3530 )
...
* Fixed #3520 Validate accepted status codes type
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Avoid crash on invalid status code
Instead of failing on an invalid status code, log the error and skip to
next.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
---------
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
9 months ago
d231a05526
Remove babel-plugin-rewire ( #3522 )
9 months ago
42b5d30a33
feat: Implement oauth2 monitors ( #3119 )
...
* [empty commit] pull request for implement oauth2 monitor
* feat: implement oauth2 client credentials flow
* fix: auth methods clarification & error handling
* docs: fix JSdocs types and clarifications
9 months ago
a0bd4b248b
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/debian-base.dockerfile
# package-lock.json
# package.json
# server/database.js
# src/router.js
9 months ago
573f158f7f
Fix: incorrect radius error handling
10 months ago
278b88a9d9
✨ feat: added kafka producer ( #3268 )
...
* ✨ feat: added kafka producer
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: eslint warn
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: typings and auth problems
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: better variable name to trrack disconnection
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: grouping Kafka Producer special settings into one template
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* ✨ feat: add kafka producer translations into `en.json`
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: disable close-on-select on kafka broker picker
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: `en.json` invalid json (conflict resolve)
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* Nostr dm notifications (#3051 )
* Add nostr DM notification provider
* require crypto for node 18 compatibility
* remove whitespace
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* move closer to where it is used
* simplify success or failure logic
* don't clobber the non-alert msg
* Update server/notification-providers/nostr.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* polyfills required for node <= 18
* resolve linter warnings
* missing comma
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Drop nostr
* Minor
* Fix a bug of clone
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
10 months ago
d825dbf828
Merge pull request #3188 from chakflying/fix/radius-timeout
...
Fix: Set radius connection timeout to monitor default
10 months ago
16a1a66e09
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/debian-base.dockerfile
# docker/dockerfile
# package.json
# server/database.js
# server/jobs/util-worker.js
# server/model/maintenance.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/uptime-kuma-server.js
10 months ago
2e2747fb52
Handling DATE_ADD
11 months ago
6708eed121
Fixed error handling if client is closed
11 months ago
d37c33ad42
Update server/util-server.js
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
11 months ago
8897385690
Fixed linting
11 months ago
6132a45c7c
fixed when auth is needed but not provided
11 months ago
f68452c47a
Added changes to stop auth attempts after an error
11 months ago
58ec53fb1d
Fix: Try to close mysql connection properly
11 months ago
0b8dddba24
Merge remote-tracking branch 'origin/master' into skaempfe#2593
...
# Conflicts:
# server/model/monitor.js
# src/pages/Details.vue
12 months ago
f1a396b0f7
Fix: Align radius timeout to default
12 months ago
f4ee5271af
Improve error handling of mysqlQuery and return row count as result
1 year ago
7330db3563
Improve error handling of mysqlQuery and return row count as result
1 year ago
a599f5149b
Merge pull request #2907 from chakflying/fix/disconnect-redis
...
Fix: Disconnect redis after ping
1 year ago
230de63460
Fix: Disconnect redis after ping
1 year ago
7ec09d0118
Fix ipv6 issue for ping
1 year ago
92c9b8bb63
Fix ipv6 issue for ping
1 year ago
010c7d681f
Fix ipv6 issue for ping
1 year ago
42033c692f
Merge pull request #2748 from chakflying/feat/improve-err-code
...
Feat: Use error message to detect and set status code
1 year ago
Louis Lam
Nelson Chan
Ben Scobie
DevMirza
Muhammed Hussein karimi
Matthew Nickson
Henrik Gerdes
Nelson Chan
Kenneth Foster
kefoster951