4042c26390
Fix 'undefined' in link preview generation
2022-11-14 18:05:52 +01:00
cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol
...
Feat/add gRPC protocol
2022-11-11 12:34:35 +08:00
68862c0b3f
Fix Pushbullet do not handle general message correctly and fix name convention ( Close #1890 )
2022-11-01 20:27:40 +08:00
fd15e7c2dc
Merge remote-tracking branch 'origin/master' into ntfy-icon
...
# Conflicts:
# server/notification-providers/ntfy.js
# src/components/notifications/Ntfy.vue
# src/languages/en.js
2022-10-31 17:10:20 +08:00
5c4cf68937
Merge pull request #2260 from m-kiszka/smseagle
...
Added support for SMSEagle device API notifications
2022-10-31 17:03:34 +08:00
b459408b10
fix: resolve conflict
2022-10-26 20:41:21 +07:00
134b3b8ac1
Fix 'dayjs' is never used warning
2022-10-25 01:27:25 +02:00
08763b700a
Added support for SMSEagle device API notifications
2022-10-24 12:45:56 +02:00
24cb212a37
Fix recurring
2022-10-15 20:15:50 +08:00
d8a676abb6
Implement recurring day of month and day of week
2022-10-15 18:49:09 +08:00
0b8d4cdaac
Generate Next Timeslot for recurring interval
2022-10-15 17:17:26 +08:00
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2022-10-15 15:57:39 +08:00
f459ea845c
Added #2182 Add support for custom radius ports ( #2197 )
...
This commit adds support for the port to be specified when using the
radius monitor type. A check has been implemented to ensure that a null
value is not passed to the radius check function as could occur with
monitors that were created before this change was introduced. The
default port of 1812 is displayed when the user selects the radius
monitor in much the same way as the DNS port is handled. The port was
not included in the hostname in the form hostname:port in order to avoid
issues with IPv6 addresses and monitors that had been created before
this change was implemented.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-13 00:32:05 +08:00
b24c75eec5
Merge pull request #2162 from UltraWelfare/fix-entry-page-redirect
...
Fixed entry route not redirecting correctly.
2022-10-13 00:28:34 +08:00
edacff123b
Add UTC in the serverTimezone dropdown
2022-10-12 22:13:07 +08:00
2faf866e9e
Implement generateTimeslot() for recurring interval type
2022-10-12 17:02:16 +08:00
7b9766091e
Revert testing
2022-10-11 22:18:09 +08:00
39b6725163
Update maintenance tables
2022-10-11 21:48:43 +08:00
dfb75c8afb
Update status page's maintenance message
2022-10-11 20:56:48 +08:00
e07aa982c3
WIP
2022-10-11 18:23:17 +08:00
1e8a16504b
Make icon optional for ntfy notificaation provider. Add Icon header to ntfy request only, if icon is actually defined.
2022-10-11 11:15:33 +02:00
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2022-10-11 14:52:47 +08:00
c84de4d259
WIP: Add maintenance status
2022-10-11 01:45:30 +08:00
c1ccaa7a9f
WIP
2022-10-10 20:48:11 +08:00
539683f8e9
Merge remote-tracking branch 'origin/master' into maintenance
2022-10-10 16:50:25 +08:00
71af23cf00
Fix #2207
2022-10-10 02:47:24 +08:00
a577fba848
Change DateTime Range using serverTimezone
2022-10-10 02:28:03 +08:00
a36f24d827
Add configurable server timezone
2022-10-09 20:59:58 +08:00
b007681e67
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/model/monitor.js
# server/model/status_page.js
# src/languages/en.js
2022-10-09 19:26:00 +08:00
ad1a7c255f
Drop exports.entryPage fully
2022-10-08 23:56:58 +08:00
6e07ed2081
Fix #2186
2022-10-07 15:02:19 +08:00
959ecc65ff
Merge remote-tracking branch 'origin/master'
2022-10-06 23:28:29 +08:00
c24b64921d
Fix #2183 ntfy issue
2022-10-06 23:28:06 +08:00
b879428a03
feat(notification): add additional Header to webhook
2022-10-05 17:48:07 +02:00
c28d8ddff9
Correctly handle multiple IPs in X-Forwarded-For ( #2177 )
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-10-05 23:45:21 +08:00
3c5de1c889
Merge branch 'master' of https://github.com/louislam/uptime-kuma into feat/add-auth-header-to-webhook-notification-#1919
2022-10-05 16:44:13 +02:00
528a615fb2
Add free.fr SMS notification provider ( #2159 )
2022-10-05 17:30:49 +08:00
b993859926
Drop Jest e2e testing ( #2174 )
2022-10-05 14:26:30 +08:00
f1a9046193
Prevent terminal window from showing when using ping on Windows ( #2152 )
2022-10-04 23:30:19 +08:00
c538983b87
Merge pull request #2169 from louislam/fix-docker-monitor
...
Fix Docker container monitor not working in 1.18.1
2022-10-04 17:47:56 +08:00
0686757160
[Docker Monitor] Change `tcp://` to `http://`
2022-10-04 16:19:56 +08:00
3e699f8ac3
Fix linting errors.
2022-10-03 18:01:52 +03:00
b0d6b5b13d
Fixed entry route not redirecting correctly when the status entry page changes slug.
2022-10-03 17:48:34 +03:00
3e85893bdd
Merge remote-tracking branch 'origin/master' into squadcast-notification-support
...
# Conflicts:
# src/languages/en.js
2022-10-03 16:16:50 +08:00
543a74ecab
Merge pull request #1923 from rolfbachmann/ntfy-auth-support
...
Add authentication support for ntfy
2022-10-03 15:54:55 +08:00
62ad2f9bb4
Merge pull request #2148 from Computroniks/bug/octopush-notifications-#2144
...
Fixed octopush legacy doesn't return error code
2022-10-03 15:53:54 +08:00
0f99d49a27
Merge remote-tracking branch 'origin/master' into ntfy-auth-support
2022-10-03 15:30:00 +08:00
d93f7b33be
Merge pull request #2153 from Computroniks/bug/#2009-teams-unnecessary-url-field
...
Fixed alert features unnecessary URL field #2009
2022-10-03 15:20:45 +08:00
a42f7416b5
Improve the URL field in Discord embeds
...
Instead of having two different ways of showing the URL field in Discord embeds, always show the raw address.
2022-10-02 19:29:33 +02:00
6a3eccf6a6
Fixed alert features unnecessary URL field #2009
...
The filling of the URL field was incorrect previously. It has been
updated to handle new monitor types.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-02 02:26:38 +01:00
f9be918246
Add support for MySQL/MariaDB databases #1817
...
This commit adds support for monitoring MySQL and MariaDB database
servers. The mysql2 package was choosen over mysql as it provides a
promise wrapper and is reportedly faster than the original mysql package
whilst still maintaining the same API.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-02 01:52:53 +01:00
97de3959cd
Updated octopush error handling to accept 000
...
The legacy octopush API includes an error code with all responses. A
code other than 000 is an error.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-01 19:48:00 +01:00
63e408f4f2
Fixed octopush legacy doesn't return error code
...
The octopush legacy API does not return a HTTP error code and instead
always returns a HTTP 200. This means that no error it thrown even if
something like the parameters are incorrect.
Instead the error code is given in the json response data.
Therefore we must look at the response data and check for the presence
of the "error_code" key in the response data.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-01 15:42:34 +01:00
2e54dee817
Fixed Octopush Notifier not working #2144
...
The version number was passed as a string from the frontend but was
checked against a number in the backend provider. This caused the if else
if to fall through into an error. The literal it is now being compared
has been changed to a string and the unknown version error is no longer
encountered.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-01 15:03:28 +01:00
e12642cf21
Fix double quotes in fallback for no icon url in ntfy notification provider settings
2022-09-28 10:24:56 +02:00
6f86236b63
Add support for icon to ntfy notification provider (requires minimum ntfy server version 1.28.0 and Android app 1.14.0, no iOS support as of today)
2022-09-28 10:13:18 +02:00
204339fbed
Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss
2022-09-28 00:48:15 +08:00
b1465c0282
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
...
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2022-09-28 00:20:17 +08:00
4002b9f577
[WIP] Checking maintenance time using maintenance_timeslot table
2022-09-27 20:44:44 +08:00
bef9cb6a5f
Linting fixes
2022-09-26 22:30:43 +13:00
4157c7d546
Add support for Squadcast incoming webhook
2022-09-26 22:16:34 +13:00
3f63cb246b
[WIP] Handle timezone offset for timeRange
2022-09-25 19:38:28 +08:00
f11dfc8f43
[WIP] Add/Edit Maintenance with new UI and recurring
2022-09-24 19:18:24 +08:00
9d99c39f30
Update Maintenance UI for recurring
2022-09-24 02:33:29 +08:00
b03624b7e3
feat: Add ServerChan Notification support
2022-09-23 23:27:22 +08:00
120e578398
Move maintenance code to `maintenance-socket-handler.js`
2022-09-17 16:58:08 +08:00
7017c2e625
Move maintenance code to `maintenance-socket-handler.js`
2022-09-17 16:54:21 +08:00
2f67d26702
Merge manually, as this part had been moved
2022-09-17 16:20:10 +08:00
90761cf831
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/HeartbeatBar.vue
# src/components/MonitorList.vue
# src/icon.js
# src/layouts/Layout.vue
# src/mixins/datetime.js
# src/mixins/socket.js
# src/router.js
# src/util.js
2022-09-17 16:12:57 +08:00
f96bad1629
Merge pull request #2089 from jakubenglicky/smsmanager
...
feat: Add support notification via SMSManager
2022-09-16 14:29:50 +08:00
38c45a3fe3
Fix previously PR bug about Bark Notification ( #2084 )
...
Co-authored-by: zuosc <zorro.zsc@hotmail.com>
2022-09-16 14:21:22 +08:00
2d5096317f
Fix warning at goalert.js
2022-09-15 09:11:27 +02:00
1c3da995e3
Add support notification via SMSManager
2022-09-15 09:11:05 +02:00
197d44981f
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
...
# Conflicts:
# package.json
2022-09-09 16:32:23 +08:00
1e5376d80b
Merge pull request #2011 from mhkarimi1383/goalert-notification
...
Adding GoAlert Notification
2022-09-09 03:34:37 +08:00
84fad93555
Merge pull request #1735 from woooferz/patch-1
...
Added label to status badge
2022-08-29 21:19:15 +08:00
a8ea76e8a1
Remove extra debug log
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-08-26 17:05:32 +04:30
584d52517a
[Linter] fixing quotes with doublequote
2022-08-24 10:41:42 +04:30
82dd9a7c16
golaert req fix and axios update for formdata
2022-08-24 10:36:29 +04:30
d44663c57c
provider name fix
2022-08-24 09:37:15 +04:30
e557545c97
goalert needs post instead of get
2022-08-24 08:46:20 +04:30
40b9d9ed17
goalert provider missing semicolon fix for linter
2022-08-23 22:26:20 +04:30
65e6921a41
goalert notification provider added
2022-08-23 22:22:54 +04:30
3a90d246a4
fix: wrong type
2022-08-20 22:45:11 +07:00
6bb79597e8
fix: resolve merge conflict
2022-08-13 13:26:05 +07:00
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2022-08-13 13:24:00 +08:00
3b3763351b
Merge remote-tracking branch 'origin/master' into radius-check
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
# src/pages/EditMonitor.vue
2022-08-11 21:08:06 +08:00
34ab6142db
fix: remove new space line
2022-08-08 19:38:43 +07:00
9a488d6968
Merge pull request #1752 from SuperManito/master
...
Add Bark Notification Parameters
2022-08-08 17:04:08 +08:00
aca395cea1
Merge pull request #1957 from jbenguira/patch-2
...
Avoid error "SQLITE_BUSY: database is locked"
2022-08-08 17:00:06 +08:00
a49faf09b9
Merge pull request #1836 from rmtsrc/add-home-assistant-notification
...
feat: added Home Assistant notification integration
2022-08-06 18:08:06 +08:00
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2022-08-05 15:40:06 +08:00
2232236a7a
[empty commit] pull request for add gRPC protocol
2022-08-03 13:39:31 +07:00
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2022-08-03 12:00:39 +07:00
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2022-08-02 19:08:46 +08:00
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-08-01 13:18:19 +03:00
fb3fe17c28
Fix getClientIP
...
Co-authored-by: Mateusz Hajder <6783135+mhajder@users.noreply.github.com>
2022-08-01 15:42:58 +08:00
71d62ee151
removed ; after the PRAGMA command
2022-07-31 19:00:19 +03:00
82b9bfc5a0
fixed Trailing spaces not allowed lint issue
2022-07-31 18:59:02 +03:00
f016caa513
Avoid error "SQLITE_BUSY: database is locked"
...
Avoid error "SQLITE_BUSY: database is locked" by allowing SQLITE to wait up to 5 seconds to do a write
2022-07-31 18:51:53 +03:00
2389b604fe
Use Settings.get
2022-07-31 23:41:29 +08:00
a3b1612938
getClientIP respect trustProxy setting
2022-07-31 23:36:33 +08:00
a07f54f35b
Merge remote-tracking branch 'origin/master' into theS1LV3R_master
2022-07-31 23:27:35 +08:00
bea8679788
Merge branch 'master' into issue-1861
2022-07-31 20:06:45 +08:00
f091e92c70
Merge branch 'master' of github.com:rmtsrc/uptime-kuma into add-home-assistant-notification
2022-07-31 12:41:18 +01:00
8ced61697a
Fix save docker host issue
2022-07-30 19:48:12 +08:00
f3322398e5
Fix and improve test docker host
2022-07-29 20:57:13 +08:00
4575f31094
Add support for line notify providers ( #1781 )
...
* add line notify support
* add way to get line notify
* Fix duplicate key 'HTTP Basic Auth'
* Revert language files changes
* Revert language files changes
* Fix general message
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-07-29 15:13:50 +08:00
60e7824ff0
Merge branch 'master' into master
2022-07-24 14:37:22 +02:00
fb3b407577
Added a settings page & localization
2022-07-24 12:34:43 +00:00
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2022-07-24 14:07:30 +08:00
e356d5f623
Fixing linting & adding documentation
2022-07-22 15:57:40 +00:00
0d098b0958
Docker Hosts are now a table & have their own dialog
2022-07-22 15:47:04 +00:00
239611a016
Do not set sendUrl if sendUrl is undefined
2022-07-22 23:27:02 +08:00
c4a2ce4e78
Add authentication support for ntfy
2022-07-19 12:17:15 +02:00
a382f811f4
added comment to startE2eTests function
2022-07-18 20:51:17 +02:00
986c03aecd
test cypress run
2022-07-18 20:51:17 +02:00
af07c7f050
feat(notification): add Authorization Header option to backend
2022-07-18 16:04:27 +00:00
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2022-07-18 23:46:55 +08:00
17ed051401
Add CacheableDnsHttpAgent.install()
2022-07-18 23:32:45 +08:00
1999541802
Merge remote-tracking branch 'origin/master' into dns
2022-07-18 23:25:14 +08:00
65d71e5db0
Fix mssqlQuery keep adding error listener, which causes memory leak.
...
Also it is not necessary since the error catched in the promise .catch(..).
2022-07-18 23:14:16 +08:00
2073f0c284
Bind cacheable-lookup to custom http agent
2022-07-18 22:33:35 +08:00
25d711e683
Fix jsdoc data type
2022-07-18 22:06:25 +08:00
d362372b05
Merge pull request #1749 from daeho-ro/feature/alertnow
...
Feat: New Notification Type for AlertNow
2022-07-14 15:04:35 +08:00
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2022-07-12 22:59:23 -04:00
f33b6de157
Support X-Forwarded-Host header
2022-07-11 01:28:50 -04:00
d29955f3ba
Merge pull request #1741 from Computroniks/feature/#1221-clickable-hostaname-on-status-page
...
Added #1221 clickable hostname in status page
2022-07-06 15:09:26 +08:00
c4125a8334
style: fix linter error
2022-07-04 20:38:44 +02:00
0a368ff553
feat: add x-real-ip as a secondary header for client ip
...
Now allows both x-forwarded-for as well as x-real-ip to be used for the client ip, preferring x-forwarded-for
2022-07-04 20:36:03 +02:00
27dbc021b4
Add standalone manifest.json for each status page. Close #1668
2022-07-04 21:58:27 +08:00
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2022-07-04 18:21:56 +08:00
e5e8db6c38
Add cacheable-lookup
2022-06-29 22:17:47 +08:00
dddd2c0042
Cache settings, reduce the database / disk usage
2022-06-29 16:18:56 +08:00
515095ecfb
Move all settings code from `util-server.js` into `settings.js`
2022-06-29 14:57:40 +08:00
1af6d33fcd
Make sure the backup database process is actually created backup files. Improve https://github.com/louislam/uptime-kuma/issues/1412#issuecomment-1166576395
2022-06-28 22:11:59 +08:00
f84ae82983
feat: added Home Assistant notification integration
2022-06-25 21:27:30 +01:00
6f01a448ad
feat: get client ip from x-forwarded-for header if available
...
Useful for use-cases where Uptime Kuma is running behind a reverse proxy
2022-06-23 23:08:04 +02:00
1f5466a3e8
Revert #1598
2022-06-23 15:54:33 +08:00
c36d9a4b8b
Fix port data type #1802
2022-06-21 22:33:09 +08:00
7ba717ee55
Fix Lunasea do not handle general message correctly #1790
2022-06-21 15:12:24 +08:00
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2022-06-18 23:53:35 +01:00
b97019eea8
Fix cloudflared cannot be stopped in No Auth mode due to password checking
2022-06-18 19:06:03 +08:00
47e82ed83a
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-15 20:14:36 -05:00
e1f766756f
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-15 20:14:26 -05:00
edcdedcaae
Added check for blank password.
2022-06-15 13:00:14 -05:00
945288f0c0
Added postgres monitor
2022-06-15 12:12:47 -05:00
ac27e6e2af
Rename feature to: Resend Notification if Down X times consequently
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-06-15 17:50:35 +02:00
869a040011
Merge branch 'master' into introduce-resend-interval
2022-06-15 16:19:47 +02:00
fdbdf83a0d
Fix data type of `notification.isDefault` and `notification.active` ( #1765 )
2022-06-15 19:11:52 +08:00
Dafnik
Louis Lam
minhhn3
Adam Stachowicz
Marcin Kiszka
Matthew Nickson
Christian Meis
janhartje
Ben Scobie
CL0Pinette
Sympatron GmbH
George Tsomlektsis
Mikkel-T
Patrick
MA Junyi
Super Manito
jakubenglicky
Muhammed Hussein karimi
Minh Hoàng
Joseph Benguira
rmt/src
0x01code
Moritz R
c0derMo
Rolf Bachmann
tamasmagyar
Jan Hartje
Chongyi Zheng
theS1LV3R
sur.la.route
OidaTiftla
OidaTiftla