Frank Elsinga
89158be7de
Merge branch 'master' into monitor_async_start_stop
10 months ago
Nelson Chan
2b8f55194f
Fix: [JSON-Query] Prevent parsing string-only JSON ( #4425 )
10 months ago
Adam Stachowicz
458cdf9f9b
Fix `encodeBase64` for empty password or user in HTTP Basic Authentication ( #4326 )
11 months ago
Nelson Chan
c9fe6b5d01
Feat: Refresh login token for the client initiating password change ( #4214 )
12 months ago
HdroguettA
f24c3583fb
Attempt an OAuth2 Refresh on 401 ( #3903 )
12 months ago
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
12 months ago
Louis Lam
530c8e5328
Drop cacheable-lookup ( #4178 )
...
* WIP
* WIP
12 months ago
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>
1 year ago
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.
1 year ago
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>
1 year ago
Louis Lam
5bc8c0c66f
Merge 1.23.7 ( #4102 )
...
1.23.x merge to 2.x.x
1 year ago
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
1 year ago
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
1 year ago
Louis Lam
121d1a11af
Revert "Restart running monitors if no heartbeat ( #3952 )" ( #4088 )
...
This reverts commit c43223a16d
.
1 year ago
Louis Lam
bf58838b89
+10 seconds for Abort signal ( #4053 )
...
* Debug only
* Remove debug
1 year ago
Nelson Chan
33ce0ef02c
Fix: Improve error message on timeout ( #4054 )
...
* Fix: Improve error message on timeout
* Chore: Format
1 year ago
Louis Lam
92e0eec6d4
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# package.json
# server/model/monitor.js
1 year ago
Louis Lam
954e05b72f
Fix #4051
1 year ago
Louis Lam
2aa15ea635
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# server/database.js
1 year ago
Louis Lam
f0975cd929
Should be a final ulitmate fix for request timeout issue ( #4045 )
...
* Try to fix timeout again
* Ops
1 year ago
Louis Lam
b383392e8f
Remains Node.js 16' SSL behavior for 1.23.X ( #4044 )
1 year ago
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
1 year ago
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>
1 year ago
Louis Lam
6e80c850f4
Should be an ulitmate fix for request timeout issue ( #4011 )
1 year ago
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>
1 year ago
Louis Lam
c43223a16d
Restart running monitors if no heartbeat ( #3952 )
1 year ago
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>
1 year ago
Louis Lam
bbaba29222
Set default ua for axios: `Uptime-Kuma/version` instead of `axios/version`
1 year ago
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
1 year ago
Louis Lam
18169c59a1
[MySQL monitor] Split password into a standalone field ( #3899 )
1 year ago
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 <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>
1 year ago
Louis Lam
c39043ec32
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# package-lock.json
1 year ago
Louis Lam
852b3fa61b
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/server.js
# server/util-server.js
1 year ago
Louis Lam
88afab6571
Merge pull request from GHSA-g9v2-wqcj-j99g
...
* Fix attempt
* Update message
1 year ago
Nelson Chan
5b7206f8e2
Fix: Wrong datatype for avgPing ( #3724 )
1 year ago
Adam Stachowicz
6875ecdfbf
Fix warnings ( #3826 )
1 year ago
Marvin A. Ruder
90d0e8ccde
Enable status page certificate expiry badge for all HTTP(s) monitors ( #3649 )
1 year ago
Nelson Chan
33cc96f918
Fix: subtract time taken to run heartbeat ( #3072 )
1 year ago
Louis Lam
59119b9e71
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
1 year ago
Louis Lam
ff51704cdf
Fix #3712
1 year ago
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
1 year ago
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>
1 year ago
Frank Elsinga
d6302198f3
chore(jsdoc):Linting fixes ( #3703 )
...
* fixed the lockfile having a different version
* jsdoc
1 year ago
Louis Lam
5061e42d4b
Merge remote-tracking branch 'origin/2.0.X' into 2.0.X
1 year ago
Louis Lam
076331bf00
Uptime calculation improvement and 1-year uptime ( #2750 )
1 year ago
Louis Lam
a13fc7079e
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
1 year ago
Nelson Chan
4da1341aa5
Fix: Improve dnsMessage handling ( #3614 )
1 year ago
Louis Lam
db3a7d69fe
Change some jsdoc rule to warn instead of error
1 year ago
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>
1 year ago
Louis Lam
3e0f5f4231
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
# server/database.js
# server/util-server.js
1 year ago
Louis Lam
b44f6e4af2
Fix #3539
1 year ago
Nelson Chan
2921f33c24
Feat: add givenPortOnly as gamedig option ( #3532 )
1 year ago
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>
1 year ago
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
1 year ago
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>
1 year ago
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
1 year ago
Louis Lam
0a59fef7d8
Merge pull request #3490 from chakflying/fix/radius-retry
...
Fix: Incorrect radius error & retry handling
1 year ago
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
1 year ago
Nelson Chan
573f158f7f
Fix: incorrect radius error handling
1 year ago
Tarun Singh
50d4091ded
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
1 year ago
Muhammed Hussein karimi
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>
1 year ago
Tarun Singh
f6c1b92fc6
Added http type check and tags based design
1 year ago
Louis Lam
80927332cb
Merge remote-tracking branch 'origin/master' into feat/monitor-list-improved-filtering
1 year ago
Tarun Singh
6f4af30701
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
1 year ago
Tarun Singh
b1f266ceb1
Added expiry changes to status page and fixes
1 year ago
Muhammed Hussein karimi
6bece8796e
✨ feat: json-query monitor added ( #3253 )
...
* ✨ feat: json-query monitor added
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: import warning error
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: br tag and remove comment
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: supporting compare string with other types
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: switch to a better lib for json query
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: better description on json query and using `v-html` in jsonQueryDescription element to fix `a` tags
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: result variable in error message
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: typos in json query description
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* 📝 docs: `HTTP(s) Json Query` added to monitor list in `README.md`
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: needed white space in `README.md`
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* 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
* Rebuild package-lock.json
* Lint
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: zappityzap <128872140+zappityzap@users.noreply.github.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
Louis Lam
e7d1b4e14a
Merge pull request #3174 from chakflying/fix/push-monitor-safe-restart
...
Fix: Use safeBeat in push monitor
1 year ago
Louis Lam
d825dbf828
Merge pull request #3188 from chakflying/fix/radius-timeout
...
Fix: Set radius connection timeout to monitor default
1 year ago
Louis Lam
ed6b4e5ae5
Merge remote-tracking branch 'origin/master' into miles/invert-keyword
...
# Conflicts:
# server/database.js
1 year ago
Tarun Singh
4ea5771f97
Status page certificate expiry
1 year ago
Louis Lam
de74efb2e6
Merge pull request #3169 from janow25/docker-health-check
...
Added Docker Health Status Support
1 year ago
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
1 year ago
Louis Lam
2e2747fb52
Handling DATE_ADD
1 year ago
Louis Lam
4f6035899d
Real browser monitor type ( #3308 )
1 year ago
Nelson Chan
7cc9783436
Fix: Active needs to return bool instead of 0
1 year ago
Tarun Singh
7a34103da6
Added fix to remove children when type changed
1 year ago
Peace
56f448bfe5
fix: maintenance heredity
2 years ago
Peace
2b46da0f47
style: fix linting
2 years ago
Peace
9bd76c2795
Merge branch 'master' into group-monitors
2 years ago
Louis Lam
8ed2b59410
Resolve conflict
2 years ago
Louis Lam
0b8dddba24
Merge remote-tracking branch 'origin/master' into skaempfe#2593
...
# Conflicts:
# server/model/monitor.js
# src/pages/Details.vue
2 years ago
Nelson Chan
f1a396b0f7
Fix: Align radius timeout to default
2 years ago
Nelson Chan
317024ed72
Fix: Use safebeat for push monitor
2 years ago
Janne Nowak
f604d96c5b
splited if to inner if
2 years ago
Janne Nowak
f30f00655f
small fix for down containers
2 years ago
Janne Nowak
891f09def7
removed log
2 years ago
Janne Nowak
6b5e179bb0
linting
2 years ago
Janne Nowak
f653aba735
added docker health status
2 years ago
Louis Lam
8d24891b8e
Merge pull request #3054 from TechWilk/keyword-not-found-whitespace
...
Trim before truncating "keword not found" message
2 years ago
Louis Lam
7f5d0e5490
Merge remote-tracking branch 'origin/1.21.X'
...
# Conflicts:
# package-lock.json
2 years ago
Louis Lam
f0beccf6bf
Fix `Same As Server Timezone` do not save correctly
2 years ago
Louis Lam
d23cb0b382
Fix maintenance do not start after 1.21.2
2 years ago
Christopher Wilkinson
0e516a42e5
Trim before truncating "keword not found" message
2 years ago
Louis Lam
9e320dc5fb
Expose timezone and local datetime to notification providers
2 years ago
Miles Steele
682f8e52a8
lint
2 years ago
Miles Steele
171aff1226
add invert keyword feature
2 years ago
Louis Lam
45ef7b2f69
Fix Effective Date Range cannot be removed
2 years ago
Louis Lam
dbfaddafca
Validate cron before submit
2 years ago
Louis Lam
524cf7c607
WIP
2 years ago
Louis Lam
227cec86a8
WIP
2 years ago