MA Junyi
b03624b7e3
feat: Add ServerChan Notification support
2022-09-23 23:27:22 +08:00
Louis Lam
120e578398
Move maintenance code to maintenance-socket-handler.js
2022-09-17 16:58:08 +08:00
Louis Lam
7017c2e625
Move maintenance code to maintenance-socket-handler.js
2022-09-17 16:54:21 +08:00
Louis Lam
2f67d26702
Merge manually, as this part had been moved
2022-09-17 16:20:10 +08:00
Louis Lam
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
Louis Lam
f96bad1629
Merge pull request #2089 from jakubenglicky/smsmanager
...
feat: Add support notification via SMSManager
2022-09-16 14:29:50 +08:00
Super Manito
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
jakubenglicky
2d5096317f
Fix warning at goalert.js
2022-09-15 09:11:27 +02:00
jakubenglicky
1c3da995e3
Add support notification via SMSManager
2022-09-15 09:11:05 +02:00
Matthew Nickson
742b1337be
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-09-10 21:20:03 +01:00
Louis Lam
197d44981f
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
...
# Conflicts:
# package.json
2022-09-09 16:32:23 +08:00
Louis Lam
1e5376d80b
Merge pull request #2011 from mhkarimi1383/goalert-notification
...
Adding GoAlert Notification
2022-09-09 03:34:37 +08:00
Justin Tisdale
fa1fc0fb05
Merge branch 'master' into feature/expand-http-payload-support
2022-09-07 11:34:58 -04:00
Louis Lam
84fad93555
Merge pull request #1735 from woooferz/patch-1
...
Added label to status badge
2022-08-29 21:19:15 +08:00
Muhammed Hussein karimi
a8ea76e8a1
Remove extra debug log
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-08-26 17:05:32 +04:30
Muhammed Hussein Karimi
584d52517a
[Linter] fixing quotes with doublequote
2022-08-24 10:41:42 +04:30
Muhammed Hussein Karimi
82dd9a7c16
golaert req fix and axios update for formdata
2022-08-24 10:36:29 +04:30
Muhammed Hussein Karimi
d44663c57c
provider name fix
2022-08-24 09:37:15 +04:30
Muhammed Hussein Karimi
e557545c97
goalert needs post instead of get
2022-08-24 08:46:20 +04:30
Muhammed Hussein Karimi
40b9d9ed17
goalert provider missing semicolon fix for linter
2022-08-23 22:26:20 +04:30
Muhammed Hussein Karimi
65e6921a41
goalert notification provider added
2022-08-23 22:22:54 +04:30
minhhn3
3a90d246a4
fix: wrong type
2022-08-20 22:45:11 +07:00
Justin Tisdale
6ec6410808
Merge branch 'master' into feature/expand-http-payload-support
2022-08-20 10:24:18 -04:00
Matthew Nickson
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-08-13 21:15:16 +02:00
minhhn3
6bb79597e8
fix: resolve merge conflict
2022-08-13 13:26:05 +07:00
Louis Lam
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2022-08-13 13:24:00 +08:00
Justin Tisdale
31cc328839
fix lint
2022-08-11 21:08:13 -04:00
Justin Tisdale
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2022-08-11 21:04:11 -04:00
Justin Tisdale
2b9bf095a6
Add non-json support for http body
2022-08-11 20:57:03 -04:00
Louis Lam
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
minhhn3
34ab6142db
fix: remove new space line
2022-08-08 19:38:43 +07:00
Louis Lam
9a488d6968
Merge pull request #1752 from SuperManito/master
...
Add Bark Notification Parameters
2022-08-08 17:04:08 +08:00
Louis Lam
aca395cea1
Merge pull request #1957 from jbenguira/patch-2
...
Avoid error "SQLITE_BUSY: database is locked"
2022-08-08 17:00:06 +08:00
Louis Lam
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
Louis Lam
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2022-08-05 15:40:06 +08:00
minhhn3
2232236a7a
[empty commit] pull request for add gRPC protocol
2022-08-03 13:39:31 +07:00
Minh Hoàng
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
Louis Lam
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2022-08-02 19:08:46 +08:00
Joseph Benguira
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-08-01 13:18:19 +03:00
Louis Lam
fb3fe17c28
Fix getClientIP
...
Co-authored-by: Mateusz Hajder <6783135+mhajder@users.noreply.github.com>
2022-08-01 15:42:58 +08:00
Joseph Benguira
71d62ee151
removed ; after the PRAGMA command
2022-07-31 19:00:19 +03:00
Joseph Benguira
82b9bfc5a0
fixed Trailing spaces not allowed lint issue
2022-07-31 18:59:02 +03:00
Joseph Benguira
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
Louis Lam
2389b604fe
Use Settings.get
2022-07-31 23:41:29 +08:00
Louis Lam
a3b1612938
getClientIP respect trustProxy setting
2022-07-31 23:36:33 +08:00
Louis Lam
a07f54f35b
Merge remote-tracking branch 'origin/master' into theS1LV3R_master
2022-07-31 23:27:35 +08:00
Louis Lam
bea8679788
Merge branch 'master' into issue-1861
2022-07-31 20:06:45 +08:00
rmt/src
f091e92c70
Merge branch 'master' of github.com:rmtsrc/uptime-kuma into add-home-assistant-notification
2022-07-31 12:41:18 +01:00
Louis Lam
8ced61697a
Fix save docker host issue
2022-07-30 19:48:12 +08:00
Louis Lam
f3322398e5
Fix and improve test docker host
2022-07-29 20:57:13 +08:00
0x01code
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
Moritz R
60e7824ff0
Merge branch 'master' into master
2022-07-24 14:37:22 +02:00
c0derMo
fb3b407577
Added a settings page & localization
2022-07-24 12:34:43 +00:00
Louis Lam
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2022-07-24 14:07:30 +08:00
c0derMo
e356d5f623
Fixing linting & adding documentation
2022-07-22 15:57:40 +00:00
c0derMo
0d098b0958
Docker Hosts are now a table & have their own dialog
2022-07-22 15:47:04 +00:00
Louis Lam
239611a016
Do not set sendUrl if sendUrl is undefined
2022-07-22 23:27:02 +08:00
Rolf Bachmann
c4a2ce4e78
Add authentication support for ntfy
2022-07-19 12:17:15 +02:00
tamasmagyar
a382f811f4
added comment to startE2eTests function
2022-07-18 20:51:17 +02:00
tamasmagyar
986c03aecd
test cypress run
2022-07-18 20:51:17 +02:00
Jan Hartje
af07c7f050
feat(notification): add Authorization Header option to backend
2022-07-18 16:04:27 +00:00
Louis Lam
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2022-07-18 23:46:55 +08:00
Louis Lam
17ed051401
Add CacheableDnsHttpAgent.install()
2022-07-18 23:32:45 +08:00
Louis Lam
1999541802
Merge remote-tracking branch 'origin/master' into dns
2022-07-18 23:25:14 +08:00
Louis Lam
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
Louis Lam
2073f0c284
Bind cacheable-lookup to custom http agent
2022-07-18 22:33:35 +08:00
Louis Lam
25d711e683
Fix jsdoc data type
2022-07-18 22:06:25 +08:00
Matthew Nickson
b5f04573f2
Added formatting to ping options
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-07-14 09:19:40 +01:00
Matthew Nickson
a54e58b4d6
Added Ping packet size #1891
...
This should fully implement #1891 by adding an extra field to the edit
monitor page and an extra column to the database. The user can now
set the size of the packet to send, it defaults to 56. A maximum limit
of 65500 was chosen to ensure that the total size of the packet does
not exceed the IPv4 maximum packet size and to comply with the limit
imposed by Windows.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-07-14 08:32:51 +01:00
Louis Lam
d362372b05
Merge pull request #1749 from daeho-ro/feature/alertnow
...
Feat: New Notification Type for AlertNow
2022-07-14 15:04:35 +08:00
Chongyi Zheng
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2022-07-12 22:59:23 -04:00
Chongyi Zheng
f33b6de157
Support X-Forwarded-Host header
2022-07-11 01:28:50 -04:00
Louis Lam
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
theS1LV3R
c4125a8334
style: fix linter error
2022-07-04 20:38:44 +02:00
Zoe
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
Louis Lam
27dbc021b4
Add standalone manifest.json for each status page. Close #1668
2022-07-04 21:58:27 +08:00
Louis Lam
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2022-07-04 18:21:56 +08:00
Louis Lam
e5e8db6c38
Add cacheable-lookup
2022-06-29 22:17:47 +08:00
Louis Lam
dddd2c0042
Cache settings, reduce the database / disk usage
2022-06-29 16:18:56 +08:00
Louis Lam
515095ecfb
Move all settings code from util-server.js into settings.js
2022-06-29 14:57:40 +08:00
Louis Lam
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
rmt/src
f84ae82983
feat: added Home Assistant notification integration
2022-06-25 21:27:30 +01:00
theS1LV3R
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
Louis Lam
1f5466a3e8
Revert #1598
2022-06-23 15:54:33 +08:00
Louis Lam
c36d9a4b8b
Fix port data type #1802
2022-06-21 22:33:09 +08:00
Louis Lam
7ba717ee55
Fix Lunasea do not handle general message correctly #1790
2022-06-21 15:12:24 +08:00
Matthew Nickson
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2022-06-18 23:53:35 +01:00
Louis Lam
b97019eea8
Fix cloudflared cannot be stopped in No Auth mode due to password checking
2022-06-18 19:06:03 +08:00
sur.la.route
47e82ed83a
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-15 20:14:36 -05:00
sur.la.route
e1f766756f
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-15 20:14:26 -05:00
Christopher Pickering
edcdedcaae
Added check for blank password.
2022-06-15 13:00:14 -05:00
Christopher Pickering
945288f0c0
Added postgres monitor
2022-06-15 12:12:47 -05:00
OidaTiftla
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
OidaTiftla
869a040011
Merge branch 'master' into introduce-resend-interval
2022-06-15 16:19:47 +02:00
Louis Lam
fdbdf83a0d
Fix data type of notification.isDefault and notification.active ( #1765 )
2022-06-15 19:11:52 +08:00
Moritz R
ac449ec1c2
Merge branch 'master' into master
2022-06-15 11:33:00 +02:00
Christopher Pickering
660005b143
cleaned up code
2022-06-14 08:49:36 -05:00
Christopher Pickering
98f3c126e5
passed lint
2022-06-14 07:58:35 -05:00
sur.la.route
cf2ca71dee
prevent null workstation #'s from passing..
...
to axios-ntlm
2022-06-14 07:42:53 -05:00
Aram Akhavan
c690d1c3a1
fix timeout bypass for upside down push monitor
2022-06-13 22:05:58 -07:00
Louis Lam
6682839ec8
Merge remote-tracking branch 'origin/master' into ntml-auth
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
2022-06-14 10:36:29 +08:00
Super Manito
54b9698a05
Update
2022-06-13 21:44:10 +08:00
Louis Lam
6424fe77ab
Change successful log from info to debug in order to avoid large log and less disk usage
2022-06-13 21:15:47 +08:00
Louis Lam
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
2022-06-13 20:56:14 +08:00
Louis Lam
a28ef56553
Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2022-06-13 18:53:19 +08:00
Louis Lam
f570d41142
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2022-06-13 18:50:43 +08:00
Super Manito
1c4ddaeddf
Update
2022-06-13 18:17:47 +08:00
Super Manito
55a6e5af42
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-06-13 17:06:12 +08:00
Super Manito
252709ff49
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-06-13 17:06:05 +08:00
Super Manito
404923b7c8
bugfix
2022-06-12 22:49:04 +08:00
Super Manito
a41023ca2a
Update
2022-06-12 22:41:24 +08:00
Super Manito
817c941489
Add Bark Notification Parameters
2022-06-12 22:30:42 +08:00
Daeho Ro
5f6347d277
pull request for adding alertnow notification
2022-06-12 04:02:44 +09:00
Matthew Nickson
fbfa5a33ed
Added Clickable hostname on status page. #1221
...
This should fully implement #1221 by modifying the API and adding two
new properties to the result. The `sendUrl` property denotes if the URL
is sent and `url` is included when required.
Client side checks have been implemented in order to only show a link
when the URL is vaugely correct. I.e not "" or "https://". This prevents
the link from being included if the monitor type is not HTTP without
having to publicly expose the monitor type.
The exposure of the URL is configuarable for each monitor on each
status page by clicking on the link icon.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-11 17:23:12 +01:00
Louis Lam
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2022-06-11 20:59:58 +08:00
Wooferz
aa398948da
Merge branch 'louislam:master' into patch-1
2022-06-11 09:41:03 +10:00
Louis Lam
11243a6ca1
Merge pull request #1222 from NETivism/issue-1201
...
Show some pure text body in notification when keyword not found
2022-06-09 19:33:10 +08:00
Wooferz
54548e34ed
Added label to status badge
2022-06-08 20:05:10 +10:00
Nelson Chan
2c0180f323
Fix: Fix error when status page desc. is null
2022-06-07 14:57:23 +08:00
Louis Lam
4fdaa1abb6
[Push API] Response 404 if error, fix #1721
2022-06-06 22:40:26 +08:00
Louis Lam
cc258dce14
Merge pull request #1674 from philippdormann/feature/ntfy-support
...
feat: ntfy push support
2022-06-06 21:52:41 +08:00
Louis Lam
a707b51053
Page Loading Speed Optimization ( #1711 )
...
* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets
Original: ~1.2MB
Optimized: ~370KB
2022-06-05 23:43:25 +08:00
Louis Lam
091158cfe7
[Status Page] Preload data
2022-06-01 13:05:12 +08:00
Louis Lam
e4ad8cbfc8
Remove unused variables
2022-05-31 23:06:43 +08:00
Louis Lam
a674caa520
[Status Page] Add og meta tags
2022-05-31 22:53:48 +08:00
Karel Krýda
fa777c5bc0
Update server/server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:32:42 +02:00
Karel Krýda
6d0683b055
Update server/routers/api-router.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:32:19 +02:00
Karel Krýda
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:31:45 +02:00
Louis Lam
c095767f4a
[Status Page] SSR
2022-05-30 15:45:44 +08:00
Louis Lam
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
2022-05-30 14:00:39 +08:00
Aram Akhavan
ea10d89f51
show correct down message for first tick
2022-05-28 19:57:45 -07:00
Louis Lam
7f46223d68
Fix another log.debug call
2022-05-28 23:22:44 +08:00
Louis Lam
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
2022-05-28 23:19:58 +08:00
Moritz R
e9e78c26e5
Merge branch 'master' into master
2022-05-27 13:59:58 +02:00
Aram Akhavan
ab4edf2092
Fix log.debug calls
2022-05-26 21:45:56 -07:00
Marc Hagen
5830f1e0b5
[feat] Adding PagerDuty notification
2022-05-25 14:10:31 +02:00
Louis Lam
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
2022-05-25 14:59:14 +08:00
DasCanard
f23baf9c22
Added Push Monitor to Discord Notifications
2022-05-24 23:14:27 +02:00
Philipp Dormann
54184350a4
fix: missing semicolons
2022-05-23 21:13:57 +02:00
Philipp Dormann
14dbe7c334
clean up + default ntfs.sh server url
2022-05-23 21:11:01 +02:00
Philipp Dormann
71f031c14e
add ntfy support
...
ref https://github.com/louislam/uptime-kuma/issues/1622
2022-05-23 10:55:03 +02:00
c0derMo
32cfd411f8
Fixed style & code errors
2022-05-19 12:35:55 +00:00
Moritz R
a9f3142cee
Merge branch 'master' into master
2022-05-19 14:24:02 +02:00
Nelson Chan
b7ba6330db
Feat: Add cert exp. settings
2022-05-19 16:49:34 +08:00
Sascha Kruse
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
2022-05-18 15:56:21 +02:00
Sascha Kruse
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-18 15:55:36 +02:00
Sascha Kruse
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2022-05-18 15:54:10 +02:00
Louis Lam
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
2022-05-18 19:49:54 +08:00
Louis Lam
8ede6d888f
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
2022-05-14 14:37:12 +08:00
Louis Lam
cec0521834
[Discord] Fix ping type should no port, update better naming
2022-05-14 14:36:40 +08:00
Louis Lam
73b603dd10
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
...
Fixed incorrect uptime calculation for push monitors
2022-05-14 14:18:19 +08:00
Christopher Pickering
ef73af391f
added option for ntlm authorization
2022-05-13 12:58:23 -05:00
Christopher Pickering
44f6fca945
added finally to close connection pool
2022-05-13 09:34:31 -05:00
Christopher Pickering
c346ea7864
updated name on export
2022-05-13 08:57:06 -05:00
Christopher Pickering
f0ad32a252
merged
2022-05-13 08:41:31 -05:00
Christopher Pickering
5720017fb4
updated name on import
2022-05-13 08:40:46 -05:00
sur.la.route
5bba19f866
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-12 19:54:12 -05:00
sur.la.route
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-12 19:54:02 -05:00
Christopher Pickering
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
Sascha Kruse
398ecb7666
add radius check
2022-05-12 15:21:13 +02:00
Louis Lam
66971deaf4
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
2022-05-11 00:51:42 +08:00
Louis Lam
59be9bb971
working
2022-05-11 00:51:11 +08:00
Louis Lam
8077744c60
Merge pull request #1604 from c-w/fix-apprise-zulip
...
Fix apprise integration for Zulip Streams
2022-05-11 00:47:50 +08:00
Jordan Bertasso
c5faf709b8
Merge branch 'master' into fix-1448-discord-service-url
2022-05-10 22:53:55 +10:00
Karel Krýda
7da9f139c1
Bug fix
2022-05-09 21:10:12 +02:00
Karel Krýda
42f931f6cf
Merge branch 'master' into master
2022-05-09 10:28:14 +02:00
Karel Krýda
2fe5c090aa
small fixes
2022-05-08 20:50:08 +02:00
Clemens Wolff
b680371746
Make apprise notification title configurable in UI
2022-05-07 11:00:57 -04:00
Louis Lam
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
2022-05-07 13:26:47 +08:00
Aram Akhavan
cd3fbc80b4
Add first parameter back to logging in api router
2022-05-06 16:05:24 -07:00
Aram Akhavan
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-06 09:58:05 -07:00
Karel Krýda
9a35386841
Merge branch 'master' into master
2022-05-06 11:24:21 +02:00
Louis Lam
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
2022-05-06 14:41:34 +08:00
OidaTiftla
93050208bb
Merge database changes into single patch file
2022-05-05 16:01:19 +02:00
OidaTiftla
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-05 15:55:33 +02:00
OidaTiftla
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02:00
Greg Smith
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
2022-05-04 15:45:18 +09:30
Clemens Wolff
4b9dc2890d
Convert let to const
2022-05-02 11:16:08 -04:00
Clemens Wolff
f9004bcbed
Add optional title to apprise notification
2022-05-02 11:14:26 -04:00
Clemens Wolff
bc174c3325
Extract child process args into variable
2022-05-02 11:00:14 -04:00
Louis Lam
4c2753af46
Remove an unused variable
2022-05-02 13:36:35 +08:00
Louis Lam
c6ba5b621c
Remove isPublished, checkPublished which had been removed in upstream.
2022-05-02 13:32:19 +08:00
Karel Krýda
2b14bdae62
Merge branch 'master' into master
2022-05-01 12:40:34 +02:00
Louis Lam
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
2022-05-01 17:03:11 +08:00
Louis Lam
53b98ad3e4
Add more comment for aliyun-sms fix
2022-05-01 12:10:47 +08:00
Greg Smith
d0546afe71
fix esm require: no ugly warnings
2022-05-01 10:22:16 +09:30
Karel Krýda
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
2022-04-30 17:17:22 +02:00
Karel Krýda
b4ffcc5555
Added JSDoc
2022-04-30 15:50:05 +02:00
Louis Lam
42ea3fb412
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-30 21:36:07 +08:00
Louis Lam
9f8b3151d8
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-30 21:36:00 +08:00
GOGOsu
73e38a13d2
Update server/notification-providers/aliyun-sms.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-30 21:08:35 +08:00
Karel Krýda
f78d01d770
Resolve lint errors
2022-04-30 14:57:08 +02:00
Karel Krýda
7532acc95d
Resolve conflicts
2022-04-30 14:33:54 +02:00
Greg Smith
f4515ad8c5
add axios cached dns resolve to monitor
2022-04-30 21:40:47 +09:30
Karel Krýda
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
2022-04-30 13:40:34 +02:00
GOGOsu
369477b4b9
Update aliyun-sms.js
2022-04-30 10:45:38 +08:00
GOGOsu
2347a01f7c
Update aliyun-sms.js
...
Add comments for the changed code.
2022-04-30 10:42:59 +08:00
GOGOsu
ae2c49a729
Update aliyun-sms.js
2022-04-30 06:28:16 +08:00
GOGOsu
b9e72b9645
Update aliyun-sms.js
...
aliyun-sms.js: escape more characters than encodeURIComponent
see https://help.aliyun.com/document_detail/315526.html
字符A~Z、a~z、0~9以及字符-、_、.、~不编码。对其它ASCII码字符进行编码。
2022-04-30 05:56:10 +08:00
Louis Lam
60538036c6
[ #1108 ] Change "true" to "up"
2022-04-28 23:44:08 +08:00
Louis Lam
0ba5d031d0
Merge branch 'master' into push-status-param
...
# Conflicts:
# server/routers/api-router.js
2022-04-28 23:34:51 +08:00
Louis Lam
023db1450d
Fix #1577
2022-04-28 23:12:16 +08:00
Matthew Nickson
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-27 18:26:11 +01:00
Louis Lam
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
2022-04-27 15:00:49 +08:00
Aram Akhavan
39df4eea92
Ssynchronize push monitor heartbeats to api calls
...
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
2022-04-26 13:48:44 -07:00
Adam Stachowicz
1e595eaa76
Update linters
2022-04-26 01:26:57 +02:00
Adam Stachowicz
5fbfacf5ce
Fix ESlint warnings
2022-04-26 00:26:26 +02:00
Matthew Nickson
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-24 01:06:45 +01:00
Matthew Nickson
587faecf87
Made value nullable in apicache JSDoc
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-22 19:42:42 +01:00
Matthew Nickson
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-22 19:10:13 +01:00
Matthew Nickson
1eecdec2d9
Update JSDoc for better clarity
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-22 18:42:47 +01:00
Jens Neuber
64a33d7455
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-22 07:54:13 +02:00
Matthew Nickson
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 20:02:18 +01:00
Matthew Nickson
9996ba1636
Add JSDoc to server/modules/apicache/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 19:55:01 +01:00
Matthew Nickson
c2f6c5b42e
Added JSDoc docs for mqttAsync
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 18:53:07 +01:00
Matthew Nickson
0083485d4c
Updated server/model/* JSDoc to match new methods
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 18:30:04 +01:00
OidaTiftla
7ed8ae9f7c
Fix trailing space warning
2022-04-21 18:23:32 +02:00
Matthew Nickson
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:15:39 +01:00
Matthew Nickson
068b920553
Add JSDoc to server/socket-handlers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:10:23 +01:00
OidaTiftla
d6b591a513
Make comment more readable
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:45:58 +02:00
Matthew Nickson
3d04befc1f
Add JSDoc to server/routers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 16:43:24 +01:00
Matthew Nickson
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
2022-04-21 13:01:22 +01:00
OidaTiftla
19933bbd99
Improve backwards compatibility
2022-04-21 12:18:15 +02:00
OidaTiftla
60f8ab7285
Use new logging mechanism
2022-04-21 12:09:59 +02:00
OidaTiftla
b7e2489d22
Merge branch 'master' into introduce-resend-interval
2022-04-21 11:58:04 +02:00
Matthew Nickson
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-20 19:56:40 +01:00
Jens Neuber
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
2022-04-20 10:10:14 +02:00
Louis Lam
10f6a3c4f5
Merge pull request #1229 from Computroniks/#1209-Logout-button-in-navbar
...
Add #1209 : logout button in navbar
2022-04-19 19:59:52 +08:00
Louis Lam
200fdfb808
Merge code manually since some code moved to another file
2022-04-19 16:46:45 +08:00
Louis Lam
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
2022-04-19 16:43:13 +08:00
Louis Lam
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
2022-04-19 15:38:59 +08:00
Louis Lam
17d4003e5c
Add dropdown menu
2022-04-19 00:39:49 +08:00
Louis Lam
e2c45f93bf
Merge pull request #1509 from chakflying/feat/mqtt-optional-message
...
Feat: Allow MQTT successMessage to be optional
2022-04-18 19:06:39 +08:00
Louis Lam
addf75daa7
Fix MQTT password do not save
2022-04-18 19:05:14 +08:00
Louis Lam
359a490ae3
Fix #1510
2022-04-18 15:21:58 +08:00
Nelson Chan
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
2022-04-18 13:04:55 +08:00
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2022-04-17 19:46:33 +08:00
Louis Lam
e6a8a84278
Include only nessacary data in webhook
2022-04-17 19:30:58 +08:00
Louis Lam
47c72192e1
[eslint] Enable yoda and eqeqeq
2022-04-17 15:43:03 +08:00
Louis Lam
d71c086447
Standardize array bracket spacing
2022-04-17 15:27:35 +08:00
Louis Lam
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
2022-04-17 14:53:13 +08:00
Matthew Nickson
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-16 21:11:45 +01:00
Matthew Nickson
5a209c74e1
Add JSDoc to server/notification-providers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-16 20:24:53 +01:00
Louis Lam
07c474db0b
Merge remote-tracking branch 'origin/master'
2022-04-17 01:40:05 +08:00
Louis Lam
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
2022-04-17 01:39:49 +08:00
Louis Lam
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
2022-04-17 01:06:47 +08:00
Matthew Nickson
60c63cc18e
Add JSDoc to server/jobs/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-16 11:10:51 +01:00
Louis Lam
566133e350
Domain Name Expiry Notification for https monitor only
2022-04-16 15:01:53 +08:00
Louis Lam
30e113755e
Add HIDE_LOG and catch error if cannot subscribe topic
2022-04-16 14:50:48 +08:00
Louis Lam
083e8355b7
Change debug to log.debug
2022-04-16 13:37:17 +08:00
Louis Lam
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
2022-04-16 13:28:39 +08:00
Matthew Nickson
a680331dd7
Fixes issue with ::1 port 5300 requests
...
Now the address is wrapped in `[]` in order to prevent ::1 port 5300
being interpreted as ::1:5300. Wrapping the IPv4 address in `[]` does
seem to have any effect on correct domain name resolution. In order to
prevent issues if a user inputs an address with brackets, they are
removed from the string if present before being re-added when it is
passed to `setServers`. I have also removed the JSDoc comment as this
will be added in a seperate PR
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-15 19:59:32 +01:00
Jordan Bertasso
288ed1e3ca
Merge branch 'master' into fix-1448-discord-service-url
2022-04-15 14:13:44 +10:00
Louis Lam
fb0064082e
Change Pushdeer to PushDeer
2022-04-14 14:34:30 +08:00
ngc7331
93c51504f9
fixes: formatting and security issues
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-14 14:34:30 +08:00
ngc7331
fb059f5e91
Add support for Pushdeer notifications
2022-04-14 14:34:30 +08:00
Louis Lam
d0b5f147e2
Fix spelling and merge mistake
2022-04-14 10:58:28 +08:00
Louis Lam
ddf8a7a692
Fix camelCase
2022-04-14 10:58:28 +08:00
ColdThunder11
bd9df09f87
Apply suggestions from code review, fix style
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-14 10:58:28 +08:00
ColdThunder11
4656ab3d57
Add OneBot notification service
2022-04-14 10:58:28 +08:00
Louis Lam
0a5db0cecb
Fix #1478
2022-04-14 10:12:31 +08:00
Matthew Nickson
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-13 21:24:04 +01:00
Matthew Nickson
b893d50e45
Implement specify Port for DNS Monitor #1059
...
This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-13 21:02:19 +01:00
Louis Lam
649f3106e1
Enforce semicolon, fix format globally
2022-04-14 01:20:54 +08:00
Louis Lam
17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
...
introduce consistent logging
2022-04-13 23:47:08 +08:00
Louis Lam
e9ce1433cd
Change log_info to log.info by making it into an object
2022-04-13 23:33:37 +08:00
Moritz R
361e44ad6a
Merge branch 'louislam:master' into master
2022-04-13 15:58:17 +02:00
Louis Lam
4053b9db1f
Merge remote-tracking branch 'origin/master'
2022-04-12 17:46:24 +08:00
Louis Lam
772d009f43
Merge branch 'master' into fluencydoc_master
...
# Conflicts:
# extra/update-version.js
# server/client.js
# server/server.js
2022-04-12 17:44:04 +08:00
Louis Lam
6179f6c982
Merge branch 'master' into issue/1138
...
# Conflicts:
# server/server.js
2022-04-12 17:15:33 +08:00
Louis Lam
94770cf865
Resolve log message null reference
2022-04-12 16:57:22 +08:00
Louis Lam
279e2eb3f6
Merge branch 'master' into logging
...
# Conflicts:
# server/database.js
# server/jobs.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/socket-handlers/status-page-socket-handler.js
# server/util-server.js
2022-04-12 16:32:14 +08:00
jordanbertasso
2638d68c97
Cover dns and steam types in Discord notifs
2022-04-12 09:52:07 +10:00
jordanbertasso
0961c6d9b3
Check for ping and port type in discord notifs
2022-04-10 21:45:07 +10:00
Louis Lam
c9fa183712
Manage domain names
2022-04-10 00:25:27 +08:00
Louis Lam
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
2022-04-09 16:07:09 +08:00
Louis Lam
6a30dbd71a
Fix Mattermost when channel is empty #1468
2022-04-09 15:44:50 +08:00
Louis Lam
7bbaeffd3e
Fix reset-password (issue caused by 5027fcd320)
2022-04-08 00:56:56 +08:00
Louis Lam
008dc27f52
Reload proxy settings for monitors in the monitorList
2022-04-07 23:03:45 +08:00
Louis Lam
5027fcd320
Export server using an object class
2022-04-07 23:02:57 +08:00
Louis Lam
d5e68f8453
Export monitor list
2022-04-07 22:53:32 +08:00
Louis Lam
082c2dd32d
Remove restartMonitors() and move proxy socket events to a socket handler file
2022-04-07 14:45:37 +08:00
Louis Lam
c4e74c9943
Render <StatusPage> if domain matched
2022-04-06 22:43:22 +08:00
Louis Lam
fee88b32e3
Set PRAGMA synchronous = FULL
2022-04-06 20:48:13 +08:00
Louis Lam
c9deea9fdf
Merge pull request #1456 from Arubinu/alerta
...
Fix "API key parameter 'undefined' is invalid"
2022-04-05 22:51:33 +08:00
Louis Lam
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
2022-04-05 21:27:50 +08:00
Louis Lam
4b99160b1f
Fix "Check Update" is not checked by default
2022-04-05 19:43:23 +08:00
Louis Lam
48d679234a
Stop bree and cloudflared while the server shutting down
2022-04-05 19:41:29 +08:00
Alvin Pergens
d3d1656625
Fix "API key parameter 'undefined' is invalid"
2022-04-05 08:47:35 +02:00
Moritz R
af44b0beab
Merge branch 'master' into master
2022-04-03 17:19:29 +02:00
Moritz R
84a0b24448
Update server/model/monitor.js
...
As per recommendation of @Computroniks
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-03 17:15:21 +02:00
Jimmy Huang
a4be651118
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-01 15:26:50 +08:00
Louis Lam
04e3394d02
Merge branch 'master' into feature/request-with-http-proxy
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# src/languages/en.js
# src/mixins/socket.js
2022-04-01 14:57:35 +08:00
Louis Lam
6674005e8b
Fix storing cloudflared token while start cloudflared
2022-03-31 15:58:39 +08:00
Louis Lam
b72a2d350f
Set cloudflared token from env var or arg
2022-03-30 20:08:26 +08:00
Louis Lam
82ea896bbc
Improve the workflow of cloudflared
2022-03-30 11:59:49 +08:00
Louis Lam
f1f4b3b377
Add reverse proxy setting page for controlling cloudflared
2022-03-30 01:49:45 +08:00
Louis Lam
a6b52b7ba6
Merge branch 'master' into cloudflared
2022-03-29 17:42:55 +08:00
Louis Lam
b8dea3a823
Merge remote-tracking branch 'origin/master'
2022-03-29 17:39:12 +08:00
Louis Lam
0da6e6b1fb
Some improvements
2022-03-29 17:38:48 +08:00
