Louis Lam
eca90a2b00
Revert "feat: structured logging (JSON)" ( #5175 )
Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions
Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions
Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions
Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run
Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run
Auto Test / check-linters (push) Waiting to run
Auto Test / e2e-test (push) Waiting to run
CodeQL / Analyze (go) (push) Waiting to run
CodeQL / Analyze (javascript-typescript) (push) Waiting to run
Merge Conflict Labeler / Labeling (push) Waiting to run
json-yaml-validate / json-yaml-validate (push) Waiting to run
2024-10-09 07:43:44 +08:00
Cassandra
b287a25de7
feat: structured logging (JSON) ( #5118 )
Auto Test / check-linters (push) Has been cancelled
CodeQL / Analyze (go) (push) Has been cancelled
CodeQL / Analyze (javascript-typescript) (push) Has been cancelled
Merge Conflict Labeler / Labeling (push) Has been cancelled
json-yaml-validate / json-yaml-validate (push) Has been cancelled
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Auto Test / auto-test (20.5, ARM64) (push) Has been cancelled
Auto Test / auto-test (20.5, macos-latest) (push) Has been cancelled
Auto Test / auto-test (20.5, ubuntu-latest) (push) Has been cancelled
Auto Test / auto-test (20.5, windows-latest) (push) Has been cancelled
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Auto Test / e2e-test (push) Has been cancelled
2024-09-24 17:51:21 +08:00
Louis Lam
83969d2112
Update dependencies and embed axios-ntlm 1.3.0 into the project ( #4877 )
2024-06-24 02:08:39 +08:00
HdroguettA
daca38a554
Ignore TLS/SSL error for Redis ( #3878 )
...
Co-authored-by: Frank Elsinga <[email protected] >
2024-05-19 23:34:01 +02:00
Sebastian Lang
a3ac954140
Add support for custom mongodb commands ( #4445 )
...
Co-authored-by: Sebastian Lang <[email protected] >
Co-authored-by: Frank Elsinga <[email protected] >
2024-05-19 21:59:57 +02:00
Louis Lam
27bcc968ec
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <[email protected] >
2024-04-25 23:45:30 +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
893278bd3d
Feat: Use keylog event to obtain TLS certificate for better reliability [1.23.X] ( #4630 )
...
Co-authored-by: Frank Elsinga <[email protected] >
2024-04-06 18:43:08 +08:00
Ben Scobie
25cb78796a
Fix incorrect ping log ( #4322 )
2024-01-05 20:43:03 +08:00
Louis Lam
996ff28ed9
Playwright + Native Node Test Runner ( #3893 )
2023-12-17 19:02:22 +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
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
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 <[email protected] >
2023-12-03 01:36:19 +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
Louis Lam
8e61158758
Close the client postgresql connection after rejection. ( #4084 )
...
Co-authored-by: Manuel Vázquez Acosta <[email protected] >
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
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
6e80c850f4
Should be an ulitmate fix for request timeout issue ( #4011 )
2023-11-12 13:50:51 +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 <[email protected] >
2023-11-01 10:10:48 +08:00
Nelson Chan
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
2023-10-16 02:20:38 +08:00
Louis Lam
18169c59a1
[MySQL monitor] Split password into a standalone field ( #3899 )
2023-10-16 00:38:56 +08:00
Louis Lam
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
2023-10-13 02:50:10 +08:00
Louis Lam
aa676150eb
Fix shutdown issue and tidy up
2023-10-12 21:26:11 +08:00
DevMirza
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 <[email protected] >
* Update server/model/user.js
Co-authored-by: Nelson Chan <[email protected] >
---------
Co-authored-by: Nelson Chan <[email protected] >
2023-10-10 00:39:55 +08:00
Louis Lam
852b3fa61b
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/server.js
# server/util-server.js
2023-10-09 21:28:01 +08:00
Louis Lam
88afab6571
Merge pull request from GHSA-g9v2-wqcj-j99g
...
* Fix attempt
* Update message
2023-10-09 07:01:54 +08:00
Muhammed Hussein karimi
2ab21ccf8a
🐛 fix: kafka producer bugs ( #3771 )
...
* 🐛 fix: missing Kafka Producer SSL option in frontend object
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* ♻️ refactor: better error handling of kafka producer
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
---------
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
2023-09-24 03:30:15 +08:00
Louis Lam
076331bf00
Uptime calculation improvement and 1-year uptime ( #2750 )
2023-09-01 05:19:21 +08:00
Matthew Nickson
8a92054c2b
Added JSDoc to ESLint ( #3529 )
...
* Added JSDoc to eslint rules
Signed-off-by: Matthew Nickson <[email protected] >
* Fixed JSDoc eslint errors
Signed-off-by: Matthew Nickson <[email protected] >
* Update the check-linters workflow to Node.js 20
---------
Signed-off-by: Matthew Nickson <[email protected] >
Co-authored-by: Louis Lam <[email protected] >
2023-08-11 15:46:41 +08:00
Louis Lam
3e0f5f4231
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
# server/database.js
# server/util-server.js
2023-08-09 20:09:56 +08:00
Matthew Nickson
71fca3f0c3
Fixed #3520 Validate accepted status codes type ( #3530 )
...
* Fixed #3520 Validate accepted status codes type
Signed-off-by: Matthew Nickson <[email protected] >
* 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 <[email protected] >
---------
Signed-off-by: Matthew Nickson <[email protected] >
2023-08-08 03:22:32 +08:00
Louis Lam
d231a05526
Remove babel-plugin-rewire ( #3522 )
2023-08-04 01:10:15 +08:00
Henrik Gerdes
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
2023-08-02 15:40:19 +08:00
Louis Lam
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
2023-07-30 19:15:09 +08:00
Nelson Chan
573f158f7f
Fix: incorrect radius error handling
2023-07-27 17:42:22 +08:00
Muhammed Hussein karimi
278b88a9d9
✨ feat: added kafka producer ( #3268 )
...
* ✨ feat: added kafka producer
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: eslint warn
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: typings and auth problems
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: better variable name to trrack disconnection
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: grouping Kafka Producer special settings into one template
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* ✨ feat: add kafka producer translations into `en.json`
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: disable close-on-select on kafka broker picker
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: `en.json` invalid json (conflict resolve)
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* Nostr dm notifications (#3051 )
* Add nostr DM notification provider
* require crypto for node 18 compatibility
* remove whitespace
Co-authored-by: Frank Elsinga <[email protected] >
* 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 <[email protected] >
* polyfills required for node <= 18
* resolve linter warnings
* missing comma
---------
Co-authored-by: Frank Elsinga <[email protected] >
* Drop nostr
* Minor
* Fix a bug of clone
---------
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
Co-authored-by: Frank Elsinga <[email protected] >
Co-authored-by: Louis Lam <[email protected] >
2023-07-17 16:15:44 +08:00
Louis Lam
d825dbf828
Merge pull request #3188 from chakflying/fix/radius-timeout
...
Fix: Set radius connection timeout to monitor default
2023-07-09 22:47:39 +08:00
Louis Lam
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
2023-06-30 13:38:56 +08:00
Louis Lam
2e2747fb52
Handling DATE_ADD
2023-06-27 20:57:34 +08:00
Kenneth Foster
6708eed121
Fixed error handling if client is closed
2023-06-14 11:49:33 -04:00
kefoster951
d37c33ad42
Update server/util-server.js
...
Co-authored-by: Frank Elsinga <[email protected] >
2023-06-12 11:06:20 -04:00
Kenneth Foster
8897385690
Fixed linting
2023-06-09 16:26:02 -04:00
Kenneth Foster
6132a45c7c
fixed when auth is needed but not provided
2023-06-09 16:06:33 -04:00
Kenneth Foster
f68452c47a
Added changes to stop auth attempts after an error
2023-06-09 14:54:17 -04:00
Nelson Chan
58ec53fb1d
Fix: Try to close mysql connection properly
2023-06-06 20:28:51 +08:00
Louis Lam
0b8dddba24
Merge remote-tracking branch 'origin/master' into skaempfe#2593
...
# Conflicts:
# server/model/monitor.js
# src/pages/Details.vue
2023-05-26 21:32:58 +08:00
Nelson Chan
f1a396b0f7
Fix: Align radius timeout to default
2023-05-23 18:18:54 +08:00
Louis Lam
f4ee5271af
Improve error handling of mysqlQuery and return row count as result
2023-03-24 16:24:00 +08:00
Louis Lam
7330db3563
Improve error handling of mysqlQuery and return row count as result
2023-03-24 16:08:30 +08:00
Louis Lam
a599f5149b
Merge pull request #2907 from chakflying/fix/disconnect-redis
...
Fix: Disconnect redis after ping
2023-03-08 22:57:30 +08:00
