mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-26 06:04:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3045 commits 31 branches 117 tags 70 MiB
Commit graph

879 commits

Author SHA1 Message Date
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
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
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
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
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
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