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
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
ac449ec1c2
Merge branch 'master' into master
2022-06-15 11:33:00 +02:00
660005b143
cleaned up code
2022-06-14 08:49:36 -05:00
98f3c126e5
passed lint
2022-06-14 07:58:35 -05:00
cf2ca71dee
prevent null workstation #'s from passing..
...
to axios-ntlm
2022-06-14 07:42:53 -05:00
c690d1c3a1
fix timeout bypass for upside down push monitor
2022-06-13 22:05:58 -07:00
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
54b9698a05
Update
2022-06-13 21:44:10 +08:00
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
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
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
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
1c4ddaeddf
Update
2022-06-13 18:17:47 +08:00
55a6e5af42
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-06-13 17:06:12 +08:00
252709ff49
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-06-13 17:06:05 +08:00
404923b7c8
bugfix
2022-06-12 22:49:04 +08:00
a41023ca2a
Update
2022-06-12 22:41:24 +08:00
817c941489
Add Bark Notification Parameters
2022-06-12 22:30:42 +08:00
5f6347d277
pull request for adding alertnow notification
2022-06-12 04:02:44 +09:00
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
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
aa398948da
Merge branch 'louislam:master' into patch-1
2022-06-11 09:41:03 +10:00
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
54548e34ed
Added label to status badge
2022-06-08 20:05:10 +10:00
2c0180f323
Fix: Fix error when status page desc. is null
2022-06-07 14:57:23 +08:00
4fdaa1abb6
[Push API] Response 404 if error, fix #1721
2022-06-06 22:40:26 +08:00
cc258dce14
Merge pull request #1674 from philippdormann/feature/ntfy-support
...
feat: ntfy push support
2022-06-06 21:52:41 +08:00
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
091158cfe7
[Status Page] Preload data
2022-06-01 13:05:12 +08:00
e4ad8cbfc8
Remove unused variables
2022-05-31 23:06:43 +08:00
a674caa520
[Status Page] Add og meta tags
2022-05-31 22:53:48 +08:00
fa777c5bc0
Update server/server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:32:42 +02:00
6d0683b055
Update server/routers/api-router.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:32:19 +02:00
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:31:45 +02:00
c095767f4a
[Status Page] SSR
2022-05-30 15:45:44 +08:00
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
2022-05-30 14:00:39 +08:00
ea10d89f51
show correct down message for first tick
2022-05-28 19:57:45 -07:00
7f46223d68
Fix another log.debug call
2022-05-28 23:22:44 +08:00
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
2022-05-28 23:19:58 +08:00
e9e78c26e5
Merge branch 'master' into master
2022-05-27 13:59:58 +02:00
ab4edf2092
Fix log.debug calls
2022-05-26 21:45:56 -07:00
5830f1e0b5
[feat] Adding PagerDuty notification
2022-05-25 14:10:31 +02:00
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
f23baf9c22
Added Push Monitor to Discord Notifications
2022-05-24 23:14:27 +02:00
54184350a4
fix: missing semicolons
2022-05-23 21:13:57 +02:00
14dbe7c334
clean up + default ntfs.sh server url
2022-05-23 21:11:01 +02:00
71f031c14e
add ntfy support
...
ref https://github.com/louislam/uptime-kuma/issues/1622
2022-05-23 10:55:03 +02:00
32cfd411f8
Fixed style & code errors
2022-05-19 12:35:55 +00:00
a9f3142cee
Merge branch 'master' into master
2022-05-19 14:24:02 +02:00
b7ba6330db
Feat: Add cert exp. settings
2022-05-19 16:49:34 +08:00
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
2022-05-18 15:56:21 +02:00
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-18 15:55:36 +02:00
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2022-05-18 15:54:10 +02:00
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
2022-05-18 19:49:54 +08:00
8ede6d888f
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
2022-05-14 14:37:12 +08:00
cec0521834
[Discord] Fix ping type should no port, update better naming
2022-05-14 14:36:40 +08:00
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
ef73af391f
added option for ntlm authorization
2022-05-13 12:58:23 -05:00
44f6fca945
added finally to close connection pool
2022-05-13 09:34:31 -05:00
c346ea7864
updated name on export
2022-05-13 08:57:06 -05:00
f0ad32a252
merged
2022-05-13 08:41:31 -05:00
5720017fb4
updated name on import
2022-05-13 08:40:46 -05:00
5bba19f866
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-12 19:54:12 -05:00
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-12 19:54:02 -05:00
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
398ecb7666
add radius check
2022-05-12 15:21:13 +02:00
66971deaf4
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
2022-05-11 00:51:42 +08:00
59be9bb971
working
2022-05-11 00:51:11 +08:00
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
c5faf709b8
Merge branch 'master' into fix-1448-discord-service-url
2022-05-10 22:53:55 +10:00
7da9f139c1
Bug fix
2022-05-09 21:10:12 +02:00
42f931f6cf
Merge branch 'master' into master
2022-05-09 10:28:14 +02:00
2fe5c090aa
small fixes
2022-05-08 20:50:08 +02:00
b680371746
Make apprise notification title configurable in UI
2022-05-07 11:00:57 -04:00
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
2022-05-07 13:26:47 +08:00
cd3fbc80b4
Add first parameter back to logging in api router
2022-05-06 16:05:24 -07:00
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-06 09:58:05 -07:00
9a35386841
Merge branch 'master' into master
2022-05-06 11:24:21 +02:00
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
2022-05-06 14:41:34 +08:00
93050208bb
Merge database changes into single patch file
2022-05-05 16:01:19 +02:00
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-05 15:55:33 +02:00
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02:00
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
2022-05-04 15:45:18 +09:30
4b9dc2890d
Convert let to const
2022-05-02 11:16:08 -04:00
f9004bcbed
Add optional title to apprise notification
2022-05-02 11:14:26 -04:00
bc174c3325
Extract child process args into variable
2022-05-02 11:00:14 -04:00
4c2753af46
Remove an unused variable
2022-05-02 13:36:35 +08:00
c6ba5b621c
Remove isPublished, checkPublished which had been removed in upstream.
2022-05-02 13:32:19 +08:00
2b14bdae62
Merge branch 'master' into master
2022-05-01 12:40:34 +02:00
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
2022-05-01 17:03:11 +08:00
53b98ad3e4
Add more comment for aliyun-sms fix
2022-05-01 12:10:47 +08:00
d0546afe71
fix esm require: no ugly warnings
2022-05-01 10:22:16 +09:30
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
2022-04-30 17:17:22 +02:00
b4ffcc5555
Added JSDoc
2022-04-30 15:50:05 +02:00
42ea3fb412
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-30 21:36:07 +08:00
9f8b3151d8
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-30 21:36:00 +08:00
73e38a13d2
Update server/notification-providers/aliyun-sms.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-30 21:08:35 +08:00
f78d01d770
Resolve lint errors
2022-04-30 14:57:08 +02:00
7532acc95d
Resolve conflicts
2022-04-30 14:33:54 +02:00
f4515ad8c5
add axios cached dns resolve to monitor
2022-04-30 21:40:47 +09:30
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
Joseph Benguira
Louis Lam
rmt/src
0x01code
Moritz R
c0derMo
Rolf Bachmann
tamasmagyar
Chongyi Zheng
theS1LV3R
Matthew Nickson
sur.la.route
OidaTiftla
OidaTiftla
Aram Akhavan
Super Manito
Daeho Ro
Wooferz
Nelson Chan
Karel Krýda
Marc Hagen
DasCanard
Philipp Dormann
Sascha Kruse
Sascha Kruse
Christopher Pickering
Jordan Bertasso
Karel Krýda
Clemens Wolff
Greg Smith
GOGOsu