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

144 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
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
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
Louis Lam
39ac9b887e Fix #2504 2023-01-01 22:27:14 +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
Louis Lam
466b403a96 Handle unexpected error of checkCertificate 2022-12-13 02:21:12 +08: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
minhhn3
b459408b10 fix: resolve conflict 2022-10-26 20:41:21 +07: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
2faf866e9e Implement generateTimeslot() for recurring interval type 2022-10-12 17:02:16 +08:00
Louis Lam
c1ccaa7a9f WIP 2022-10-10 20:48:11 +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
b993859926
Drop Jest e2e testing (#2174) 2022-10-05 14:26:30 +08: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
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
3f63cb246b [WIP] Handle timezone offset for timeRange 2022-09-25 19:38:28 +08: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
minhhn3
6bb79597e8 fix: resolve merge conflict 2022-08-13 13:26:05 +07: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
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
2389b604fe Use Settings.get 2022-07-31 23:41:29 +08: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
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
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
25d711e683 Fix jsdoc data type 2022-07-18 22:06:25 +08:00
Louis Lam
515095ecfb Move all settings code from util-server.js into settings.js 2022-06-29 14:57:40 +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
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
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
Louis Lam
091158cfe7 [Status Page] Preload data 2022-06-01 13:05:12 +08: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
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
Christopher Pickering
87f933df4f
added sqlserver monitor 2022-05-12 12:48:03 -05:00