github
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma
1
0
Fork 0
Code Issues Releases Wiki Activity
4,683 Commits
15 Branches
125 Tags
70 MiB
Commit Graph

394 Commits (b4e45c7ce8ceb47d55c2ab41310852f052227047)

Author SHA1 Message Date
Janne Nowak 6b5e179bb0 linting 2023-05-17 19:02:34 +02:00
Janne Nowak f653aba735 added docker health status 2023-05-17 18:52:28 +02:00
Christopher Wilkinson 0e516a42e5
Trim before truncating "keword not found" message 2023-04-11 16:57:30 +01:00
Louis Lam 9e320dc5fb Expose timezone and local datetime to notification providers 2023-04-09 16:01:27 +08:00
Miles Steele 682f8e52a8 lint 2023-04-06 15:30:38 -05:00
Miles Steele 171aff1226 add invert keyword feature 2023-04-06 15:25:25 -05:00
Louis Lam 02291730fe WIP 2023-03-31 04:04:17 +08:00
Louis Lam 3c3a192943
Merge pull request #2906 from chakflying/fix/duplicate-expiry-notif 
Fix: Check for TLS expiry notified days smaller than target
 2023-03-26 15:34:26 +08:00
Louis Lam 7330db3563 Improve error handling of mysqlQuery and return row count as result 2023-03-24 16:08:30 +08:00
tombii dbe73bd6ae
Update monitor.js (#2929) 
Language
 2023-03-15 15:00:28 +08:00
Louis Lam 491239415e Merge remote-tracking branch 'origin/master' into doubles-ss_master 
# Conflicts:
#	server/database.js
 2023-03-12 18:38:19 +08:00
Nelson Chan f32fcb204f Fix: Check for notified days smaller than target 2023-03-08 22:26:19 +08:00
Louis Lam ea3b3abe36 Fine tune 2023-02-25 20:13:46 +08:00
Louis Lam 7f9332c753 Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor 
# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	src/icon.js
#	src/languages/en.js
#	src/languages/es-ES.js
 2023-02-25 19:14:44 +08:00
Louis Lam f32d3af62c Merge remote-tracking branch 'origin/master' into doubles-ss_master 
# Conflicts:
#	server/database.js
 2023-02-25 17:57:25 +08:00
Louis Lam a7b49fcd98 Fix json body after xml body added 2023-02-25 17:28:32 +08:00
Louis Lam cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors 
Add xml support to HTTP monitors
 2023-02-24 17:26:47 +08:00
Louis Lam 2fa233ae7f Fix prometheus null issues 2023-02-24 17:12:57 +08:00
Louis Lam 4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance 
remember prometheus instance and expose it
 2023-02-23 20:43:05 +08:00
Peace 0be8b111e2
chore: better up message 
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-20 13:48:16 +01:00
Peace cef0a0faf4
Merge branch 'master' into group-monitors 2023-02-16 21:38:53 +01:00
Luke Hamburg dd1d71530f
sorted tags on dashboard 
see https://github.com/louislam/uptime-kuma/issues/2785
 2023-02-15 14:06:29 -05:00
Suriya Soutmun 43941fa2c6
feat: add mtls authen method in http/http keyword 2023-02-07 09:40:47 +07:00
Faruk Genç 666838f334 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-02-04 00:03:05 +03:00
Joseph 2a6d98ff01
Feat: Expand and Simplify Badge Functionality (#2211) 
* [expanding badges] added new configs

* [expanding badges] recieve ping in getPreviousHeartbeat()

* [expanding badges] re-added original new badges

* [expanding badges] recreate parity between old and new badges

* [expanding badges] fix linting
 2023-02-03 12:33:48 +08:00
Peace f286386f59
fix: add message for empty group pending state 2023-02-01 20:19:47 +01:00
Peace 9a46b50989
docs: add comments 2023-01-28 14:22:15 +01:00
Peace f3ac351d75
feat: set childs under maintenance if parent is too 2023-01-28 14:02:10 +01:00
Faruk Genç 35bd129d66 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-01-28 15:47:42 +03:00
Peace aba515e172
feat: disable childs if parent is disabled 2023-01-28 13:39:17 +01:00
Peace 97bd306a09
Merge branch 'louislam:master' into group-monitors 2023-01-28 03:07:42 +01:00
Peace 645fd94bba
feat: add ability to group monitors in dashboard 2023-01-28 02:58:03 +01:00
Louis Lam e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support (#1787) 2023-01-27 18:25:57 +08:00
Faruk Genç 9329ec9234 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 
# Conflicts:
#	server/database.js
#	server/model/monitor.js
 2023-01-25 20:20:11 +03:00
Louis Lam 5050ebc249 Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size 
# Conflicts:
#	server/util-server.js
#	src/languages/en.js
 2023-01-25 16:12:33 +08:00
Louis Lam 1dabbd6442
Merge pull request #2666 from chakflying/fix/log-call 
Fix: Fix incorrect log call format in docker monitor
 2023-01-25 00:22:51 +08:00
Louis Lam 9cc3bd0de4 Avoid the multiple queries for Gamedig monitor 2023-01-25 00:19:54 +08:00
Nelson Chan c4c720027c Fix: Use correct log call format 2023-01-24 23:47:33 +08:00
Louis Lam 83e0401dd8 Show game list for GameDig monitor 2023-01-24 23:03:01 +08:00
Louis Lam aab04f6644 Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master 2023-01-24 19:44:21 +08:00
Thomas Spalinger f155ec9ba8 remember prometheus instance and expose it 
in preperation for #2491,#680 and #898
 2023-01-24 10:32:49 +00:00
Faruk Genç aef85078eb reorder fix 2023-01-20 12:29:56 +03:00
Faruk Genç 86ba6f829e Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-01-20 12:27:28 +03:00
Nelson Chan 6961b1bdd2 Fix: Use default timeout & CachebleDnsHttpsAgent 2023-01-18 09:53:04 +08:00
Louis Lam c47b6c5995 Merge remote-tracking branch 'origin/1.19.X' 
# Conflicts:
#	package-lock.json
#	package.json
#	src/util-frontend.js
 2023-01-17 21:17:04 +08:00
Louis Lam a5ff27da7a Drop the property `monitor.maintenance`, use `lastHeartBeat.status` to check status instead 2023-01-17 17:34:47 +08:00
Louis Lam e48a987b9c Merge remote-tracking branch 'origin/master' into mongodb-ping 
# Conflicts:
#	server/model/monitor.js
#	server/util-server.js
#	src/pages/EditMonitor.vue
 2023-01-15 01:13:11 +08:00
Faruk Genç be850dd596 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 
# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	src/languages/en.js
 2023-01-14 16:40:13 +03:00
Faruk Genç 3adc9e65d6 Add only xml support to http monitors 2023-01-14 16:33:21 +03:00
long2ice db757123ba refactor: reuse databaseConnectionString 2023-01-13 16:32:49 +08:00
Sebastian Kaempfe a21a47de93 [#2593] renamed the method `sendCertNotification` to better represent what id does. Evaluate certificate expiry from all certs in chain. Send a separate notification for every cert in chain, including cert type and CN. 2023-01-12 11:39:36 +01:00
Adam Spurgeon 774d754b21 Add GameDig monitor 2023-01-08 21:43:30 +13: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
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
Nelson Chan 204792dd2d Fix: Fix incorrect handling for container down 2023-01-03 22:07:14 +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 1006fbd873 A possible fix for #2447 2022-12-30 13:46:53 +08:00
minhhoang 4147a4c404 fix: #2480 2022-12-28 22:31:33 +07: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 b75db27658 Fix lint 2022-12-15 13:57:28 +08:00
Louis Lam 1da00d19fd Try to fix `incorrect header check` 2022-12-14 21:34:13 +08:00
Louis Lam 3b58fd3b3c Cache uptime 2022-12-11 21:33:26 +08:00
Louis Lam 4cd5b5563f Fix #1145 2022-12-08 23:21:55 +08:00
Louis Lam ee1a56caae Update /test-webhook and reevaluate sensitive fields 2022-12-05 18:18:19 +08:00
Louis Lam 3e68cf2a1c Specify `Accept-Encoding` for axios request (Fix #2253) 2022-12-04 22:55:05 +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
rmarops b059a36e66 added MongoDB ping monitor 2022-11-16 20:50:34 -05:00
minhhn3 b459408b10 fix: resolve conflict 2022-10-26 20:41:21 +07: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 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 c84de4d259 WIP: Add maintenance status 2022-10-11 01:45:30 +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 0686757160 [Docker Monitor] Change `tcp://` to `http://` 2022-10-04 16:19:56 +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 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
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
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 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
Moritz R 60e7824ff0
Merge branch 'master' into master 2022-07-24 14:37:22 +02: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