Louis Lam
1a47563eb8
Merge branch '1.23.X' into version-merge
...
# Conflicts:
# package-lock.json
# package.json
# server/server.js
# server/uptime-kuma-server.js
1 year ago
Nelson Chan
4185ec20b0
Fix: Origin undefined on error handling ( #4224 )
1 year ago
Louis Lam
f861a48dfc
Smoothing the update for origin check ( #4216 )
1 year ago
Louis Lam
fa1214ae5e
Rebse #4213 ( #4215 )
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
1 year ago
Nelson Chan
99adac3eb9
Fix: typo for `disconnectAllSocketClients` ( #4213 )
1 year 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
1 year ago
Louis Lam
719ef856e8
Merge manually
1 year ago
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
1 year ago
Louis Lam
530c8e5328
Drop cacheable-lookup ( #4178 )
...
* WIP
* WIP
1 year ago
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
1 year ago
Louis Lam
2815cc73cf
Merge pull request from GHSA-mj22-23ff-2hrr
...
* WIP
* WIP
* Handle parsing error
* Fix matching origin issue
1 year ago
Louis Lam
ad4629cb03
Fix UPTIME_KUMA_DB_NAME issue ( #4169 )
1 year ago
DevMirza
db7a92a74c
🐛 fix(remote-browser): Remove unused test() function ( #4155 )
...
* fix
* fix lint
* Update Notifications.vue
* Update ActionInput.vue
1 year 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
Nelson Chan
35479c7690
Fix: Disable timezone conversion for mariadb ( #3756 )
1 year ago
Louis Lam
c5d9c54a04
Merge branch 'master' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# package.json
1 year ago
Louis Lam
81c9900e23
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# docker/debian-base.dockerfile
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
Louis Lam
9fb95fe95e
Add support for /snap/bin/chromium ( #4141 )
1 year ago
Louis Lam
1708b67949
Change execSync/spawnSync to async ( #4123 )
...
* WIP
* Add missing await
* Update package-lock.json
1 year ago
Nenad Gal
01855e0ffe
monitor path as a notification title mattermost ( #3801 )
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
Nelson Chan
b8bd17ddbd
Fix: Add timeout to testDockerHost ( #4097 )
1 year ago
Louis Lam
5bc8c0c66f
Merge 1.23.7 ( #4102 )
...
1.23.x merge to 2.x.x
1 year ago
Louis Lam
60be875edd
Fix a merge issue
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
711380bbbe
Merge pull request #4095 from louislam/update-3
...
Rewrite Tailscale ping using spawnSync
1 year ago
Louis Lam
9536c6aa6a
Minor
1 year ago
Louis Lam
4255496b11
Rewrite Tailscale ping using spawnSync
1 year ago
Louis Lam
f28dccf4e1
Merge pull request from GHSA-v4v2-8h88-65qj
1 year ago
Louis Lam
b689733d59
Fix getGameList, testChrome without checkLogin
1 year ago
Louis Lam
121d1a11af
Revert "Restart running monitors if no heartbeat ( #3952 )" ( #4088 )
...
This reverts commit c43223a16d
.
1 year ago
Louis Lam
8e61158758
Close the client postgresql connection after rejection. ( #4084 )
...
Co-authored-by: Manuel Vázquez Acosta <manuel@merchise.org>
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
Nelson Chan
9964b6c4d8
Fix: Update monitor object on pause ( #4032 )
1 year ago
Louis Lam
188fdcb6ad
Merge branch 'master' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# server/model/monitor.js
# server/util-server.js
1 year ago
Louis Lam
65cbc7b318
Migrate kafka_producer patch
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
Nelson Chan
38efd97b28
Fix: Support float ping in push route ( #3987 )
1 year ago
Nelson Chan
b534fde265
Fix: Use ActionSelect for Docker Host & validate input ( #3864 )
...
* Fix: Use ActionSelect Docker Host & validate input
* Fix: Handle docker host deleted while editing
* UI: Use add for ActionSelect & prevent delete instead
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
Nelson Chan
fdfb572e09
Fix: Add axios abort signal ( #3961 )
...
* Fix: Add axios abort signal
* Chore: Fix comment
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
Chongyi Zheng
ddd135efa8
Confirm chrome path in macOS is correct ( #3950 )
1 year ago
Nelson Chan
9379498b49
Chore: Allow MS Edge for real-browser monitor ( #3941 )
1 year ago
Louis Lam
1a862e47ab
Check if the password changed when user is not null
1 year ago
Louis Lam
87b2e45fbf
Check if the password changed when user is not null
1 year ago
atmaniak
9b599ccd1d
Add Grafana Oncall notification provider ( #2783 )
...
* Add Grafana Oncall notification provider
* Fix linter errors
* Remove useless variables
* Remove test message
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* spelling consistency
* Update server/notification-providers/grafana-oncall.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/notification-providers/grafana-oncall.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* eslint requirements
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Add Grafana Oncall translation
* Update src/components/notifications/GrafanaOncall.vue
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Check empty url
---------
Co-authored-by: Emmanuel Cohen <emmanuel.cohen@bso.co>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
Louis Lam
8412e19fe6
Add a comment
1 year ago
Louis Lam
bbaba29222
Set default ua for axios: `Uptime-Kuma/version` instead of `axios/version`
1 year ago
Louis Lam
e11aad2d60
Add some comments
1 year ago
Frank Elsinga
3fcb7bf181
Feature: SMTP-templating of `customBody` and `customHeader` via liquidjs ( #3414 )
...
* replaced the regex replacement engine with `Liquid`
* added custom bodys
* fixed a typo
* formatting fixes
* switched all template-variables to be camelCase
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
Louis Lam
966dfa6f88
Drop backup ( #3892 )
...
* Drop backup
* Fix warning
1 year ago
Louis Lam
a362206fab
Fix: do not colorize non-string log message
1 year ago
Louis Lam
03e43ab364
Log color and simplify startup log for production ( #3889 )
1 year ago
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
1 year ago
Louis Lam
aa676150eb
Fix shutdown issue and tidy up
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
前端小武
1b148786a5
Fix: Update `x-forwarded-host` field when using reverse proxy ( #3726 )
1 year ago
Nelson Chan
5b7206f8e2
Fix: Wrong datatype for avgPing ( #3724 )
1 year ago
Adam Stachowicz
6875ecdfbf
Fix warnings ( #3826 )
1 year ago
Nelson Chan
2267655e99
Chore: Add remaining server translation keys ( #3684 )
1 year ago
Louis Lam
98b93c887a
Show push example under the detail page ( #3739 )
1 year ago
Frank Elsinga
0fe8d04f78
made the way telegram handles axios errors like all the other notification providers ( #3623 )
1 year ago
Muhammed Hussein karimi
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>
1 year ago
Marvin A. Ruder
90d0e8ccde
Enable status page certificate expiry badge for all HTTP(s) monitors ( #3649 )
1 year ago
Nelson Chan
7c49f7e5a6
Feat: Full server-side pagination for important events ( #3515 )
...
* Feat: Serverside pagination for importantBeats
* Chore: Remove unused state
* Apply suggestions from code review
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Fix: Add watch for monitor
* Fix: Fix compatibility with dynamic page length
* Chore: Fix lint
* Merge conflict
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
Chongyi Zheng
499429858c
Use API v2 for Bark notification ( #2759 )
...
* Use API v2 for Bark notification
* API v2 endpoint should end with path `/push`
* Support both v1 and v2
* Flip the bool
* Allow selecting api version
* Apply review suggestion
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
* Add translated string to `en.json`
* Apply review suggestion
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
16a396debb
Similar to #3763 , but for 1.23.3
1 year ago
Louis Lam
2ef759a362
Allow missing patch files for downgrade or testing pr.
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
Henrik Gerdes
33804d8823
fix: respect the user defined oauth2 auth method ( #3727 )
1 year ago
Louis Lam
83d91dbb1b
Set mariadb timezone to UTC using +00:00 ( #3723 )
1 year ago
Nelson Chan
0af4ee6c34
Fix: Missing await for isActive ( #3717 )
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
Nelson Chan
f3e1a9c61a
Fix: Incorrect database check in sqlHourOffset ( #3706 )
1 year ago
Louis Lam
9c61247162
Fix #3679
1 year ago
Louis Lam
ed04008569
Remove incorrect warning
1 year ago
Louis Lam
f3517bc08d
Fix avg ping
1 year ago
Nelson Chan
52946c3e08
Feat: Translate toast messages by adding msgi18n to callbacks ( #3263 )
...
* WIP: Add msgTranslated to callbacks
* Chore: Unify Saved period
* Feat: add support for interpolation
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
Louis Lam
cd79df07e1
Add an ability to enable/disable nscd ( #3652 )
1 year ago
Nelson Chan
db42c13e05
Fix: Remove legacy unused tags cleanup ( #3651 )
1 year ago
Lior Slakman
c0e273df5b
Show hostname:port for gamedig monitor on Discord notification ( #3643 )
1 year ago
Nelson Chan
4da1341aa5
Fix: Improve dnsMessage handling ( #3614 )
1 year ago
Frank Elsinga
4d07b65bdd
fixed local docker not working anymore ( #3606 )
1 year ago
Frank Elsinga
1772158d62
fixed opsgenieRegion not being the same enum between the frontend and backend ( #3616 )
1 year ago
Louis Lam
31c00081fa
Merge branch 'master' into 2.0.X
1 year ago
zhenqiang
c0174dc1c4
fix(notification-aliyun-sms): throw error when sending SMS failed ( #3573 )
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
da4f4e3d76
Update migrations
1 year ago
Louis Lam
e001fd7d1c
incrementalVacuum for sqlite only
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
Matthew Nickson
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>
1 year ago
Nelson Chan
2921f33c24
Feat: add givenPortOnly as gamedig option ( #3532 )
1 year ago
Louis Lam
4e0bb394db
Minor
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
Louis Lam
c6e68fac97
Follow up #2852 ( #3527 )
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
Louis Lam
d231a05526
Remove babel-plugin-rewire ( #3522 )
1 year ago
Louis Lam
67b1974718
Allow specifying `DATA_DIR` without a tailing slash
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
Damon
587d9e4781
Add Flashduty notification ( #3475 )
...
* feat: add FlashDuty notification channel
* refactor: #3475 nofify with Up or Down;
refactor code;
add en zh-hk zh-tw lang
* refactor: default select Info
* refactor: add space in word
* refactor the flashduty notification code
* refactor:compatible when Test flashduty nofication
* refactor: add function param description
* refactor: revert zh-hk zh-tw changes of flashduty
1 year ago
Louis Lam
9dd652733e
Merge pull request #3467 from ngc7331/pushdeer
...
[reopened] feat: allow the user to configure PushDeer Server URL
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
7f68e4a987
Merge remote-tracking branch 'origin/master' into status-page-expiry
...
# Conflicts:
# src/lang/en.json
1 year ago
zappityzap
eb6167aaf1
Nostr dm notifications ( #3473 )
...
* 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
* better websocket polyfill, update deprecated function
* add conditional polyfills for node versions
* lint
* use correct npm for package-lock
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
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
Louis Lam
a0203372ce
Built-in nscd into the docker image (a better dns caching service) ( #3472 )
1 year ago
Raymond Hackley
5ccf2d23fc
Fix: SMTP notification "Ignore TLS Error" option ( #2999 ) ( #3465 )
1 year ago
小造xu_zh
bf68e0a7bc
fix: define pushdeerlink
1 year ago
小造xu_zh
6984596568
Apply suggestions from code review
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
1 year ago
小造xu_zh
0684313ec9
feat: remove blank characters and ending '/' first
1 year ago
小造xu_zh
d7e12dc92d
feat: allow the user to configure PushDeer Server URL
1 year ago
SGprooo
1d9a28e9ab
feat: Tailscale ping monitor ( #3178 )
...
* Add boilerplate for tailscale ping
* tailscale initial commit draft
* Refactor TailscalePing & better error handling
Split check function into two methods and added async/await syntax for readability/modularity
Switched to promise-based error handling (takes into account different types of error such as "Execution error", "Error in output", "no matching peer", and "is local Tailscale IP") and throws them as JavaScript errors.
* Minor update
* minor update (again)
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* timeout revision
* JSDoc
* Removed long explainers
* eslint tailscale-ping.js --fix
* reran eslint
* Fix: Use hostname rather than url
* Fixed NaN on monitor interval
now interval value is correctly passed to runTailscalePing
* Add warning message
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
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
25c8196641
Support Node.js 20 again ( #3431 )
...
* Support >= Node.js 20.4.0
* Improve the Node.js warning, ban 20.0 to 20.3
* Update
* Minor
1 year ago
Louis Lam
80927332cb
Merge remote-tracking branch 'origin/master' into feat/monitor-list-improved-filtering
1 year ago
Louis Lam
21d556528f
Fix #3420 timezone issue ( #3425 )
1 year ago
Louis Lam
357466cc90
Minor
1 year ago
Louis Lam
b038d09349
Minor
1 year ago
Louis Lam
c6d0c431bd
Merge pull request #3080 from duanearnett/feature/add-channel-notification-for-slack
...
Adds configurable @channel notification for Slack integrations
1 year ago
Louis Lam
345e61abca
Merge remote-tracking branch 'origin/master' into feat/badge-generator-placeholders
...
# Conflicts:
# package-lock.json
# package.json
1 year ago
Louis Lam
dd1526deff
Merge pull request #3421 from louislam/some-update
...
Some update
1 year ago
Louis Lam
be26bb75d9
Update version handling
1 year ago
Louis Lam
99fb5836e2
Add SMSC (СМСЦентр) provider notification ( #3335 ) By @FlatronBuda
...
* Add SMSC, code from #3334
Co-authored-by: FlatronBuda <>
* Update server/notification-providers/smsc.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/notification-providers/smsc.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/notification-providers/smsc.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update according to @FlatronBuda
* Move to the regional list
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
1 year ago
Louis Lam
2f5a565ce4
Merge pull request #3381 from n-thumann/fix_ipv6_handling
...
Fix handling of IPv6 addresses in getClientIP
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
e5c6783781
Merge pull request #3205 from woj-tek/master
...
Add option to use ApiKeys in Twilio in addition to main account credentials
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
293015ff35
Parse `x-www-form-urlencoded` for /test-webhook
1 year ago
Louis Lam
18d8b3a8e0
Merge remote-tracking branch 'origin/master' into feat/webhook-custom-body
1 year ago
Louis Lam
cdb38d49eb
Merge pull request #3380 from chakflying/experiment/incremental-vacuum-job
...
Feat: Run incremental_vacuum and optimize
1 year ago
Louis Lam
fe40d819bd
Update send403 to sendHttpError
1 year ago
Louis Lam
3dbd8277f0
Merge remote-tracking branch 'origin/master' into feat/global-status-page-badge
...
# Conflicts:
# .gitignore
1 year ago
Louis Lam
ed6b4e5ae5
Merge remote-tracking branch 'origin/master' into miles/invert-keyword
...
# Conflicts:
# server/database.js
1 year ago
Louis Lam
3b9c95a8a8
Prevent users from specifying an unexpected executable as Chromium ( #3348 )
1 year ago
nthumann
cdf6922bdd
Fix handling of IPv6 addresses in getClientIP
1 year ago
Nelson Chan
9954ba82e7
Feat: Run incremental_vacuum and optimize
1 year ago
Louis Lam
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
1 year ago
Tarun Singh
4ea5771f97
Status page certificate expiry
1 year ago
DevMirza
1774bb86dc
🐛 fix lint warning ( #3355 )
1 year ago
Francisco Marques
bd5496d267
Fixed update checker making requests to uptime.kuma.pet even when turned off ( #2281 )
...
* fix: update checker
- fixed bug where it would make the request to uptime.kuma.pet regardless of the `checkUpdate` config;
- defined constants in the top of the document for easier configuration/documentation;
- removed unnecessary compareVersions: we were comparing the same var on both sides res.data.beta, so it will always be equal.
* improvement: better logging and added doc
* improved UPDATE_CHECKER_INTERVAL_MS const
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
Louis Lam
df8fcffb19
Drop unused code
1 year ago
Louis Lam
8c60e902e1
Remove an unused variable
1 year ago
Louis Lam
ccc39b9516
Move all old db patch files to `db/old_migrations/`
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
e26abc3156
Improve the setup database
1 year ago
Louis Lam
d286c534bd
Improve the setup database for embedded MariaDB
1 year ago
Louis Lam
7975caf29e
Update db migration and dockerfile
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
9ee2780e9e
Merge pull request #2871 from pruekk/chore/missing-notificationList
...
chore: notification toggle missing when import from backup
1 year ago
Nelson Chan
a386f1fc9e
[Experiment] Use incremental vacuum to speed up delete? ( #2800 )
...
* DB: Use incremental vacuum
* Chore: Add log for delete monitor exec. time
* WIP: Test synchronous NORMAL
1 year ago
Nelson Chan
3e5e7e6e32
Fix: Incorrect options for cert-exp badge
1 year ago
Nelson Chan
0e725569e5
Feat: Add placeholders for badge generator
...
Chore: Save as dev dep.
1 year ago
Louis Lam
2e2747fb52
Handling DATE_ADD
1 year ago
Louis Lam
5388a37a26
Fix port NaN not working in MariaDB
1 year ago
Louis Lam
4f6035899d
Real browser monitor type ( #3308 )
1 year ago
Louis Lam
dd77baabe1
Merge pull request #3234 from kefoster951/fix_redis_auth
...
Fix redis authentication reattempt issue
1 year ago
Louis Lam
820f2eec9f
Merge remote-tracking branch 'origin/1.23.X'
1 year ago
Nelson Chan
7cc9783436
Fix: Active needs to return bool instead of 0
1 year ago
Louis Lam
b4b6e07e6b
Merge pull request #3310 from chakflying/chore/auth-logging
...
Chore: Add logging for failed auth
1 year ago
Tarun Singh
7a34103da6
Added fix to remove children when type changed
1 year ago
Nelson Chan
c9d6e576ab
Chore: Remove redundant assign
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
1 year ago
Nelson Chan
97d38ee1a8
Feat: Add custom body for Webhook Notif.
1 year ago
Nelson Chan
cc94609423
Chore: Add logging for failed auth
1 year ago
Lasse Bang Mikkelsen
a00561ff09
Strip trailing slashes to avoid 404
2 years ago
Kenneth Foster
6708eed121
Fixed error handling if client is closed
2 years ago
kefoster951
3c56a6f395
Merge branch 'louislam:master' into fix_redis_auth
2 years ago
Louis Lam
2b46693995
Merge pull request #3239 from madnight/master
...
Fix: prometheus monitor_status metric has 4 values
2 years ago
kefoster951
d37c33ad42
Update server/util-server.js
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2 years ago
Louis Lam
c4c3fc81b2
Merge pull request #2693 from julian-piehl/group-monitors
...
Group monitors
2 years ago
Fabian Beuke
37ae8eb44a
Fix: prometheus monitor_status metric has 4 values
...
The prometheus monitor_status metric has actually 4 values. This can easily be verified by looking up the related source code or by using the metric in grafana an see values like 2 (which indicates timeout).
2 years ago
Kenneth Foster
8897385690
Fixed linting
2 years ago
Kenneth Foster
6132a45c7c
fixed when auth is needed but not provided
2 years ago
Kenneth Foster
f68452c47a
Added changes to stop auth attempts after an error
2 years ago
Nelson Chan
58ec53fb1d
Fix: Try to close mysql connection properly
2 years ago
duane
9a8bea5761
Changes 'Mention Channel' -> 'Notify Channel'
...
- Updates variable names
- Updates any Slack mention references
2 years 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
duane
376d84c742
Merge branch 'master' into feature/add-channel-notification-for-slack
2 years ago
Louis Lam
343a1d3344
Merge pull request #3203 from CommanderStorm/applied_timezone_formatting
...
chore: Made sure that every notification provider uses `timezone`/`localTime`
2 years ago
Wojciech Kapcia
f3fe392ec4
Add option to use ApiKeys in Twilio in addition to main account credentials
2 years ago
Frank Elsinga
f3c09f2bbd
made every Notification provider supply time like dingding after #3152
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
Louis Lam
bc95875aa0
Merge pull request #3156 from maximilian-krauss/feat/add-pushover-ttl
...
feat: Adds message ttl to pushover notification
2 years ago
Louis Lam
c1efe0f26d
Add a warning for Node.js >= 20
2 years ago
Maximilian Krauß
a0d0d5b015
fix: sends pushover ttl only if defined
2 years ago
Maximilian Krauß
8d05d80a5f
feat: Adds message ttl to pushover notification
2 years ago
duane
5200e10aab
Removes ternary operator for Slack channel mention
2 years ago
Nelson Chan
f1a396b0f7
Fix: Align radius timeout to default
2 years ago
Nelson Chan
f70b971810
Fix: Improve error message
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2 years ago
duane
00f733d352
Adds ability to notify channel when Slack webhook triggered
...
- Adds field to toggle channel mentions on/off for Slack integration
- Adds special mention for @channel when enabled
Reference:
[Slack docs](https://api.slack.com/reference/surfaces/formatting#special-mentions )
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
bb15fa0179
Merge pull request #3154 from chakflying/fix/clear-data-remove-worker-thread
...
Fix: Remove use of worker threads in clear-old-data
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
Nelson Chan
80c8fd7372
Chore: Remove util-worker
2 years ago
Nelson Chan
a27386bb92
Fix: Use croner for clear-old-data
2 years ago
AnnAngela
ce70b3fc62
feat: add a space to separate the words
2 years ago
AnnAngela
06fba5b55a
feat: show time as server timezone in dingding notification
2 years ago
Louis Lam
7f5d0e5490
Merge remote-tracking branch 'origin/1.21.X'
...
# Conflicts:
# package-lock.json
2 years ago
Louis Lam
0eaaa8b6fa
Minor
2 years ago
Louis Lam
5cd506e340
Minor
2 years ago
Louis Lam
f0beccf6bf
Fix `Same As Server Timezone` do not save correctly
2 years ago
Louis Lam
72c16c3aa2
Fix eslint warnings
2 years ago
Louis Lam
d23cb0b382
Fix maintenance do not start after 1.21.2
2 years ago
Louis Lam
8207f16396
Merge remote-tracking branch 'origin/master' into ntfy-bearer-authorization
2 years ago
Christopher Wilkinson
0e516a42e5
Trim before truncating "keword not found" message
2 years ago
Louis Lam
6356b1e50a
Merge pull request #2961 from chakflying/feat/flush-wal
...
Chore: Flush WAL on shutdown
2 years ago
Josua Frank
11f4cb8725
Merge branch 'louislam:master' into ntfy-bearer-authorization
2 years ago
Louis Lam
4c1ac5e870
Merge pull request #2863 from mtelgkamp/ntfy-notification-improvements
...
Improve ntfy notifications
2 years ago
Louis Lam
9e320dc5fb
Expose timezone and local datetime to notification providers
2 years ago
Louis Lam
2f3f929fbd
Merge pull request #2831 from mtelgkamp/mattermost-notification-improvements
...
Improve mattermost notifications
2 years ago