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
2766 commits 30 branches 115 tags 68 MiB
Commit graph

756 commits

Author SHA1 Message Date
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
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
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
Louis Lam
44fb2a88f2 Add cloudflared socket handler 2022-03-29 14:48:02 +08:00
Louis Lam
be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete 
Fix: Remove prometheus metrics on delete [Test needed]
 2022-03-27 11:05:50 +08:00
Louis Lam
28d72fcd08 Fix #1409, slug cannot be empty 2022-03-24 23:43:07 +08:00
Louis Lam
71af08189e Clear useless code 2022-03-24 18:03:31 +08:00
Louis Lam
d32ba7cadd Fix #1318, basic auth is completely disabled if the auth is disabled 2022-03-24 18:02:34 +08:00
Louis Lam
775d1696fa Fix pushover device not working #1114 2022-03-24 12:14:17 +08:00
Louis Lam
ad2130b7b5 [Status Page] Fix monitors are deleted unexpectedly #1399 2022-03-22 00:06:29 +08:00
Louis Lam
3adda48f3a Load the status page list earlier 2022-03-21 15:28:59 +08:00
Louis Lam
d7a839aa52 [Status Page] Fix reset entry page 2022-03-18 17:57:08 +08:00
Louis Lam
aef0a66205 [Status Page] Simplify show tags logic 2022-03-18 17:56:46 +08:00
Louis Lam
37be7df9b0 [Status Page] Delete status page 2022-03-18 15:19:52 +08:00
Louis Lam
8d981c8f0b [Status Page] Fix migration and unpin incident 2022-03-18 14:14:22 +08:00
Louis Lam
27bfae67af [Status Page] Add a new status page 2022-03-17 23:38:43 +08:00
Louis Lam
719a136d1e [Status Page] Improved entry page 2022-03-17 22:44:47 +08:00
Louis Lam
e87cdf4d09 [Status Page] wip, upload logo and status page listing 2022-03-17 16:42:26 +08:00
Louis Lam
1033ca5cf4 [Status Page] wip, combine api, add status_page_id into group and incident tables 2022-03-16 15:38:10 +08:00
Louis Lam
18ec42b060 [Status Page] wip 2022-03-16 14:14:47 +08:00
Louis Lam
7c7dbf68c1 [Status Page] wip, sidebar for editor 2022-03-15 12:00:29 +08:00
Louis Lam
50d6e888c2 [new status page] wip 2022-03-10 21:34:30 +08:00
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
Jens Neuber
28be32fc68 Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges 2022-01-28 08:36:05 +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
Jens Neuber
f00ec4dfef
PR feedback: remove spaces in parenthesis 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-05 15:26:29 +01:00
Jens Neuber
43f8fc701c
PR feedback: remove spaces in parenthesis 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-05 15:26:23 +01:00
Jens Neuber
499042504f
PR feedback: remove spaces in parenthesis 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-05 15:26:07 +01:00
Jens Neuber
faf6719e7c
PR feedback: remove spaces in parenthesis 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-05 15:25:56 +01:00
Jens Neuber
a9d264ccfc
PR feedback: remove spaces in comments 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2022-01-05 15:25:42 +01:00
Jens Neuber
df8f93f0c2 clean uptime percentage display 2022-01-05 11:48:25 +01:00
Jens Neuber
28c0e16a0c PR feedback 2022-01-04 16:01:40 +01:00
Jens Neuber
6acc9546a0 PR feedback + remove redundant code + add a test 2022-01-04 16:00:21 +01:00
Jens Neuber
f455e3a454 add shields.io 'style' parameter 2022-01-04 13:43:13 +01:00
Jens Neuber
7abbf421d0 PR feedback 2022-01-04 12:23:16 +01:00
Jens Neuber
3625915a85 add ping, status badge 2022-01-04 12:21:53 +01:00
Jens Neuber
d74404e106 minor fixes 2022-01-03 16:23:23 +01:00
Jens Neuber
1c5bce8afa a little documentation 2022-01-03 16:04:37 +01:00
Jens Neuber
35360e2069 add badges 2022-01-03 15:48:52 +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