719ef856e8
Merge manually
11 months ago
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
11 months ago
530c8e5328
Drop cacheable-lookup ( #4178 )
...
* WIP
* WIP
11 months ago
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
11 months ago
2815cc73cf
Merge pull request from GHSA-mj22-23ff-2hrr
...
* WIP
* WIP
* Handle parsing error
* Fix matching origin issue
11 months ago
ad4629cb03
Fix UPTIME_KUMA_DB_NAME issue ( #4169 )
11 months ago
db7a92a74c
🐛 fix(remote-browser): Remove unused test() function ( #4155 )
...
* fix
* fix lint
* Update Notifications.vue
* Update ActionInput.vue
11 months ago
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>
11 months ago
35479c7690
Fix: Disable timezone conversion for mariadb ( #3756 )
11 months ago
c5d9c54a04
Merge branch 'master' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# package.json
11 months ago
81c9900e23
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# docker/debian-base.dockerfile
11 months ago
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.
11 months ago
9fb95fe95e
Add support for /snap/bin/chromium ( #4141 )
11 months ago
1708b67949
Change execSync/spawnSync to async ( #4123 )
...
* WIP
* Add missing await
* Update package-lock.json
11 months ago
01855e0ffe
monitor path as a notification title mattermost ( #3801 )
11 months ago
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>
11 months ago
b8bd17ddbd
Fix: Add timeout to testDockerHost ( #4097 )
11 months ago
5bc8c0c66f
Merge 1.23.7 ( #4102 )
...
1.23.x merge to 2.x.x
11 months ago
60be875edd
Fix a merge issue
11 months ago
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
11 months ago
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
11 months ago
711380bbbe
Merge pull request #4095 from louislam/update-3
...
Rewrite Tailscale ping using spawnSync
11 months ago
9536c6aa6a
Minor
11 months ago
4255496b11
Rewrite Tailscale ping using spawnSync
11 months ago
f28dccf4e1
Merge pull request from GHSA-v4v2-8h88-65qj
11 months ago
b689733d59
Fix getGameList, testChrome without checkLogin
11 months ago
121d1a11af
Revert "Restart running monitors if no heartbeat ( #3952 )" ( #4088 )
...
This reverts commit c43223a16d
11 months ago
8e61158758
Close the client postgresql connection after rejection. ( #4084 )
...
Co-authored-by: Manuel Vázquez Acosta <manuel@merchise.org>
11 months ago
bf58838b89
+10 seconds for Abort signal ( #4053 )
...
* Debug only
* Remove debug
11 months ago
33ce0ef02c
Fix: Improve error message on timeout ( #4054 )
...
* Fix: Improve error message on timeout
* Chore: Format
12 months ago
92e0eec6d4
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# package.json
# server/model/monitor.js
12 months ago
954e05b72f
Fix #4051
12 months ago
2aa15ea635
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# server/database.js
12 months ago
f0975cd929
Should be a final ulitmate fix for request timeout issue ( #4045 )
...
* Try to fix timeout again
* Ops
12 months ago
b383392e8f
Remains Node.js 16' SSL behavior for 1.23.X ( #4044 )
12 months ago
9964b6c4d8
Fix: Update monitor object on pause ( #4032 )
12 months ago
188fdcb6ad
Merge branch 'master' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# server/model/monitor.js
# server/util-server.js
12 months ago
65cbc7b318
Migrate kafka_producer patch
12 months ago
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
12 months ago
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>
12 months ago
6e80c850f4
Should be an ulitmate fix for request timeout issue ( #4011 )
12 months ago
38efd97b28
Fix: Support float ping in push route ( #3987 )
12 months ago
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
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
fdfb572e09
Fix: Add axios abort signal ( #3961 )
...
* Fix: Add axios abort signal
* Chore: Fix comment
1 year ago
c43223a16d
Restart running monitors if no heartbeat ( #3952 )
1 year ago
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
ddd135efa8
Confirm chrome path in macOS is correct ( #3950 )
1 year ago
9379498b49
Chore: Allow MS Edge for real-browser monitor ( #3941 )
1 year ago
1a862e47ab
Check if the password changed when user is not null
1 year ago
87b2e45fbf
Check if the password changed when user is not null
1 year ago
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
8412e19fe6
Add a comment
1 year ago
bbaba29222
Set default ua for axios: `Uptime-Kuma/version` instead of `axios/version`
1 year ago
e11aad2d60
Add some comments
1 year ago
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
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
18169c59a1
[MySQL monitor] Split password into a standalone field ( #3899 )
1 year ago
966dfa6f88
Drop backup ( #3892 )
...
* Drop backup
* Fix warning
1 year ago
a362206fab
Fix: do not colorize non-string log message
1 year ago
03e43ab364
Log color and simplify startup log for production ( #3889 )
1 year ago
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
aa676150eb
Fix shutdown issue and tidy up
1 year ago
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
c39043ec32
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# package-lock.json
1 year ago
852b3fa61b
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/server.js
# server/util-server.js
1 year ago
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
5b7206f8e2
Fix: Wrong datatype for avgPing ( #3724 )
1 year ago
6875ecdfbf
Fix warnings ( #3826 )
1 year ago
2267655e99
Chore: Add remaining server translation keys ( #3684 )
1 year ago
98b93c887a
Show push example under the detail page ( #3739 )
1 year ago
0fe8d04f78
made the way telegram handles axios errors like all the other notification providers ( #3623 )
1 year ago
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
90d0e8ccde
Enable status page certificate expiry badge for all HTTP(s) monitors ( #3649 )
1 year ago
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
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
16a396debb
Similar to #3763 , but for 1.23.3
1 year ago
2ef759a362
Allow missing patch files for downgrade or testing pr.
1 year ago
33cc96f918
Fix: subtract time taken to run heartbeat ( #3072 )
1 year ago
59119b9e71
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
1 year ago
ff51704cdf
Fix #3712
1 year ago
33804d8823
fix: respect the user defined oauth2 auth method ( #3727 )
1 year ago
83d91dbb1b
Set mariadb timezone to UTC using +00:00 ( #3723 )
1 year ago
0af4ee6c34
Fix: Missing await for isActive ( #3717 )
1 year ago
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
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
d6302198f3
chore(jsdoc):Linting fixes ( #3703 )
...
* fixed the lockfile having a different version
* jsdoc
1 year ago
f3e1a9c61a
Fix: Incorrect database check in sqlHourOffset ( #3706 )
1 year ago
9c61247162
Fix #3679
1 year ago
ed04008569
Remove incorrect warning
1 year ago
f3517bc08d
Fix avg ping
1 year ago
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
5061e42d4b
Merge remote-tracking branch 'origin/2.0.X' into 2.0.X
1 year ago
076331bf00
Uptime calculation improvement and 1-year uptime ( #2750 )
1 year ago
a13fc7079e
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
1 year ago
cd79df07e1
Add an ability to enable/disable nscd ( #3652 )
1 year ago
db42c13e05
Fix: Remove legacy unused tags cleanup ( #3651 )
1 year ago
c0e273df5b
Show hostname:port for gamedig monitor on Discord notification ( #3643 )
1 year ago
4da1341aa5
Fix: Improve dnsMessage handling ( #3614 )
1 year ago
Louis Lam
DevMirza
Nelson Chan
Adam Hancock
Nenad Gal
dakriy
Muhammed Hussein karimi
Chongyi Zheng
atmaniak
Frank Elsinga
前端小武
Adam Stachowicz
Marvin A. Ruder
Henrik Gerdes
Anders Kvist
Lior Slakman