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

1185 commits

Author SHA1 Message Date
Łukasz Szczepański ec30147a7f Add option for allowing long sms in PromoSMS 2023-01-11 14:32:57 +01:00
Luke 2172112144
Setting for allowing long sms 2023-01-11 12:13:47 +01:00
Luke ecd661c801
Allow long sms in PromoSMS 2023-01-11 12:06:09 +01:00
twiggotronix 8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes 2023-01-11 10:34:24 +01:00
Nelson Chan 21b418230c
Chore: reorder cases 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2023-01-10 19:25:31 +08:00
Matthew Nickson 66d5408aad
Added DB schema for api keys 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-09 20:20:09 +00:00
Joseph Irving 33355c51b7 Add Splunk Notifications 2023-01-09 13:33:10 +00:00
Louis Lam 439f963749
Merge pull request #2569 from Computroniks/bug/2565-negative-retention-value 
Fixed negative retention time values
 2023-01-09 13:08:35 +08:00
Matthew Nickson 32f7a0084a
Fixed negative retention time values 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-08 19:09:06 +00:00
SlothCroissant f8658d6160 Removed redundant title in Pushover notification 2023-01-08 10:32:16 -06:00
Nelson Chan dd82f36da3 Fix: Improve syntax & fix weird label logic 2023-01-09 00:16:18 +08:00
Adam Spurgeon 774d754b21 Add GameDig monitor 2023-01-08 21:43:30 +13:00
Matthew Nickson 5d6770c0db
Removed excess space around function 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-06 20:12:21 +00:00
Matthew Nickson 7a13b959a3
Updated to match changes in #2223 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-06 20:09:40 +00:00
Louis Lam 21c1921867
Update server/uptime-kuma-server.js 
Co-authored-by: 琚致远 / Zhiyuan Ju <juzhiyuan@apache.org>
 2023-01-06 23:04:02 +08:00
Matthew Nickson caff9ca736
Added JSDoc for server/ 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-05 22:19:05 +00:00
long2ice 40ebc2df79 feat: support redis monitor 2023-01-05 23:02:56 +08:00
twiggotronix 8ec240fe19
Merge branch 'louislam:master' into add-mqtt-schemes 2023-01-05 14:08:05 +01:00
Louis Lam fbceefec36
Merge pull request #2223 from Computroniks/feature/remove-hardcoded-ping-path 
feat: Change ping module to danielzzz/node-ping
 2023-01-05 20:40:41 +08:00
Louis Lam 0b959514f8 Fix timeout 2023-01-05 20:38:37 +08:00
Louis Lam 7d92351568 Match previous settings 2023-01-05 19:30:55 +08:00
Louis Lam 494c53971c Convert to UTF8 on Windows only 2023-01-05 19:22:15 +08:00
David Twigger fc1914bccd Fix lint 2023-01-05 11:42:19 +01:00
David Twigger c196c34840 Add mqtt, mqtts, ws and wss protocols to the mqtt monitor 2023-01-05 08:57:48 +01:00
Matthew Nickson 90a2668272
Restructured condition + ensure data is UTF-8 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-04 17:32:27 +00:00
Matthew Nickson 69e1880cd3
Added not active condition to prevent false error 
Added a check to see if the host is alive. This prevents failiures when
the user specifies a hostname of `unknown`.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-01-04 16:46:36 +00:00
Matthew Nickson 73835f3328
Changed from ping-lite to ping module 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

#Fixes 2126
 2023-01-03 20:03:36 +00:00
Nelson Chan 204792dd2d Fix: Fix incorrect handling for container down 2023-01-03 22:07:14 +08:00
Nelson Chan 942b55ca03 Fix: Add support for maintenance in badges 2023-01-03 21:45:55 +08:00
Louis Lam 0cead83705 Fix #2516 2023-01-03 14:50:41 +08:00
Arniwatt Chonkiattipoom a8af2a418e
Slack notification block not working (#1958) 
* [empty commit] pull request for slack notification

* Add attachments block for slack notification

* chore: update action button in new attachment block

* chore: loop in attachments to push blocks

* chore: missing semicolon

Co-authored-by: pruekanw <arniwatt.c@linecorp.com>
 2023-01-02 15:01:50 +08:00
Louis Lam 39ac9b887e Fix #2504 2023-01-01 22:27:14 +08:00
Louis Lam 50711391d1
Revert "Auth: Case insensitive login check on username" 2023-01-01 22:19:00 +08:00
Louis Lam e88e10cc8e Fix #2494 2023-01-01 21:43:54 +08:00
Louis Lam 27146ffeef
Merge pull request #2433 from mathiash98/mathias/Auth-case-insensitive-login 
Auth: Case insensitive login check on username
 2023-01-01 14:16:59 +08:00
Louis Lam 41a9f2ff8a
Merge pull request #2495 from minhhoangvn/fix/update-service-name-grpc 
Bug fix: gRPC check throws errors when response data size > 50 chars
 2023-01-01 13:57:10 +08:00
Louis Lam cd7a6e4019
Merge pull request #2478 from YehowahLiu/master 
Add Kook notification provider
 2023-01-01 02:53:03 +08:00
Louis Lam 8bb064c6fa
Merge pull request #2157 from Mikkel-T/fix-discord-embed 
Improve the URL field in Discord embeds
 2022-12-31 22:41:40 +08:00
Louis Lam 1006fbd873 A possible fix for #2447 2022-12-30 13:46:53 +08:00
Louis Lam 5554432b31
Merge pull request #2377 (Zoho Cliq Notification Provider) 
Zoho Cliq Notification Provider
 2022-12-29 19:00:50 +08:00
minhhoang d111db0321 fix: add accurate error message when user input invalid service name or method name 2022-12-29 08:10:58 +07:00
minhhoang 4147a4c404 fix: #2480 2022-12-28 22:31:33 +07:00
401Unauthorized c60b741406
Add kook notification provider 2022-12-27 14:12:22 +08:00
Louis Lam e12225e595 Fix #2475 #2468 #2455, add Accept-Encoding only if encountered the abort error 2022-12-26 21:00:46 +08:00
Louis Lam 1e689d99b4
Merge pull request #2393 from zImPatrick/discord-docker-fix 
Fix discord notification not sending when docker container goes down
 2022-12-24 14:26:53 +08:00
Louis Lam 14fffcf06b Globally fix if heartbeatJSON["msg"] is undefined 2022-12-24 14:23:50 +08:00
Mathias Haugsbø b3ac7c3d43 Username case insensitive, patch db instead of using LIKE 2022-12-19 12:18:33 +01:00
Mathias Haugsbø c79b2913a2 Auth: Case insensitive login check on username 
Allows users to add users with capital letters and then login with just lowercase letters.

We accidentally capitalized the first letter of our username so the other people using it frequently thinks they wrote the wrong password.
 2022-12-18 17:16:19 +01:00
Louis Lam df21f7da76 Check login for initServerTimezone 2022-12-16 12:56:40 +08:00
Louis Lam b75db27658 Fix lint 2022-12-15 13:57:28 +08:00
Louis Lam 765d8e1297 Fix #2318 2022-12-15 13:39:48 +08:00
Louis Lam 9dc2cc1f0d Copy timezone.js from dayjs 2022-12-15 13:05:04 +08:00
Louis Lam 1da00d19fd Try to fix incorrect header check 2022-12-14 21:34:13 +08:00
Louis Lam 466b403a96 Handle unexpected error of checkCertificate 2022-12-13 02:21:12 +08:00
zImPatrick f32441e2f6 fix discord notification not sending when docker container is down 2022-12-12 18:05:10 +01:00
Louis Lam 39987ba9ac Init server timezone 2022-12-12 22:57:57 +08:00
Louis Lam 3b87209e26 Add configurable dns cache 2022-12-12 17:19:22 +08:00
Louis Lam 3b58fd3b3c Cache uptime 2022-12-11 21:33:26 +08:00
Louis Lam bc86f8bb5f Reset busy_timeout to default 2022-12-11 20:25:15 +08:00
Louis Lam 02b5cae577 Fix #2371 by left join maintenance_timeslot 2022-12-09 21:03:12 +08:00
Louis Lam 4cd5b5563f Fix #1145 2022-12-08 23:21:55 +08:00
panos 9da28fbbc7 zoho cliq code style 2022-12-08 13:56:02 +02:00
panos 851a04b082 zoho cliq code style 2022-12-08 13:53:02 +02:00
panos 68bc7ac421 zoho cliq code style 2022-12-08 13:41:05 +02:00
panos 73bfdb9ef9 zoho cliq notification provider 2022-12-08 13:32:10 +02:00
Louis Lam e478084ff9 Fix Uptime Kuma cannot be stopped 2022-12-08 19:13:47 +08:00
Louis Lam eadf2c810a Fix check version 2022-12-05 19:17:24 +08:00
Louis Lam ee1a56caae Update /test-webhook and reevaluate sensitive fields 2022-12-05 18:18:19 +08:00
Louis Lam e886df4788 Fix typo 2022-12-05 17:55:45 +08:00
Louis Lam 5196abfd36 Merge remote-tracking branch 'origin/master' into feat/add-auth-header-to-webhook-notification-#1919 2022-12-05 17:52:02 +08:00
Louis Lam 3e68cf2a1c Specify Accept-Encoding for axios request (Fix #2253) 2022-12-04 22:55:05 +08:00
Louis Lam 191f3ad53b
Merge pull request #2339 from jbrunner/fix-2296 
Add socks5h support
 2022-11-25 16:24:21 +08:00
Joshua Brunner cd270bd8b5 Add socks5h support 
Add socks5h support as an extra option to not break previous socks5 implementation.
Allows to toggle between socks5 and socks5h explicit.

Fixes #2296
 2022-11-22 11:18:16 +01:00
Matthew Nickson 2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-11-17 19:04:14 +00:00
Matthew Nickson 15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-11-17 18:46:58 +00:00
Matthew Nickson b053bc61ce
Fixed MySQL monitor to close connection 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-11-17 18:34:02 +00:00
rmarops 0e30843a75 fixed lint check missing semicolon 2022-11-16 22:27:18 -05:00
rmarops 2103edb604 moved client close out of finally block and fixed linting errors 2022-11-16 22:21:15 -05:00
rmarops b059a36e66 added MongoDB ping monitor 2022-11-16 20:50:34 -05:00
Jan Hartje 258ff56962
Merge branch 'louislam:master' into feat/add-auth-header-to-webhook-notification-#1919 2022-11-14 20:17:36 +01:00
Louis Lam cb4e512dc6
Merge pull request #2316 from Dafnik/patch-fix-link-preview-description 
Fix 'undefined' in link preview generation
 2022-11-15 02:37:28 +08:00
Dafnik 4042c26390 Fix 'undefined' in link preview generation 2022-11-14 18:05:52 +01:00
Louis Lam cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol 
Feat/add gRPC protocol
 2022-11-11 12:34:35 +08:00
Louis Lam 68862c0b3f Fix Pushbullet do not handle general message correctly and fix name convention (Close #1890) 2022-11-01 20:27:40 +08:00
Louis Lam fd15e7c2dc Merge remote-tracking branch 'origin/master' into ntfy-icon 
# Conflicts:
#	server/notification-providers/ntfy.js
#	src/components/notifications/Ntfy.vue
#	src/languages/en.js
 2022-10-31 17:10:20 +08:00
Louis Lam 5c4cf68937
Merge pull request #2260 from m-kiszka/smseagle 
Added support for SMSEagle device API notifications
 2022-10-31 17:03:34 +08:00
minhhn3 b459408b10 fix: resolve conflict 2022-10-26 20:41:21 +07:00
Adam Stachowicz 134b3b8ac1 Fix 'dayjs' is never used warning 2022-10-25 01:27:25 +02:00
Marcin Kiszka 08763b700a Added support for SMSEagle device API notifications 2022-10-24 12:45:56 +02:00
Matthew Nickson 4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size 2022-10-22 16:22:28 +01:00
Louis Lam 24cb212a37 Fix recurring 2022-10-15 20:15:50 +08:00
Louis Lam d8a676abb6 Implement recurring day of month and day of week 2022-10-15 18:49:09 +08:00
Louis Lam 0b8d4cdaac Generate Next Timeslot for recurring interval 2022-10-15 17:17:26 +08:00
Louis Lam 268cbdbf8d Merge remote-tracking branch 'origin/master' into maintenance 
# Conflicts:
#	server/server.js
#	src/components/settings/General.vue
 2022-10-15 15:57:39 +08:00
Matthew Nickson f459ea845c
Added #2182 Add support for custom radius ports (#2197) 
This commit adds support for the port to be specified when using the
radius monitor type. A check has been implemented to ensure that a null
value is not passed to the radius check function as could occur with
monitors that were created before this change was introduced. The
default port of 1812 is displayed when the user selects the radius
monitor in much the same way as the DNS port is handled. The port was
not included in the hostname in the form hostname:port in order to avoid
issues with IPv6 addresses and monitors that had been created before
this change was implemented.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-10-13 00:32:05 +08:00
Louis Lam b24c75eec5
Merge pull request #2162 from UltraWelfare/fix-entry-page-redirect 
Fixed entry route not redirecting correctly.
 2022-10-13 00:28:34 +08:00
Louis Lam edacff123b Add UTC in the serverTimezone dropdown 2022-10-12 22:13:07 +08:00
Louis Lam 2faf866e9e Implement generateTimeslot() for recurring interval type 2022-10-12 17:02:16 +08:00
Louis Lam 7b9766091e Revert testing 2022-10-11 22:18:09 +08:00
Louis Lam 39b6725163 Update maintenance tables 2022-10-11 21:48:43 +08:00
Louis Lam dfb75c8afb Update status page's maintenance message 2022-10-11 20:56:48 +08:00
Louis Lam e07aa982c3 WIP 2022-10-11 18:23:17 +08:00
Christian Meis 1e8a16504b Make icon optional for ntfy notificaation provider. Add Icon header to ntfy request only, if icon is actually defined. 2022-10-11 11:15:33 +02:00
Louis Lam 2271ac4a5a Add info.serverTimezoneOffset and improve some styles 2022-10-11 14:52:47 +08:00
Louis Lam c84de4d259 WIP: Add maintenance status 2022-10-11 01:45:30 +08:00
Louis Lam c1ccaa7a9f WIP 2022-10-10 20:48:11 +08:00
Louis Lam 539683f8e9 Merge remote-tracking branch 'origin/master' into maintenance 2022-10-10 16:50:25 +08:00
Louis Lam 71af23cf00 Fix #2207 2022-10-10 02:47:24 +08:00
Louis Lam a577fba848 Change DateTime Range using serverTimezone 2022-10-10 02:28:03 +08:00
Louis Lam a36f24d827 Add configurable server timezone 2022-10-09 20:59:58 +08:00
Louis Lam b007681e67 Merge remote-tracking branch 'origin/master' into karelkryda_master 
# Conflicts:
#	server/model/monitor.js
#	server/model/status_page.js
#	src/languages/en.js
 2022-10-09 19:26:00 +08:00
Louis Lam ad1a7c255f Drop exports.entryPage fully 2022-10-08 23:56:58 +08:00
Louis Lam 6e07ed2081 Fix #2186 2022-10-07 15:02:19 +08:00
Louis Lam 959ecc65ff Merge remote-tracking branch 'origin/master' 2022-10-06 23:28:29 +08:00
Louis Lam c24b64921d Fix #2183 ntfy issue 2022-10-06 23:28:06 +08:00
janhartje b879428a03
feat(notification): add additional Header to webhook 2022-10-05 17:48:07 +02:00
Ben Scobie c28d8ddff9
Correctly handle multiple IPs in X-Forwarded-For (#2177) 
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2022-10-05 23:45:21 +08:00
janhartje 3c5de1c889 Merge branch 'master' of https://github.com/louislam/uptime-kuma into feat/add-auth-header-to-webhook-notification-#1919 2022-10-05 16:44:13 +02:00
CL0Pinette 528a615fb2
Add free.fr SMS notification provider (#2159) 2022-10-05 17:30:49 +08:00
Louis Lam b993859926
Drop Jest e2e testing (#2174) 2022-10-05 14:26:30 +08:00
Sympatron GmbH f1a9046193
Prevent terminal window from showing when using ping on Windows (#2152) 2022-10-04 23:30:19 +08:00
Louis Lam c538983b87
Merge pull request #2169 from louislam/fix-docker-monitor 
Fix Docker container monitor not working in 1.18.1
 2022-10-04 17:47:56 +08:00
Louis Lam 0686757160 [Docker Monitor] Change tcp:// to http:// 2022-10-04 16:19:56 +08:00
George Tsomlektsis 3e699f8ac3 Fix linting errors. 2022-10-03 18:01:52 +03:00
George Tsomlektsis b0d6b5b13d Fixed entry route not redirecting correctly when the status entry page changes slug. 2022-10-03 17:48:34 +03:00
Louis Lam 3e85893bdd Merge remote-tracking branch 'origin/master' into squadcast-notification-support 
# Conflicts:
#	src/languages/en.js
 2022-10-03 16:16:50 +08:00
Louis Lam 543a74ecab
Merge pull request #1923 from rolfbachmann/ntfy-auth-support 
Add authentication support for ntfy
 2022-10-03 15:54:55 +08:00
Louis Lam 62ad2f9bb4
Merge pull request #2148 from Computroniks/bug/octopush-notifications-#2144 
Fixed octopush legacy doesn't return error code
 2022-10-03 15:53:54 +08:00
Louis Lam 0f99d49a27 Merge remote-tracking branch 'origin/master' into ntfy-auth-support 2022-10-03 15:30:00 +08:00
Louis Lam d93f7b33be
Merge pull request #2153 from Computroniks/bug/#2009-teams-unnecessary-url-field 
Fixed alert features unnecessary URL field #2009
 2022-10-03 15:20:45 +08:00
Mikkel-T a42f7416b5 Improve the URL field in Discord embeds 
Instead of having two different ways of showing the URL field in Discord embeds, always show the raw address.
 2022-10-02 19:29:33 +02:00
Matthew Nickson 6a3eccf6a6
Fixed alert features unnecessary URL field #2009 
The filling of the URL field was incorrect previously. It has been
updated to handle new monitor types.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-10-02 02:26:38 +01:00
Matthew Nickson f9be918246
Add support for MySQL/MariaDB databases #1817 
This commit adds support for monitoring MySQL and MariaDB database
servers. The mysql2 package was choosen over mysql as it provides a
promise wrapper and is reportedly faster than the original mysql package
whilst still maintaining the same API.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-10-02 01:52:53 +01:00
Matthew Nickson 97de3959cd
Updated octopush error handling to accept 000 
The legacy octopush API includes an error code with all responses. A
code other than 000 is an error.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-10-01 19:48:00 +01:00
Matthew Nickson 63e408f4f2
Fixed octopush legacy doesn't return error code 
The octopush legacy API does not return a HTTP error code and instead
always returns a HTTP 200. This means that no error it thrown even if
something like the parameters are incorrect.
Instead the error code is given in the json response data.
Therefore we must look at the response data and check for the presence
of the "error_code" key in the response data.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-10-01 15:42:34 +01:00
Matthew Nickson 2e54dee817
Fixed Octopush Notifier not working #2144 
The version number was passed as a string from the frontend but was
checked against a number in the backend provider. This caused the if else
if to fall through into an error. The literal it is now being compared
has been changed to a string and the unknown version error is no longer
encountered.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2022-10-01 15:03:28 +01:00
Christian Meis e12642cf21 Fix double quotes in fallback for no icon url in ntfy notification provider settings 2022-09-28 10:24:56 +02:00
Christian Meis 6f86236b63 Add support for icon to ntfy notification provider (requires minimum ntfy server version 1.28.0 and Android app 1.14.0, no iOS support as of today) 2022-09-28 10:13:18 +02:00
Louis Lam 204339fbed Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss 2022-09-28 00:48:15 +08:00
Louis Lam b1465c0282 - Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss 
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
 2022-09-28 00:20:17 +08:00
Louis Lam 4002b9f577 [WIP] Checking maintenance time using maintenance_timeslot table 2022-09-27 20:44:44 +08:00
Justin Tisdale 6537f4fe74 content-type change 2022-09-26 17:09:10 -04:00
Justin Tisdale 5809088f27 Don't override a user-defined content-type header 2022-09-26 15:52:43 -04:00
Patrick bef9cb6a5f Linting fixes 2022-09-26 22:30:43 +13:00
Patrick 4157c7d546 Add support for Squadcast incoming webhook 2022-09-26 22:16:34 +13:00
Justin Tisdale 0814d643c1 Merge branch 'master' into feature/expand-http-payload-support 2022-09-25 10:45:32 -04:00
Louis Lam 3f63cb246b [WIP] Handle timezone offset for timeRange 2022-09-25 19:38:28 +08:00
Louis Lam f11dfc8f43 [WIP] Add/Edit Maintenance with new UI and recurring 2022-09-24 19:18:24 +08:00
Louis Lam 9d99c39f30 Update Maintenance UI for recurring 2022-09-24 02:33:29 +08:00
MA Junyi b03624b7e3 feat: Add ServerChan Notification support 2022-09-23 23:27:22 +08:00