1491 commits

Author	SHA1	Message	Date
Louis Lam	d9f12a6376	Fallback to /bin/ping if ping is not found	2023-01-12 01:05:16 +08:00
Łukasz Szczepański	56ba133a1f	Missing semicolon	2023-01-11 14:36:33 +01:00
Ł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
Sjouke de Vries	94b69935fe	chore(server): remove comments from status-page router	2023-01-09 11:16:47 +01:00
Sjouke de Vries	3f30feaefb	feat(server): add badge for overall status of status-page	2023-01-09 11:04:32 +01: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
Ruben	9404efd86d	Fixed the metrics for the push type.	2022-12-28 10:37:25 +01: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
Louis Lam	a4de93f976	WIP	2022-12-23 22:43:56 +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
Louis Lam	120e578398	Move maintenance code to maintenance-socket-handler.js	2022-09-17 16:58:08 +08:00
Louis Lam	7017c2e625	Move maintenance code to maintenance-socket-handler.js	2022-09-17 16:54:21 +08:00
Louis Lam	2f67d26702	Merge manually, as this part had been moved	2022-09-17 16:20:10 +08:00
Louis Lam	90761cf831	Merge remote-tracking branch 'origin/master' into karelkryda_master ... # Conflicts: # server/database.js # server/model/monitor.js # server/routers/api-router.js # server/server.js # src/components/HeartbeatBar.vue # src/components/MonitorList.vue # src/icon.js # src/layouts/Layout.vue # src/mixins/datetime.js # src/mixins/socket.js # src/router.js # src/util.js	2022-09-17 16:12:57 +08:00
Louis Lam	f96bad1629	Merge pull request #2089 from jakubenglicky/smsmanager ... feat: Add support notification via SMSManager	2022-09-16 14:29:50 +08:00
Super Manito	38c45a3fe3	Fix previously PR bug about Bark Notification (#2084) ... Co-authored-by: zuosc <zorro.zsc@hotmail.com>	2022-09-16 14:21:22 +08:00
jakubenglicky	2d5096317f	Fix warning at goalert.js	2022-09-15 09:11:27 +02:00
jakubenglicky	1c3da995e3	Add support notification via SMSManager	2022-09-15 09:11:05 +02:00
Matthew Nickson	742b1337be	Merge branch 'master' into feature/#1891-set-ping-packet-size	2022-09-10 21:20:03 +01:00
Louis Lam	197d44981f	Merge remote-tracking branch 'origin/master' into test/add-cypress-tests ... # Conflicts: # package.json	2022-09-09 16:32:23 +08:00
Louis Lam	1e5376d80b	Merge pull request #2011 from mhkarimi1383/goalert-notification ... Adding GoAlert Notification	2022-09-09 03:34:37 +08:00
Justin Tisdale	fa1fc0fb05	Merge branch 'master' into feature/expand-http-payload-support	2022-09-07 11:34:58 -04:00
Louis Lam	84fad93555	Merge pull request #1735 from woooferz/patch-1 ... Added label to status badge	2022-08-29 21:19:15 +08:00
Muhammed Hussein karimi	a8ea76e8a1	Remove extra debug log ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-08-26 17:05:32 +04:30
Muhammed Hussein Karimi	584d52517a	[Linter] fixing quotes with doublequote	2022-08-24 10:41:42 +04:30
Muhammed Hussein Karimi	82dd9a7c16	golaert req fix and axios update for formdata	2022-08-24 10:36:29 +04:30
Muhammed Hussein Karimi	d44663c57c	provider name fix	2022-08-24 09:37:15 +04:30
Muhammed Hussein Karimi	e557545c97	goalert needs post instead of get	2022-08-24 08:46:20 +04:30
Muhammed Hussein Karimi	40b9d9ed17	goalert provider missing semicolon fix for linter	2022-08-23 22:26:20 +04:30
Muhammed Hussein Karimi	65e6921a41	goalert notification provider added	2022-08-23 22:22:54 +04:30
minhhn3	3a90d246a4	fix: wrong type	2022-08-20 22:45:11 +07:00
Justin Tisdale	6ec6410808	Merge branch 'master' into feature/expand-http-payload-support	2022-08-20 10:24:18 -04:00
Matthew Nickson	c3d655afb4	Merge branch 'master' into feature/#1891-set-ping-packet-size	2022-08-13 21:15:16 +02:00
minhhn3	6bb79597e8	fix: resolve merge conflict	2022-08-13 13:26:05 +07:00
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
Justin Tisdale	31cc328839	fix lint	2022-08-11 21:08:13 -04:00
Justin Tisdale	0d58526f25	Merge branch 'master' into feature/expand-http-payload-support	2022-08-11 21:04:11 -04:00
Justin Tisdale	2b9bf095a6	Add non-json support for http body	2022-08-11 20:57:03 -04: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
minhhn3	34ab6142db	fix: remove new space line	2022-08-08 19:38:43 +07: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
minhhn3	2232236a7a	[empty commit] pull request for add gRPC protocol	2022-08-03 13:39:31 +07:00
Minh Hoàng	dcecd10c88	Feat/add gRPC protocol (#1) ... * feat: added monitor with gRPC Co-authored-by: minhhn3 <minhhn3@vng.com.vn>	2022-08-03 12:00:39 +07: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
Rolf Bachmann	c4a2ce4e78	Add authentication support for ntfy	2022-07-19 12:17:15 +02:00
tamasmagyar	a382f811f4	added comment to startE2eTests function	2022-07-18 20:51:17 +02:00
tamasmagyar	986c03aecd	test cypress run	2022-07-18 20:51:17 +02:00
Jan Hartje	af07c7f050	feat(notification): add Authorization Header option to backend	2022-07-18 16:04:27 +00: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
Matthew Nickson	b5f04573f2	Added formatting to ping options ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-07-14 09:19:40 +01:00
Matthew Nickson	a54e58b4d6	Added Ping packet size #1891 ... This should fully implement #1891 by adding an extra field to the edit monitor page and an extra column to the database. The user can now set the size of the packet to send, it defaults to 56. A maximum limit of 65500 was chosen to ensure that the total size of the packet does not exceed the IPv4 maximum packet size and to comply with the limit imposed by Windows. Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-07-14 08:32:51 +01: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
Louis Lam	b97019eea8	Fix cloudflared cannot be stopped in No Auth mode due to password checking	2022-06-18 19:06:03 +08:00
sur.la.route	47e82ed83a	Removed blank line ... Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-06-15 20:14:36 -05:00
sur.la.route	e1f766756f	Removed blank line ... Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-06-15 20:14:26 -05:00
Christopher Pickering	edcdedcaae	Added check for blank password.	2022-06-15 13:00:14 -05:00
Christopher Pickering	945288f0c0	Added postgres monitor	2022-06-15 12:12:47 -05:00
OidaTiftla	ac27e6e2af	Rename feature to: Resend Notification if Down X times consequently ... Co-authored-by: Louis Lam <louislam@users.noreply.github.com>	2022-06-15 17:50:35 +02:00
OidaTiftla	869a040011	Merge branch 'master' into introduce-resend-interval	2022-06-15 16:19:47 +02:00
Louis Lam	fdbdf83a0d	Fix data type of notification.isDefault and notification.active (#1765)	2022-06-15 19:11:52 +08:00
Moritz R	ac449ec1c2	Merge branch 'master' into master	2022-06-15 11:33:00 +02:00
Christopher Pickering	660005b143	cleaned up code	2022-06-14 08:49:36 -05:00
Christopher Pickering	98f3c126e5	passed lint	2022-06-14 07:58:35 -05:00
sur.la.route	cf2ca71dee	prevent null workstation #'s from passing.. ... to axios-ntlm	2022-06-14 07:42:53 -05:00
Aram Akhavan	c690d1c3a1	fix timeout bypass for upside down push monitor	2022-06-13 22:05:58 -07:00
Louis Lam	6682839ec8	Merge remote-tracking branch 'origin/master' into ntml-auth ... # Conflicts: # package-lock.json # package.json # server/database.js # server/model/monitor.js # server/server.js # server/util-server.js	2022-06-14 10:36:29 +08:00
Super Manito	54b9698a05	Update	2022-06-13 21:44:10 +08:00
Louis Lam	6424fe77ab	Change successful log from info to debug in order to avoid large log and less disk usage	2022-06-13 21:15:47 +08:00
Louis Lam	6e43ef1dd3	Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings ... # Conflicts: # server/model/monitor.js # src/languages/en.js	2022-06-13 20:56:14 +08:00
Louis Lam	a28ef56553	Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve ... # Conflicts: # package-lock.json # package.json	2022-06-13 18:53:19 +08:00
Louis Lam	f570d41142	Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve ... # Conflicts: # package-lock.json # package.json	2022-06-13 18:50:43 +08:00
Super Manito	1c4ddaeddf	Update	2022-06-13 18:17:47 +08:00
Super Manito	55a6e5af42	Update server/notification-providers/bark.js ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-06-13 17:06:12 +08:00
Super Manito	252709ff49	Update server/notification-providers/bark.js ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-06-13 17:06:05 +08:00
Super Manito	404923b7c8	bugfix	2022-06-12 22:49:04 +08:00
Super Manito	a41023ca2a	Update	2022-06-12 22:41:24 +08:00
Super Manito	817c941489	Add Bark Notification Parameters	2022-06-12 22:30:42 +08:00
Daeho Ro	5f6347d277	pull request for adding alertnow notification	2022-06-12 04:02:44 +09:00
Matthew Nickson	fbfa5a33ed	Added Clickable hostname on status page. #1221 ... This should fully implement #1221 by modifying the API and adding two new properties to the result. The `sendUrl` property denotes if the URL is sent and `url` is included when required. Client side checks have been implemented in order to only show a link when the URL is vaugely correct. I.e not "" or "https://". This prevents the link from being included if the monitor type is not HTTP without having to publicly expose the monitor type. The exposure of the URL is configuarable for each monitor on each status page by clicking on the link icon. Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-06-11 17:23:12 +01:00
Louis Lam	04e22f17a9	Merge remote-tracking branch 'origin/master' into christopherpickering_master ... # Conflicts: # package-lock.json # src/languages/en.js	2022-06-11 20:59:58 +08:00
Wooferz	aa398948da	Merge branch 'louislam:master' into patch-1	2022-06-11 09:41:03 +10:00
Louis Lam	11243a6ca1	Merge pull request #1222 from NETivism/issue-1201 ... Show some pure text body in notification when keyword not found	2022-06-09 19:33:10 +08:00
Wooferz	54548e34ed	Added label to status badge	2022-06-08 20:05:10 +10:00
Nelson Chan	2c0180f323	Fix: Fix error when status page desc. is null	2022-06-07 14:57:23 +08:00
Louis Lam	4fdaa1abb6	[Push API] Response 404 if error, fix #1721	2022-06-06 22:40:26 +08:00
Louis Lam	cc258dce14	Merge pull request #1674 from philippdormann/feature/ntfy-support ... feat: ntfy push support	2022-06-06 21:52:41 +08:00
Louis Lam	a707b51053	Page Loading Speed Optimization (#1711) ... * Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer * Prebuild gzip and brotli for assets Original: ~1.2MB Optimized: ~370KB	2022-06-05 23:43:25 +08:00
Louis Lam	091158cfe7	[Status Page] Preload data	2022-06-01 13:05:12 +08:00
Louis Lam	e4ad8cbfc8	Remove unused variables	2022-05-31 23:06:43 +08:00
Louis Lam	a674caa520	[Status Page] Add og meta tags	2022-05-31 22:53:48 +08:00
Karel Krýda	fa777c5bc0	Update server/server.js ... Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-05-30 15:32:42 +02:00
Karel Krýda	6d0683b055	Update server/routers/api-router.js ... Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-05-30 15:32:19 +02:00
Karel Krýda	25262cfb91	Update server/model/monitor.js ... Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-05-30 15:31:45 +02:00
Louis Lam	c095767f4a	[Status Page] SSR	2022-05-30 15:45:44 +08:00
Louis Lam	ffb7ba176c	Merge remote-tracking branch 'origin/master' into status-page-inject-html	2022-05-30 14:00:39 +08:00
Aram Akhavan	ea10d89f51	show correct down message for first tick	2022-05-28 19:57:45 -07:00
Louis Lam	7f46223d68	Fix another log.debug call	2022-05-28 23:22:44 +08:00
Louis Lam	df4ce811d9	Merge remote-tracking branch 'origin/master' into kaysond_master ... # Conflicts: # server/model/monitor.js	2022-05-28 23:19:58 +08:00
Moritz R	e9e78c26e5	Merge branch 'master' into master	2022-05-27 13:59:58 +02:00
Aram Akhavan	ab4edf2092	Fix log.debug calls	2022-05-26 21:45:56 -07:00
Marc Hagen	5830f1e0b5	[feat] Adding PagerDuty notification	2022-05-25 14:10:31 +02:00
Louis Lam	35b8e89457	Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port ... Added #1059: Allow to specify Resolver Port for DNS Monitor	2022-05-25 14:59:14 +08:00
DasCanard	f23baf9c22	Added Push Monitor to Discord Notifications	2022-05-24 23:14:27 +02:00
Philipp Dormann	54184350a4	fix: missing semicolons	2022-05-23 21:13:57 +02:00
Philipp Dormann	14dbe7c334	clean up + default ntfs.sh server url	2022-05-23 21:11:01 +02:00
Philipp Dormann	71f031c14e	add ntfy support ... ref https://github.com/louislam/uptime-kuma/issues/1622	2022-05-23 10:55:03 +02:00
c0derMo	32cfd411f8	Fixed style & code errors	2022-05-19 12:35:55 +00:00
Moritz R	a9f3142cee	Merge branch 'master' into master	2022-05-19 14:24:02 +02:00
Nelson Chan	b7ba6330db	Feat: Add cert exp. settings	2022-05-19 16:49:34 +08:00
Sascha Kruse	da99a57560	Merge remote-tracking branch 'fxgh/radius-check' into radius-check	2022-05-18 15:56:21 +02:00
Sascha Kruse	42d68edab0	(style) add trailing comma ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-05-18 15:55:36 +02:00
Sascha Kruse	019d638767	Merge remote-tracking branch 'ghupstream/master' into radius-check	2022-05-18 15:54:10 +02:00
Louis Lam	7a46b44d25	Merge remote-tracking branch 'origin/master' into karelkryda_master ... # Conflicts: # src/components/HeartbeatBar.vue	2022-05-18 19:49:54 +08:00
Louis Lam	8ede6d888f	Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url	2022-05-14 14:37:12 +08:00
Louis Lam	cec0521834	[Discord] Fix ping type should no port, update better naming	2022-05-14 14:36:40 +08:00
Louis Lam	73b603dd10	Merge pull request #1627 from karelkryda/wrong-uptime-for-push ... Fixed incorrect uptime calculation for push monitors	2022-05-14 14:18:19 +08:00
Christopher Pickering	ef73af391f	added option for ntlm authorization	2022-05-13 12:58:23 -05:00
Christopher Pickering	44f6fca945	added finally to close connection pool	2022-05-13 09:34:31 -05:00
Christopher Pickering	c346ea7864	updated name on export	2022-05-13 08:57:06 -05:00
Christopher Pickering	f0ad32a252	merged	2022-05-13 08:41:31 -05:00
Christopher Pickering	5720017fb4	updated name on import	2022-05-13 08:40:46 -05:00
sur.la.route	5bba19f866	updated format ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-05-12 19:54:12 -05:00
sur.la.route	e198f2f1ab	updated format ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-05-12 19:54:02 -05:00
Christopher Pickering	87f933df4f	added sqlserver monitor	2022-05-12 12:48:03 -05:00
Sascha Kruse	398ecb7666	add radius check	2022-05-12 15:21:13 +02:00
Louis Lam	66971deaf4	Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url	2022-05-11 00:51:42 +08:00
Louis Lam	59be9bb971	working	2022-05-11 00:51:11 +08:00
Louis Lam	8077744c60	Merge pull request #1604 from c-w/fix-apprise-zulip ... Fix apprise integration for Zulip Streams	2022-05-11 00:47:50 +08:00
Jordan Bertasso	c5faf709b8	Merge branch 'master' into fix-1448-discord-service-url	2022-05-10 22:53:55 +10:00
Karel Krýda	7da9f139c1	Bug fix	2022-05-09 21:10:12 +02:00
Karel Krýda	42f931f6cf	Merge branch 'master' into master	2022-05-09 10:28:14 +02:00
Karel Krýda	2fe5c090aa	small fixes	2022-05-08 20:50:08 +02:00
Clemens Wolff	b680371746	Make apprise notification title configurable in UI	2022-05-07 11:00:57 -04:00
Louis Lam	4e3258579d	Merge branch 'master' into uptime-badges ... # Conflicts: # server/util-server.js	2022-05-07 13:26:47 +08:00
Aram Akhavan	cd3fbc80b4	Add first parameter back to logging in api router	2022-05-06 16:05:24 -07:00
Aram Akhavan	bb7d67f717	Apply suggestions from code review ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-05-06 09:58:05 -07:00
Karel Krýda	9a35386841	Merge branch 'master' into master	2022-05-06 11:24:21 +02:00
Louis Lam	429ad384d0	Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()	2022-05-06 14:41:34 +08:00
OidaTiftla	93050208bb	Merge database changes into single patch file	2022-05-05 16:01:19 +02:00
OidaTiftla	98ee9caf2c	Add variable for currentTime ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-05-05 15:55:33 +02:00
OidaTiftla	8e99cbf426	Merge branch 'master' into introduce-resend-interval	2022-05-04 22:58:40 +02:00
Greg Smith	cbfecab850	switch to the more-up-to-date esm-wallaby ... https://github.com/wallabyjs/esm	2022-05-04 15:45:18 +09:30
Clemens Wolff	4b9dc2890d	Convert let to const	2022-05-02 11:16:08 -04:00
Clemens Wolff	f9004bcbed	Add optional title to apprise notification	2022-05-02 11:14:26 -04:00
Clemens Wolff	bc174c3325	Extract child process args into variable	2022-05-02 11:00:14 -04:00
Louis Lam	4c2753af46	Remove an unused variable	2022-05-02 13:36:35 +08:00
Louis Lam	c6ba5b621c	Remove isPublished, checkPublished which had been removed in upstream.	2022-05-02 13:32:19 +08:00
Karel Krýda	2b14bdae62	Merge branch 'master' into master	2022-05-01 12:40:34 +02:00
Louis Lam	d962ab7a1c	Merge branch 'master' into uptime-badges ... # Conflicts: # package-lock.json # server/routers/api-router.js	2022-05-01 17:03:11 +08:00
Louis Lam	53b98ad3e4	Add more comment for aliyun-sms fix	2022-05-01 12:10:47 +08:00
Greg Smith	d0546afe71	fix esm require: no ugly warnings	2022-05-01 10:22:16 +09:30
Karel Krýda	31b90d12a4	Added the ability to choose on which status pages maintenance information should be displayed	2022-04-30 17:17:22 +02:00
Karel Krýda	b4ffcc5555	Added JSDoc	2022-04-30 15:50:05 +02:00
Louis Lam	42ea3fb412	Update server/util-server.js ... Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-30 21:36:07 +08:00
Louis Lam	9f8b3151d8	Update server/util-server.js ... Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-30 21:36:00 +08:00
GOGOsu	73e38a13d2	Update server/notification-providers/aliyun-sms.js ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-04-30 21:08:35 +08:00
Karel Krýda	f78d01d770	Resolve lint errors	2022-04-30 14:57:08 +02:00
Karel Krýda	7532acc95d	Resolve conflicts	2022-04-30 14:33:54 +02:00
Greg Smith	f4515ad8c5	add axios cached dns resolve to monitor	2022-04-30 21:40:47 +09:30
Karel Krýda	ed84e56a85	Merge remote-tracking branch 'origin_kuma/master' ... # Conflicts: # package-lock.json # server/database.js # server/model/monitor.js # server/routers/api-router.js # server/server.js # src/components/MonitorList.vue # src/components/PingChart.vue # src/icon.js # src/pages/DashboardHome.vue # src/pages/StatusPage.vue # src/router.js # src/util.js	2022-04-30 13:40:34 +02:00
GOGOsu	369477b4b9	Update aliyun-sms.js	2022-04-30 10:45:38 +08:00
GOGOsu	2347a01f7c	Update aliyun-sms.js ... Add comments for the changed code.	2022-04-30 10:42:59 +08:00
GOGOsu	ae2c49a729	Update aliyun-sms.js	2022-04-30 06:28:16 +08:00
GOGOsu	b9e72b9645	Update aliyun-sms.js ... aliyun-sms.js: escape more characters than encodeURIComponent see https://help.aliyun.com/document_detail/315526.html 字符A~Z、a~z、0~9以及字符-、_、.、~不编码。对其它ASCII码字符进行编码。	2022-04-30 05:56:10 +08:00
Louis Lam	60538036c6	[#1108] Change "true" to "up"	2022-04-28 23:44:08 +08:00
Louis Lam	0ba5d031d0	Merge branch 'master' into push-status-param ... # Conflicts: # server/routers/api-router.js	2022-04-28 23:34:51 +08:00
Louis Lam	023db1450d	Fix #1577	2022-04-28 23:12:16 +08:00
Matthew Nickson	3c01e8732c	Merge branch 'master' into #1059-specify-dns-resolver-port	2022-04-27 18:26:11 +01:00
Louis Lam	1687de163c	Merge pull request #1565 from Saibamen/eslint ... Fix some of ESLint warnings	2022-04-27 15:00:49 +08:00
Aram Akhavan	39df4eea92	Ssynchronize push monitor heartbeats to api calls ... Includes a 1s buffer time to allow the push url to be called before the monitor is checked	2022-04-26 13:48:44 -07:00
Adam Stachowicz	1e595eaa76	Update linters	2022-04-26 01:26:57 +02:00
Adam Stachowicz	5fbfacf5ce	Fix ESlint warnings	2022-04-26 00:26:26 +02:00
Matthew Nickson	d1a3cd047a	Merge branch 'master' into #1059-specify-dns-resolver-port	2022-04-24 01:06:45 +01:00
Matthew Nickson	587faecf87	Made value nullable in apicache JSDoc ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-22 19:42:42 +01:00
Matthew Nickson	46da5e51be	Fix JSDoc grammar ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-22 19:10:13 +01:00
Matthew Nickson	1eecdec2d9	Update JSDoc for better clarity ... Co-authored-by: Nelson Chan <chakflying@hotmail.com> Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-22 18:42:47 +01:00
Jens Neuber	64a33d7455	Update server/util-server.js ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-04-22 07:54:13 +02:00
Matthew Nickson	09e61d9d63	Changed Array<T> to type[] ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-21 20:02:18 +01:00
Matthew Nickson	9996ba1636	Add JSDoc to server/modules/apicache/* ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-21 19:55:01 +01:00
Matthew Nickson	c2f6c5b42e	Added JSDoc docs for mqttAsync ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-21 18:53:07 +01:00
Matthew Nickson	0083485d4c	Updated server/model/* JSDoc to match new methods ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-21 18:30:04 +01:00
OidaTiftla	7ed8ae9f7c	Fix trailing space warning	2022-04-21 18:23:32 +02:00
Matthew Nickson	4ddbf71920	Fixed trailing spaces in database.js ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-21 17:15:39 +01:00
Matthew Nickson	068b920553	Add JSDoc to server/socket-handlers/* ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-21 17:10:23 +01:00
OidaTiftla	d6b591a513	Make comment more readable ... Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-21 17:45:58 +02:00
Matthew Nickson	3d04befc1f	Add JSDoc to server/routers/* ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-21 16:43:24 +01:00
Matthew Nickson	6d22ebedca	Merge branch 'master' into add-JSDoc-comments	2022-04-21 13:01:22 +01:00
OidaTiftla	19933bbd99	Improve backwards compatibility	2022-04-21 12:18:15 +02:00
OidaTiftla	60f8ab7285	Use new logging mechanism	2022-04-21 12:09:59 +02:00
OidaTiftla	b7e2489d22	Merge branch 'master' into introduce-resend-interval	2022-04-21 11:58:04 +02:00
Matthew Nickson	03b2d8d521	Add JSDoc to server/* ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-20 19:56:40 +01:00
Jens Neuber	e103ac8335	Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges	2022-04-20 10:10:14 +02:00
Louis Lam	10f6a3c4f5	Merge pull request #1229 from Computroniks/#1209-Logout-button-in-navbar ... Add #1209: logout button in navbar	2022-04-19 19:59:52 +08:00
Louis Lam	200fdfb808	Merge code manually since some code moved to another file	2022-04-19 16:46:45 +08:00
Louis Lam	29d2d95c71	Merge branch '1.14.X' ... # Conflicts: # package.json # server/server.js	2022-04-19 16:43:13 +08:00
Louis Lam	919393cac9	Partially change the server core into a class, remove all require("./server") #1520	2022-04-19 15:38:59 +08:00
Louis Lam	17d4003e5c	Add dropdown menu	2022-04-19 00:39:49 +08:00
Louis Lam	e2c45f93bf	Merge pull request #1509 from chakflying/feat/mqtt-optional-message ... Feat: Allow MQTT successMessage to be optional	2022-04-18 19:06:39 +08:00
Louis Lam	addf75daa7	Fix MQTT password do not save	2022-04-18 19:05:14 +08:00
Louis Lam	359a490ae3	Fix #1510	2022-04-18 15:21:58 +08:00
Nelson Chan	cd38dd3f68	Feat: Allow MQTT successMessage to be optional	2022-04-18 13:04:55 +08:00
Louis Lam	5fa62a888c	Merge branch 'master' into mqtt2 ... # Conflicts: # server/database.js # server/util-server.js	2022-04-17 19:46:33 +08:00
Louis Lam	e6a8a84278	Include only nessacary data in webhook	2022-04-17 19:30:58 +08:00
Louis Lam	47c72192e1	[eslint] Enable yoda and eqeqeq	2022-04-17 15:43:03 +08:00
Louis Lam	d71c086447	Standardize array bracket spacing	2022-04-17 15:27:35 +08:00
Louis Lam	8eb83394f7	Refine UI/UX for custom css / footer text. Add switch for show/hide powered by	2022-04-17 14:53:13 +08:00
Matthew Nickson	45f44b183d	Add JSDoc to server/model/* ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-16 21:11:45 +01:00
Matthew Nickson	5a209c74e1	Add JSDoc to server/notification-providers/* ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-16 20:24:53 +01:00
Louis Lam	07c474db0b	Merge remote-tracking branch 'origin/master'	2022-04-17 01:40:05 +08:00
Louis Lam	8d8c38b1a8	Allow unused vars in args and fix more eslint issues	2022-04-17 01:39:49 +08:00
Louis Lam	e34420368b	Remove try-catch and fix username/password/port not working for mqtt	2022-04-17 01:06:47 +08:00
Matthew Nickson	60c63cc18e	Add JSDoc to server/jobs/* ... Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-16 11:10:51 +01:00
Louis Lam	566133e350	Domain Name Expiry Notification for https monitor only	2022-04-16 15:01:53 +08:00
Louis Lam	30e113755e	Add HIDE_LOG and catch error if cannot subscribe topic	2022-04-16 14:50:48 +08:00
Louis Lam	083e8355b7	Change debug to log.debug	2022-04-16 13:37:17 +08:00
Louis Lam	b1c7915bc1	Merge branch 'master' into mqtt2 ... # Conflicts: # package-lock.json # package.json # server/database.js # server/model/monitor.js # server/server.js # src/pages/EditMonitor.vue	2022-04-16 13:28:39 +08:00
Matthew Nickson	a680331dd7	Fixes issue with ::1 port 5300 requests ... Now the address is wrapped in `[]` in order to prevent ::1 port 5300 being interpreted as ::1:5300. Wrapping the IPv4 address in `[]` does seem to have any effect on correct domain name resolution. In order to prevent issues if a user inputs an address with brackets, they are removed from the string if present before being re-added when it is passed to `setServers`. I have also removed the JSDoc comment as this will be added in a seperate PR Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-15 19:59:32 +01:00
Jordan Bertasso	288ed1e3ca	Merge branch 'master' into fix-1448-discord-service-url	2022-04-15 14:13:44 +10:00
Louis Lam	fb0064082e	Change Pushdeer to PushDeer	2022-04-14 14:34:30 +08:00
ngc7331	93c51504f9	fixes: formatting and security issues ... Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-14 14:34:30 +08:00
ngc7331	fb059f5e91	Add support for Pushdeer notifications	2022-04-14 14:34:30 +08:00
Louis Lam	d0b5f147e2	Fix spelling and merge mistake	2022-04-14 10:58:28 +08:00
Louis Lam	ddf8a7a692	Fix camelCase	2022-04-14 10:58:28 +08:00
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
Moritz R	361e44ad6a	Merge branch 'louislam:master' into master	2022-04-13 15:58:17 +02: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
Moritz R	af44b0beab	Merge branch 'master' into master	2022-04-03 17:19:29 +02:00
Moritz R	84a0b24448	Update server/model/monitor.js ... As per recommendation of @Computroniks Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>	2022-04-03 17:15:21 +02:00
Jimmy Huang	a4be651118	Update server/model/monitor.js ... Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>	2022-04-01 15:26:50 +08: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