ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-30 18:24:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2458 commits 30 branches 115 tags 68 MiB
Commit graph

631 commits

Author SHA1 Message Date
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
Nelson Chan
624cd862a5 Feat: Expose SMTP DKIM settings 2021-12-19 13:30:53 +08: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
Andreas Brett
ed96757b24
Merge branch 'louislam:master' into logging 2021-11-19 08:56:25 +01: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
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
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
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
Louis Lam
20d59e5a13 fix and move the steam api key to settings page 2021-10-18 17:02:05 +08:00
Louis Lam
ae31eb6ba9 Merge branch 'master' into Revyn112_master 
# Conflicts:
#	server/model/monitor.js
#	src/languages/en.js
#	src/pages/EditMonitor.vue
 2021-10-18 15:50:35 +08:00
Bert Verhelst
1d63dd9ddd fix(monitor): safely get status of previous beat if first beat 2021-10-16 11:28:03 +02:00
Louis Lam
cb43ecb46e Merge branch 'master' into background-jobs 
# Conflicts:
#	package-lock.json
#	package.json
#	src/languages/en.js
 2021-10-16 15:06:59 +08:00
Louis Lam
6ff3cb275e
Merge pull request #642 from andreasbrett/patch-2 
Harden 2FA/TOTP implementation according to rfc6238 (part 3)
 2021-10-16 14:30:25 +08:00
NeuralMiner
8cb26d2b31 Text update 2021-10-15 19:12:09 -06:00
Louis Lam
7276f34d90 fix reset-password 2021-10-16 00:57:26 +08:00
Louis Lam
4178983df3 Merge remote-tracking branch 'origin/master' 2021-10-15 19:01:04 +08:00
Louis Lam
cd211a6be7 [http options] fine tune 2021-10-15 18:36:40 +08:00
Louis Lam
4e71ab7406 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-15 16:07:05 +08:00
Louis Lam
c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject 
Add support for custom subject in emails
 2021-10-15 00:54:31 +08:00
Louis Lam
c9b4d2ae2a
Merge pull request #698 from erktime/master 
Add monitor name context to Slack fallback text.
 2021-10-14 23:31:48 +08:00
Louis Lam
3b74b727f2 [Push Type] fix missing important flag and missing up notification 2021-10-14 22:32:15 +08:00
Louis Lam
a7d2a34dae fix ping bug 2021-10-14 18:48:40 +08:00
Louis Lam
60acb91fc8
Merge pull request #687 from xjoker/master 
Add new notification `Aliyun Sms` and `DingDing`
 2021-10-14 17:02:23 +08:00
Louis Lam
f51156f18e run eslint for #687 2021-10-14 16:24:03 +08:00
Louis Lam
8338881927 [SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements 2021-10-14 16:07:25 +08:00
Louis Lam
674b387c95 Merge branch 'master' into smtp-subject 2021-10-14 14:59:54 +08:00
Louis Lam
5ff9a64e5e [Push Type] Fix missing duration calculation (#685) 2021-10-14 14:42:34 +08:00
Louis Lam
4bee57ea7f Merge remote-tracking branch 'giacomo892/patch-1' 
# Conflicts:
#	server/ping-lite.js
 2021-10-14 14:10:51 +08:00
Louis Lam
f75c9e4f0c add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD 2021-10-14 14:09:16 +08:00
xJoker
6e04ec436e
Update server/notification-providers/dingding.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-14 07:34:45 +08:00
xJoker
2d471a5e84
Update server/notification-providers/dingding.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-14 07:34:33 +08:00
xJoker
cae194f58f
Update server/notification-providers/dingding.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-14 07:34:24 +08:00
Aaron Erkenswick
655ccc86b9 Add monitor name context to Slack fallback text. 
The text block of a slack notification payload is used for mobile
devices and plain text previews. This change allows slack users to see
the name of the failing service without having to open up Slack to read
the entire message.
 2021-10-13 11:47:23 -07:00
Louis Lam
e2dbacb383 Fix encoding problem of ping result for non-English Windows 2021-10-14 00:22:49 +08:00
Lukas
89b34b5748 Use double curly brackets and sanity check for customSubject 2021-10-13 18:05:18 +02:00
wuwenjing
843992c410 Add DingDing notification 2021-10-13 16:13:46 +08:00
wuwenjing
57a76e6129 remove alicloud/pop-core keep simple 2021-10-13 14:41:59 +08:00
giacomo892
3fe3450533
Prioritize port passed from args 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-13 08:29:55 +02:00
Lukas
330cd6e058
Minor rehabilitanty impedyment 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-13 07:32:09 +02:00
wuwenjing
a2f2253221 Add aliyun sms notification 2021-10-13 11:55:01 +08:00
Lukas
30d8aadf12 Slightly refactor 2021-10-12 23:24:34 +02:00
giacomo892
d733ec018e
Prioritize host arg 
Otherwise launching the program with the --host argument does nothing
 2021-10-12 19:37:58 +02:00
Nelson Chan
03b07730d3 Fix: Increase default kept period 2021-10-12 23:28:21 +08:00
Andreas Brett
2538bd04ce notp verification defaults 2021-10-11 20:18:40 +02:00
xJoker
1bc77a06e5
Update server/notification-providers/feishu.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-11 20:38:32 +08:00
xJoker
69c623ac2b
Update server/notification-providers/feishu.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2021-10-11 20:38:19 +08:00
wuwenjing
ce2df137e6 change text to using variable msg 2021-10-11 17:53:13 +08:00
wuwenjing
6d9b71c054 Add Feishu notification 2021-10-11 17:20:09 +08:00
Andreas Brett
e223e826a3 linting 2021-10-11 01:02:54 +02:00
Andreas Brett
b5b391c73b
avoid default values for token verification 
override default values: window=1, window size=30 (see https://github.com/louislam/uptime-kuma/issues/640)
 2021-10-10 22:13:18 +02:00
Bert Verhelst
5445c2a2ff fix(monitor): revert unintentional change to comment 2021-10-10 18:41:29 +02:00
Bert Verhelst
dc08510e72 Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers 2021-10-10 18:40:53 +02:00
Louis
2286f78f57 update to 1.8.0 2021-10-10 16:37:53 +08:00
LouisLam
82131f4dd2 merge conflict 2021-10-10 13:09:30 +08:00
Bert Verhelst
5137c80c07 fix(monitor): handle empty headers 2021-10-09 21:51:24 +02:00
Lukas
792f3c7c5c Add support for values of Name, Hostname and Status 2021-10-09 21:48:28 +02:00
Lukas
edb75808d8
Merge branch 'louislam:master' into smtp-subject 2021-10-09 20:37:12 +02:00
LouisLam
56ae6f6117 fix demoMode export 2021-10-10 02:36:20 +08:00
Lukas
5e3ea3293c Very basic email subject customization 2021-10-09 20:32:45 +02:00
LouisLam
5c89562650 not allow lower than 20s for demo mode 2021-10-10 02:23:27 +08:00
Nelson Chan
ac80631bcd Fix: Run clear data at specific time 2021-10-10 00:16:29 +08:00