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 <[email protected] >
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
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
Louis Lam
c43223a16d
Restart running monitors if no heartbeat ( #3952 )
2023-11-01 09:36:12 +08:00
Muhammed Hussein karimi
9f170a68d7
🐛 fix: boolean fields in kafka producer monitor ( #3949 )
...
* 🐛 fix: boolean fields in kafka producer monitor
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: boolean fields db patch table modify
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* ✏️ typo: remove `_old` COLUMNs in patch-fix-kafka-producer-booleans
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
---------
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
2023-10-28 14:42:55 +08:00
Louis Lam
bbaba29222
Set default ua for axios: Uptime-Kuma/version instead of axios/version
2023-10-18 21:54:49 +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
c39043ec32
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# package-lock.json
2023-10-09 21:36:04 +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
Nelson Chan
5b7206f8e2
Fix: Wrong datatype for avgPing ( #3724 )
2023-10-09 02:33:32 +08:00
Adam Stachowicz
6875ecdfbf
Fix warnings ( #3826 )
2023-10-03 05:39:17 +08:00
Marvin A. Ruder
90d0e8ccde
Enable status page certificate expiry badge for all HTTP(s) monitors ( #3649 )
2023-09-24 03:18:18 +08:00
Nelson Chan
33cc96f918
Fix: subtract time taken to run heartbeat ( #3072 )
2023-09-21 20:11:04 +08:00
Louis Lam
59119b9e71
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
2023-09-18 03:26:59 +08:00
Louis Lam
ff51704cdf
Fix #3712
2023-09-17 02:40:08 +08:00
Frank Elsinga
d6af9162c1
Chore: Extracted the dns monitor to its own monitor-type ( #3413 )
...
* extracted the dns monitor to its own monitor-type
* linting fixes
* another formatting fix
* Fix: Improve dnsMessage handling (#3614 )
* fixed docs
* fixed formatting changes
2023-09-09 18:14:55 +08:00
Anders Kvist
f0c54be43f
Adding x-www-form-urlencoded ( #3499 )
...
* Adding x-www-form-urlencoded
* Adding example of x-www-form-urlencoding to body.
* A bit cleaner.
* Update server/model/monitor.js
Co-authored-by: Frank Elsinga <[email protected] >
* Update src/pages/EditMonitor.vue
Co-authored-by: Frank Elsinga <[email protected] >
* Update src/pages/EditMonitor.vue
Co-authored-by: Matthew Nickson <[email protected] >
* Add simple test
---------
Co-authored-by: Anders Kvist <[email protected] >
Co-authored-by: Frank Elsinga <[email protected] >
Co-authored-by: Louis Lam <[email protected] >
Co-authored-by: Matthew Nickson <[email protected] >
2023-09-09 18:05:25 +08:00
Frank Elsinga
d6302198f3
chore(jsdoc):Linting fixes ( #3703 )
...
* fixed the lockfile having a different version
* jsdoc
2023-09-07 15:42:44 +08:00
Louis Lam
5061e42d4b
Merge remote-tracking branch 'origin/2.0.X' into 2.0.X
2023-09-01 05:23:52 +08:00
Louis Lam
076331bf00
Uptime calculation improvement and 1-year uptime ( #2750 )
2023-09-01 05:19:21 +08:00
Louis Lam
a13fc7079e
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
2023-08-30 01:39:16 +08:00
Nelson Chan
4da1341aa5
Fix: Improve dnsMessage handling ( #3614 )
2023-08-26 21:27:32 +08:00
Louis Lam
db3a7d69fe
Change some jsdoc rule to warn instead of error
2023-08-11 22:29:45 +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
Louis Lam
b44f6e4af2
Fix #3539
2023-08-08 18:29:48 +08:00
Nelson Chan
2921f33c24
Feat: add givenPortOnly as gamedig option ( #3532 )
2023-08-08 03:14:21 +08:00
Jinhyeok Lee
439b6517d1
Feat: Add http/http keyword timeout option ( #2142 )
...
* feat: Add timeoutMs field
* chore: Update Languages (incl. ko-KR)
* Revert "chore: Update Languages (incl. ko-KR)"
This reverts commit 349331a00b[email protected] >
* Fix merge issue
* Update the timeout value while finished editing the interval value
---------
Co-authored-by: Louis Lam <[email protected] >
Co-authored-by: Frank Elsinga <[email protected] >
2023-08-07 00:14:56 +08:00
Marcell Fülöp
bce4835362
FEAT: Allow client side TLS for Docker hosts ( #2852 )
...
* FEAT: Allow client side TLS for Docker hosts
Inlcude TLS certificate in HTTPS requests when certificate
files are locally available to Kuma for a host.
* fix: refactor to satisfy linter requirements
* fix: linter
2023-08-04 22:49:33 +08:00
Nelson Chan
a032e11a2e
Feat: Create Group in EditMonitor page ( #3379 )
...
* Feat: Create Group in EditMonitor page
* Fix: Start group mon. after child is added
* Chore: Swap confirm & cancel for ergonomics
* Fix rarely issue that group monitor can throw an error if lastBeat is null
* Resume the group monitor in the callback
---------
Co-authored-by: Louis Lam <[email protected] >
2023-08-04 14:48:21 +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
0a59fef7d8
Merge pull request #3490 from chakflying/fix/radius-retry
...
Fix: Incorrect radius error & retry handling
2023-07-31 17:47:26 +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
Tarun Singh
50d4091ded
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
2023-07-18 22:57:48 -04: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
Tarun Singh
f6c1b92fc6
Added http type check and tags based design
2023-07-17 02:01:10 -04:00
Louis Lam
80927332cb
Merge remote-tracking branch 'origin/master' into feat/monitor-list-improved-filtering
2023-07-16 21:04:46 +08:00
Tarun Singh
6f4af30701
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
2023-07-13 20:02:50 -04:00
Tarun Singh
b1f266ceb1
Added expiry changes to status page and fixes
2023-07-13 20:00:23 -04:00
Muhammed Hussein karimi
6bece8796e
✨ feat: json-query monitor added ( #3253 )
...
* ✨ feat: json-query monitor added
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: import warning error
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: br tag and remove comment
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: supporting compare string with other types
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: switch to a better lib for json query
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: better description on json query and using `v-html` in jsonQueryDescription element to fix `a` tags
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: result variable in error message
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: typos in json query description
Co-authored-by: Frank Elsinga <[email protected] >
* 📝 docs: `HTTP(s) Json Query` added to monitor list in `README.md`
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
* 🐛 fix: needed white space in `README.md`
Co-authored-by: Frank Elsinga <[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
* Rebuild package-lock.json
* Lint
---------
Signed-off-by: Muhammed Hussein Karimi <[email protected] >
Co-authored-by: Frank Elsinga <[email protected] >
Co-authored-by: zappityzap <[email protected] >
Co-authored-by: Louis Lam <[email protected] >
2023-07-13 23:37:26 +08:00
Louis Lam
e7d1b4e14a
Merge pull request #3174 from chakflying/fix/push-monitor-safe-restart
...
Fix: Use safeBeat in push monitor
2023-07-13 23:14:28 +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
ed6b4e5ae5
Merge remote-tracking branch 'origin/master' into miles/invert-keyword
...
# Conflicts:
# server/database.js
2023-07-08 16:19:44 +08:00
Tarun Singh
4ea5771f97
Status page certificate expiry
2023-07-04 19:37:45 -04:00
Louis Lam
de74efb2e6
Merge pull request #3169 from janow25/docker-health-check
...
Added Docker Health Status Support
2023-07-01 02:55:05 +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
