mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-10 07:34:07 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
2603 commits 31 branches 115 tags 54 MiB
Commit graph

684 commits

Author SHA1 Message Date
Louis Lam 72ce28a541 Migrate status page table 2022-03-08 14:33:35 +08:00
Louis Lam 1e2a8453c6 Merge branch 'master' into restructure-status-page 2022-03-08 14:21:04 +08:00
Louis Lam 1fa4a16663 Check beta release 2022-03-07 16:24:24 +08:00
Uğur Erkan 8078d0618d Add socks proxy support to proxy feature 
- Socks proxy support implemented.
- Monitor proxy agent create flow refactored
  and moved under proxy class.

Thanks for suggestion @thomasleveil
 2022-03-06 19:34:51 +03:00
Uğur Erkan 78d76512ba Add http and https proxy feature 
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.

Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
 2022-03-06 19:34:49 +03:00
Louis Lam 8bbf55777e
Merge pull request #1205 from arjunkomath/master 
Add notification provider - Push
 2022-03-04 21:39:59 +08:00
Louis Lam fa490d0bf1 [Alerta] Handle general message 2022-03-04 14:13:44 +08:00
Louis Lam c52c8a4206 Merge branch 'master' into alerta 
# Conflicts:
#	server/notification.js
#	src/components/notifications/index.js
#	src/languages/en.js
 2022-03-04 14:10:37 +08:00
Louis Lam 9789d8cde8 Merge branch 'master' into alerta 2022-03-04 14:09:01 +08:00
Louis Lam ccb3d85a48
Merge pull request #1157 from zackelia/master 
Implement gorush notifications
 2022-03-03 22:03:09 +08:00
Louis Lam b62d94184a Merge branch 'master' into restructure-status-page 2022-03-03 17:09:15 +08:00
Louis Lam 595cd93220 Check invalid interval 2022-02-24 15:11:17 +08:00
Ananth Kamath 258d93be72 Fix mattermost couldn't find channel issue 2022-02-13 21:17:02 +05:30
Alvin Pergens 8febff9282 fix comments 2022-01-28 15:35:33 +01:00
Alvin Pergens 90f2497548 change data for Alerta 2022-01-28 15:14:34 +01:00
Alvin Pergens cefe43800f add alerta service 2022-01-27 20:54:04 +01:00
Arjun Komath 23796723dd
Address code review 
Add missing comma

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-21 20:42:08 +11:00
Arjun Komath 51b7a2badb remove log 2022-01-21 07:43:14 +00:00
Arjun Komath 74c584f544 Add Push by Techulus 2022-01-21 07:42:03 +00:00
Tarun Singh 0345719e53 added cleartimeout in case client is already ended 2022-01-20 13:20:54 -05:00
Tarun Singh 22256dfcd2 added timeout for removing the dead loop state 2022-01-20 13:04:59 -05:00
Louis Lam aba6cb2c52
Merge pull request #1169 from jbenguira/patch-1 
Fixed #1024
 2022-01-19 14:41:15 +08:00
Louis d1a99b0a22 Check Node.js version, better error message 2022-01-15 01:25:28 +08:00
Joseph Benguira 3b9fac2942
Update server/prometheus.js 
removed useless spaces

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-14 08:51:45 +02:00
Louis Lam 227bbdea2f [MQTT] Try to improve error handling 2022-01-13 12:42:34 +08:00
Louis Lam 6272514820 [MQTT] Use existing fields instead of creating new ones (Server) 2022-01-13 11:53:08 +08:00
Louis Lam 32ec4beda0 Merge branch 'master' into mqtt 2022-01-13 11:24:45 +08:00
Louis Lam 482b3f9233
Update server/util-server.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-13 11:20:32 +08:00
Louis Lam 076d6bdbb6 Merge branch 'master' into mqtt 
# Conflicts:
#	package-lock.json
#	server/database.js
 2022-01-13 11:09:16 +08:00
Joseph Benguira 13acdd4c65
Fix for issue in logs 
This fix address the issue described here: https://github.com/louislam/uptime-kuma/issues/1024
 2022-01-12 10:12:12 +02:00
Louis ed64853125 Keep FBSD, BSD for ping only 2022-01-12 01:44:01 +08:00
Denis 0f822d3b2a FBSD does not exists anymore 2022-01-11 13:42:51 +01:00
Denis 6bda5c6329 update comment 2022-01-11 13:39:45 +01:00
Denis Fondras 44bc98a453
Merge branch 'louislam:master' into master 2022-01-11 13:37:54 +01:00
Louis f9751d0c01 Fix FBSD to BSD https://github.com/louislam/uptime-kuma/pull/1155#issuecomment-1009544236 2022-01-11 19:15:28 +08:00
Denis 53df9a36e3 reintroduce exports.FBSD 2022-01-11 10:07:00 +01:00
Zack Elia ea43422ccf Implement gorush notifications 2022-01-09 12:05:11 -05:00
Denis 8063449f49 ping path is common to all BSDs 2022-01-09 17:27:24 +01:00
Marc Harnos 0bbe157099
change parsing priority for all passed arguments 
update all passed args in server.js to prioritize command line, then use
env.UPTIME_KUMA_ environment variables, then use the generic environment
variable versions env.HOST, env.PORT, env.SSL_KEY, env.SSL_CERT and fall
back to default values where applicable
 2022-01-08 18:32:42 +01:00
Marc Harnos 0053a29d10
add validation to port value parsing 
only port configurations that are valid (not isNaN) after parseInt
are considered to be used in port variable
 2022-01-08 18:27:39 +01:00
Marc Harnos 2c8d5d28e9
simplify host fallback logic 
move decision logic for freeBSD HOST environment var into temp var
 2022-01-08 18:25:12 +01:00
Nelson Chan 1bbd744d02 Chore: Improve syntax 2022-01-07 14:29:42 +08:00
Nelson Chan 2e0e35a1ee Fix: Fix typo 2022-01-07 12:34:01 +08:00
Nelson Chan 1e92487f30 Chore: Remove onDelete as unused 2022-01-07 12:28:08 +08:00
Nelson Chan edd2534a1b Fix: Clear metrics also on stop and edit 2022-01-07 12:26:26 +08:00
Nelson Chan f6ef390c76 Fix: Remove Prom. metrics on delete monitor 2022-01-07 12:04:57 +08:00
Thomas LÉVEIL 46fa6a56fa
fix TypeError: Cannot read property 'id' of null 
when testing a Google Chat notification

see https://github.com/louislam/uptime-kuma/issues/1126#issuecomment-1006343423
 2022-01-06 08:48:12 +01:00
Louis Lam 81a194d826 Merge remote-tracking branch 'origin/master' 2022-01-06 14:47:21 +08:00
Louis Lam 64b3e04d3f Fix #1129 2022-01-06 14:34:45 +08:00
Philipp Bischoff bcc3cec7d6 extract translation for notification type 2022-01-05 23:57:40 +01:00
Philipp Bischoff f8c5015e3f fix google chat type mismatch 2022-01-05 23:44:14 +01:00
Leslie Leung 590859a95b
Merge branch 'master' into add-wecom-notification 2022-01-03 21:43:56 +08:00
Louis Lam e18d4b6ad0
Merge pull request #1045 from bilipp/google-chat-notifications 
Add support for Google Chat Notifications
 2021-12-30 00:16:34 +08:00
Louis Lam 72a59ce7a4 add status page table 2021-12-27 18:54:48 +08:00
LeslieLeung 40b70277c7 feat(*): support WeCom notification 2021-12-26 13:11:42 +08:00
Jakub Blažej 3d002b3ce9 add status boolean parameter to push monitor 2021-12-25 20:25:21 +01:00
Tarun Singh 4118de6d53 fix protocol not defined bug 2021-12-23 19:39:47 -05:00
Nelson Chan 624cd862a5 Feat: Expose SMTP DKIM settings 2021-12-19 13:30:53 +08:00
Tarun Singh d3c90df8a8 fixed edit monitor fields empty issues 2021-12-18 16:35:18 -05:00
Louis Lam a42932a43e Simulate Chrome's request Accept header. Better handling of #1067 2021-12-16 15:09:10 +08:00
Philipp Bischoff a6072a0e30 google chat: only show offline message in notification when service went down 2021-12-15 13:40:21 +01:00
Philipp Bischoff a71569379e add missing import 2021-12-12 00:01:12 +01:00
Philipp Bischoff 8050cb8e99 implement google chat notification type 2021-12-11 23:43:12 +01:00
Andreas Brett 38f8a8ac2f
Merge branch 'louislam:master' into logging 2021-12-10 17:21:55 +01:00
Louis Lam d4bfe57b79 minor: improve formatting 2021-12-08 15:04:18 +08:00
Louis Lam dcc91d6c72 Fix #922 2021-12-08 14:59:59 +08:00
Andreas Brett e684712a77
Merge branch 'louislam:master' into logging 2021-12-07 18:21:56 +01:00
Jonas Liebert 67849a9e84 add support for stackfield notifications 2021-12-02 08:53:45 +01:00
Andreas Brett a13bdaac84
Merge branch 'master' into logging 2021-11-29 20:32:42 +01:00
Louis Lam 40cb22e671
Merge pull request #963 from kffl/feat/serwersms-provider 
Add SerwerSMS.pl notification provider
 2021-11-29 20:43:38 +08:00
Louis Lam a864b72e03 fix pushover for general message 2021-11-29 17:19:55 +08:00
kffl 186c11540f
style(serwersms): add missing trailing commas 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-11-27 13:16:17 +01:00
Paweł Kuffel c1267e9b3b feat: add SerwerSMS notification provider 2021-11-25 18:24:36 +01:00
Louis Lam 37e6ca8d77
Merge pull request #950 from dingdayu/master 
Update dingding notification title
 2021-11-24 11:36:00 +08:00
Fluency e3745da986
Merge branch 'master' into master 2021-11-23 10:26:45 -08:00
Louis Lam 92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth 
Implement explicit HTTP "basic" authentication support
 2021-11-23 22:48:54 +08:00
小雨 dce908a07b
Update dingding notification title 
Add the status to the title, you can see the message title on the friend list page.
 2021-11-23 20:36:22 +08:00
Louis Lam 3d222ac5f5 fix btoa is not define 2021-11-23 12:59:48 +08:00
Louis Lam c811c1ccde
Merge pull request #753 from chakflying/settings-redesign 
UI: Redesign/organize settings page
 2021-11-23 12:46:59 +08:00
Tarun Singh 35da8c78f4 added connection timeout and refactored code 2021-11-22 03:21:53 -05:00
Andreas Brett ed96757b24
Merge branch 'louislam:master' into logging 2021-11-19 08:56:25 +01:00
Tarun Singh 3306f4a8e0 removed extra logging 2021-11-18 14:03:23 -05:00
Louis Lam 5d3bf68123 add remove-2fa command 2021-11-18 18:22:03 +08:00
Nelson Chan 7f4d5a0f76 Test: fix tests 
Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Investigate error message

Test: Attempt to fix tests

Chore: Cleanup code

Test: Attempt to fix tests

Test: Attempt to fix tests
 2021-11-17 10:45:24 +08:00
Nelson Chan 07742799ed Test: Fix tests 
Test: Add clear stats test

Test: Attempt to fix tests

Test: Add test for disable auth

Update README
 2021-11-17 10:45:19 +08:00
Tarun Singh 3f5133d1ba Added authentication logic 2021-11-16 20:44:10 -05:00
Andreas Brett e5913c5abc separate log functions 2021-11-15 17:52:28 +01:00
Andreas Brett bdcdf47e52 introduce consistent logging 2021-11-11 12:31:28 +01:00
Calum Bird f55350bebc Generated documentation :) 2021-11-09 21:24:31 -08:00
Louis Lam 0275d7a42b minor 2021-11-08 15:51:32 +08:00
Louis Lam 41a6d1b701 Fix parseCertificateInfo possibly in dead loop 2021-11-08 15:39:17 +08:00
Ivan Bratović 34d8984e3a
Merge branch 'master' into http-basicauth 2021-11-07 17:15:36 +01:00
Louis Lam c92153c97e add more debug msg 2021-11-07 21:00:47 +08:00
Jasper Miller-Waugh e4506963d9
Merge branch 'louislam:master' into tags-on-status 2021-11-07 14:39:43 +13:00
Tarun Singh d5d07da4ee
update review suggestions 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-11-04 22:22:53 -04:00
Tarun Singh 2d802585ff
Update review suggestions 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-11-04 22:21:54 -04:00
Ivan Bratović 179ca232bc Minor refactor - change variable names and add commas to object definitions 2021-11-04 10:14:17 +01:00
Ivan Bratović 0dcb7aed21 Delinting 2021-11-04 09:50:10 +01:00
Ivan Bratović 23736549f9 Implement HTTP basic auth feature 2021-11-04 09:50:10 +01:00
Ivan Bratović 665c263c03 Add db migrations for new basic auth fields 2021-11-04 09:50:10 +01:00
Tarun Singh 6828e8ef6d Merge branch 'master' of https://github.com/tarun7singh/uptime-kuma 2021-11-03 21:47:44 -04:00
Tarun Singh 670754b697 added MQTT monitor type 2021-11-03 21:46:43 -04:00
Louis Lam 82cde7c847
Merge pull request #854 from 634750802/patch-1 
Add a status prefix for feishu notification's title
 2021-11-03 16:36:21 +08:00
Jasper Miller-Waugh e5d6410caf
Apply formatting suggestions from code review 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-11-03 11:46:53 +13:00
Louis Lam c094dc0c5b speed up redirect by using 302 redirect instead of vue redirect 2021-11-02 21:48:46 +08:00
Jagger f3651a1219
Add a status prefix for feishu notification 2021-11-01 13:31:31 +08:00
Jasper Miller-Waugh 12ef9f39c5
Merged buttons, cleaned up SS tag retrieval and made tagsVisible a bool. 
Also to note: due to the transition of tagsVisible this breaks compatibility with the previous commits, delete the  tagsVisible setting in the database to fix.
 2021-11-01 13:23:46 +13:00
Louis Lam e7104737e7 prevent to show "New Update" when the Docker image is not ready yet 2021-10-31 00:36:46 +08:00
Jasper Miller-Waugh 74688e69aa
Remove debug statement in server/routers/api-router.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh b32bfb3ff1
Added toggle for tag visibility 2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh 348c5ec995
Match lint settings 2021-10-30 21:16:10 +13:00
Jasper Miller-Waugh 5e6d945095
Most hacked in POC 2021-10-30 21:16:10 +13:00
Louis ba93129b18 Merge branch '1.9.X' 
# Conflicts:
#	server/server.js
 2021-10-30 10:05:08 +08:00
Louis caa2a34177 fix 2fa not working #833 2021-10-30 02:35:05 +08:00
Louis d4c9431142 catch createWriteStream error 2021-10-29 18:28:31 +08:00
Louis d7f7dba13f write some error logs to ./data/error.log 2021-10-29 18:24:47 +08:00
Louis Lam e261a27ebe fix wrong call of rejectUnauthorized for smtp (#757) 2021-10-28 11:10:09 +08:00
Louis Lam eb22ad5ffe [certificate notification] error handling and better msg 2021-10-27 16:12:18 +08:00
Louis Lam f5f4835b74 [certificate notification] clear sent history if the cert is changed 2021-10-27 16:03:16 +08:00
Louis Lam 44c1b336dc send certificate notifications in 21, 14, 7 days 2021-10-27 15:33:15 +08:00
Louis Lam 110ec491ee Merge branch 'master' into cert-notification 2021-10-27 14:16:37 +08:00
Louis Lam 640b6e5b1c prevent monitor dead for unexpected error 2021-10-27 14:08:44 +08:00
Louis Lam 698a38e773 clear status page cache in a better place 2021-10-27 11:39:46 +08:00
Louis Lam a9e319517a add auto vacuum and shrink database button 2021-10-26 23:02:32 +08:00
Louis Lam 77addfebc8 Merge branch 'tarun7singh_master' 
# Conflicts:
#	src/languages/vi.js
 2021-10-26 16:26:59 +08:00
Louis Lam d1c4d13903
Merge pull request #782 from Co2333/dev-lakr233-bark_notification 
Support for Bark (APN) notifications
 2021-10-26 16:23:11 +08:00
Tarun Singh ba1e025353 added click send to number 2021-10-25 04:11:57 -04:00
Tarun Singh fed611d1b9 Merge branch 'master' of https://github.com/louislam/uptime-kuma 2021-10-24 15:19:25 -04:00
Tarun Singh bc68088350 Click send sms integration for notifications 2021-10-24 15:17:29 -04:00
Nelson Chan 2f7b60f5e5 Feat: Use separate storage for custom chart period 
Fix: Fix import error
 2021-10-24 01:44:55 +08:00
Nelson Chan b83c59e308 WIP: Add options for chart period 
Fix: Fix callback, add toast on error

Fix: Improve styling

Fix: Restore default chart behavior

Fix: Replace 1h with 3h

draft only
 2021-10-24 01:44:08 +08:00
Lakr Aream ce852dfa02 Support for Bark (APN) notifications 
Update bark.js
 2021-10-24 00:31:43 +08:00
Louis Lam 957c292307 add certificate-notification job 2021-10-23 21:44:21 +08:00
Louis Lam d578300104
Merge pull request #743 from andreasbrett/patch-4 
Harden 2FA/TOTP implementation according to rfc6238 (part 2)
 2021-10-23 17:00:46 +08:00
Louis Lam b77b33e790 add login rate limiter 2021-10-23 16:35:13 +08:00
Louis Lam 56094a43d7 add passwordStrength 2021-10-21 22:54:04 +08:00
Louis Lam cd04ac4557 "dist/index.html" is no longer needed for development environment 2021-10-20 01:32:19 +08:00
Louis Lam e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges 
Text update
 2021-10-19 16:34:00 +08:00
Louis Lam 6c1ee70e15 fix 2021-10-19 16:29:09 +08:00
Louis Lam 5c3892313e add env var: UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN 2021-10-19 14:41:05 +08:00
Louis Lam c57c94642c Merge remote-tracking branch 'origin/master' 2021-10-19 14:26:26 +08:00
Louis Lam 62f168a2a5 config response header 2021-10-19 14:26:10 +08:00
Andreas Brett acc2995d86 invalidate used token 2021-10-19 00:42:33 +02:00
NeuralMiner 9ddffc0f7f Updates 2021-10-18 14:35:47 -06:00
NeuralMiner 76e7c8b276 Rebase 2021-10-18 14:35:36 -06:00
NeuralMiner 572a5300aa Recommended updates. 2021-10-18 13:25:53 -06:00
NeuralMiner e1f1d4a959
Merge branch 'louislam:master' into textchanges 2021-10-18 12:57:28 -06:00
Louis Lam 23714ab688 genSecret don't need await 2021-10-18 17:37:11 +08:00
Louis Lam 6e18f39eb4 [steam] code cleanup 2021-10-18 17:15:28 +08:00
Louis Lam 68d44dd9b3 [steam] do not request if there is no steam api key 2021-10-18 17:11:41 +08:00