koichixD/uptime-kuma
1
0
Fork 0
mirror of https://github.com/koichixD/uptime-kuma.git synced 2026-09-04 17:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,737 Commits 1 Branch 0 Tags
e022b5f976ea6d89b42922ecdb22127328dabd24
Commit Graph
247 Commits
Author SHA1 Message Date
Louis Lam d231a05526 Remove babel-plugin-rewire (#3522) 2023-08-04 01:10:15 +08:00
Henrik Gerdes 42b5d30a33 feat: Implement oauth2 monitors (#3119) 
* [empty commit] pull request for implement oauth2 monitor

* feat: implement oauth2 client credentials flow

* fix: auth methods clarification & error handling

* docs: fix JSdocs types and clarifications
 2023-08-02 15:40:19 +08:00
Louis Lam a0bd4b248b Merge remote-tracking branch 'origin/master' into 2.0.X 
# Conflicts:
#	docker/debian-base.dockerfile
#	package-lock.json
#	package.json
#	server/database.js
#	src/router.js
 2023-07-30 19:15:09 +08:00
Nelson Chan 573f158f7f Fix: incorrect radius error handling 2023-07-27 17:42:22 +08:00
Muhammed Hussein karimiFrank ElsingaLouis Lam
 		278b88a9d9 ✨ feat: added kafka producer (#3268) 
* ✨ feat: added kafka producer

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: eslint warn

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: typings and auth problems

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: better variable name to trrack disconnection

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: grouping Kafka Producer special settings into one template

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* ✨ feat: add kafka producer translations into `en.json`

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: disable close-on-select on kafka broker picker

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* 🐛 fix: `en.json` invalid json (conflict resolve)

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>

* Nostr dm notifications (#3051)

* Add nostr DM notification provider

* require crypto for node 18 compatibility

* remove whitespace

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* move closer to where it is used

* simplify success or failure logic

* don't clobber the non-alert msg

* Update server/notification-providers/nostr.js

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* polyfills required for node <= 18

* resolve linter warnings

* missing comma

---------

Co-authored-by: Frank Elsinga <frank@elsinga.de>

* Drop nostr

* Minor

* Fix a bug of clone

---------

Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2023-07-17 16:15:44 +08:00
Louis Lam d825dbf828 Merge pull request #3188 from chakflying/fix/radius-timeout 
Fix: Set radius connection timeout to monitor default
 2023-07-09 22:47:39 +08:00
Louis Lam 16a1a66e09 Merge remote-tracking branch 'origin/master' into 2.0.X 
# Conflicts:
#	docker/alpine-base.dockerfile
#	docker/debian-base.dockerfile
#	docker/dockerfile
#	package.json
#	server/database.js
#	server/jobs/util-worker.js
#	server/model/maintenance.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/uptime-kuma-server.js
 2023-06-30 13:38:56 +08:00
Louis Lam 2e2747fb52 Handling DATE_ADD 2023-06-27 20:57:34 +08:00
Kenneth Foster 6708eed121 Fixed error handling if client is closed 2023-06-14 11:49:33 -04:00
kefoster951andFrank Elsinga d37c33ad42 Update server/util-server.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2023-06-12 11:06:20 -04:00
Kenneth Foster 8897385690 Fixed linting 2023-06-09 16:26:02 -04:00
Kenneth Foster 6132a45c7c fixed when auth is needed but not provided 2023-06-09 16:06:33 -04:00
Kenneth Foster f68452c47a Added changes to stop auth attempts after an error 2023-06-09 14:54:17 -04:00
Nelson Chan 58ec53fb1d Fix: Try to close mysql connection properly 2023-06-06 20:28:51 +08:00
Louis Lam 0b8dddba24 Merge remote-tracking branch 'origin/master' into skaempfe#2593 
# Conflicts:
#	server/model/monitor.js
#	src/pages/Details.vue
 2023-05-26 21:32:58 +08:00
Nelson Chan f1a396b0f7 Fix: Align radius timeout to default 2023-05-23 18:18:54 +08:00
Louis Lam f4ee5271af Improve error handling of mysqlQuery and return row count as result 2023-03-24 16:24:00 +08:00
Louis Lam 7330db3563 Improve error handling of mysqlQuery and return row count as result 2023-03-24 16:08:30 +08:00
Louis Lam a599f5149b Merge pull request #2907 from chakflying/fix/disconnect-redis 
Fix: Disconnect redis after ping
 2023-03-08 22:57:30 +08:00
Nelson Chan 230de63460 Fix: Disconnect redis after ping 2023-03-08 21:47:52 +08:00
Louis Lam 7ec09d0118 Fix ipv6 issue for ping 2023-03-04 20:41:08 +08:00
Louis Lam 92c9b8bb63 Fix ipv6 issue for ping 2023-03-04 20:29:52 +08:00
Louis Lam 010c7d681f Fix ipv6 issue for ping 2023-03-04 19:12:11 +08:00
Louis Lam 42033c692f Merge pull request #2748 from chakflying/feat/improve-err-code 
Feat: Use error message to detect and set status code
 2023-02-22 01:01:53 +08:00
Louis Lam d1175ff471 Fix #2777 2023-02-15 02:50:49 +08:00
Louis Lam e4183ee2b7 Database Setup Page (#2738) 
* WIP

* WIP: Database setup process

* Add database setup page
 2023-02-11 14:41:02 +08:00
Nelson Chan 3439074835 Feat: Use message to improve errror status code 2023-02-09 17:42:02 +08:00
Nelson Chan e1f956879d Fix: Use .destroy() instead of .end() 2023-02-07 05:01:53 +08: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 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 27585d0812 Fix #2618 2023-01-17 01:21:01 +08:00
Louis Lam 31f45dcfc9 Merge pull request #2540 from twiggotronix/add-mqtt-schemes 
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
 2023-01-15 20:14:11 +08:00
Louis Lam 1326761a8a Update mongodb and simplify the logic of mongodbPing 2023-01-15 01:36:49 +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
Louis Lam 712a3c29d4 Fix Postgres monitor do not handle some error cases correctly 2023-01-14 21:06:10 +08:00
Louis Lam 6437ef198f Merge pull request #2541 from long2ice/master 
feat: support redis monitor
 2023-01-14 20:16:53 +08:00
long2ice 3b5893ea60 fix: add preserve line in redisPingAsync 2023-01-13 21:30:10 +08:00
long2ice 21cd4d64c3 fix: redisPingAsync 2023-01-13 19:10:07 +08:00
Sebastian Kaempfe f6d0f28b3a [#2593] during certificate evaluation also set the cert type for improved notifications 2023-01-12 11:34:37 +01:00
Louis Lam d9f12a6376 Fallback to /bin/ping if ping is not found 2023-01-12 01:05:16 +08: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
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 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