mirrors
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,031 Commits 31 Branches 117 Tags 36 MiB
Commit Graph

423 Commits

Author SHA1 Message Date
HdroguettA f24c3583fb
Attempt an OAuth2 Refresh on 401 (#3903) 2023-12-17 17:21:07 +08:00
Louis Lam 530c8e5328
Drop cacheable-lookup (#4178) 
* WIP

* WIP
 2023-12-11 02:01:56 +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
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
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
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 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 121d1a11af
Revert "Restart running monitors if no heartbeat (#3952)" (#4088) 
This reverts commit c43223a16d.
 2023-11-24 02:23:38 +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
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
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
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 <info@karimi.dev>

* 🐛 fix: boolean fields db patch table modify

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* ✏️  typo: remove `_old` COLUMNs in patch-fix-kafka-producer-booleans

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

---------

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
 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 <frank@elsinga.de>

* Update src/pages/EditMonitor.vue

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Update src/pages/EditMonitor.vue

Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>

* Add simple test

---------

Co-authored-by: Anders Kvist <ak@cego.dk>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
 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 <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>
 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.

* chore: Update ko-KR selectively

* chore: Update en selectively

* Merge manually

* Reorder and show only if http related monitors

* fix: Update Korean translation

* fix: Rename timeoutMs to timeout, rename label, make DOUBLE

* fix: Change minimum step to 0.1, matching DOUBLE type

* Put the sql patch at the end

* Update EditMonitor.vue

* Colocate timeout with retry, fix clampTimeout logic, show default on 0

* Update src/pages/EditMonitor.vue to remove a comment

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Fix merge issue

* Update the timeout value while finished editing the interval value

---------

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 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 <louislam@users.noreply.github.com>
 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