github
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma
1
0
Fork 0
Code Issues Releases Wiki Activity
5,928 Commits
16 Branches
125 Tags
67 MiB
Commit Graph

486 Commits (567f9b2b300abb74b7d678ad1c153e19981a235f)

Author SHA1 Message Date
Vivek Pandey c1adcfbfc2
feat(ui): Convert interval seconds to days, hours, minutes, and seconds (#5220) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-07-26 10:06:51 +02:00
Paulus Lucas 2a6d9b4acd
Add Websocket path to mqtt monitor for WebSocket connection (#6009) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: lupaulus <20111917+lupaulus@users.noreply.github.com>
 2025-07-24 22:04:43 +02:00
Ryan Hartje 9506b3a16b
feat: Add optional audience for http-monitors via the oauth2 client credentials flow (#5950) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-06-30 02:37:41 +02:00
Louis Lam 4962817795
[Eliminate Blocking] User related (#5928) 2025-06-19 14:29:43 +08:00
warpreality 18cfa901ad
feat: Add a "manual" (static/fixed) monitor (#5897) 
Co-authored-by: Maksim Kachynski <max.kachinsky@rocketdata.io>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-06-13 13:38:49 +02:00
Fabian Triebsch f282422b22
added option to force ipv4 or ipv6 for http(s) monitor type (#5880) 
Co-authored-by: Ionys <9364594+Ionys320@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-06-13 08:14:55 +02:00
Filippo 839ead80cc
Enhanced ping monitor with advanced options (count, timeout, numeric) (#5588) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-05-24 02:57:39 +02:00
Brad Koehn c67f6efe29
added SMTP monitor (#5489) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-05-18 22:35:55 +02:00
Louis Lam 46d8744fa4
Fix: Docker Healthcheck is not happy during migration (#5258) 2024-10-27 13:22:23 +08:00
Louis Lam 4d779cfc69
Data migration and history retention for 2.0.0 (#5075) 2024-10-26 20:50:29 +08:00
Suven-p c01494ec33
feat: add `RabbitMQ` monitor (#5199) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-10-20 15:57:03 +02:00
Louis Lam eca90a2b00
Revert "feat: structured logging (JSON)" (#5175) 2024-10-09 07:43:44 +08:00
vishalsabhaya d0067a0a12
improve page load performance of large amount urls (#5025) 
Co-authored-by: vishal sabhaya <vishals@vebuin.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-10-06 03:36:54 +02:00
Cassandra b287a25de7
feat: structured logging (JSON) (#5118) 2024-09-24 17:51:21 +08:00
Shaun 36f8be040d
Monitor Conditions (#5048) 2024-08-30 21:48:13 +02:00
Prabhsharan Singh 562de6abb4
fix: undefined in log while creating a new monitor (#5053) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-08-28 23:23:01 +02:00
Shaun 3d9bbe1a62
Improve Playwright/E2E testing setup (#5056) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-08-28 23:18:04 +02:00
Dan Sullivan dc3ad88fe1
Add option to pass cache bust param (#3525) 
Co-authored-by: Dan Sullivan <dan@symbiosgroup.co.uk>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-08-24 22:57:31 +02:00
Frank Elsinga 9486fa22ee
made sure that the socket handlers have consitent names (#4818) 2024-08-24 18:40:50 +02:00
Frank Elsinga 0ddf35e7b5
Removed now unnecessary version checking (#4815) 2024-08-24 18:38:50 +02:00
Frank Elsinga 5dc4bb64d5
Merge branch 'master' into snmp-monitor 2024-06-12 19:55:31 +02:00
Matt Visnovsky 7eee5db4d2 Variable changes 
-Reuse expected_value for snmpControlValue
-Create jsonPathOperator for snmpCondition
 2024-06-05 15:37:47 -06:00
Nelson Chan a581a85633
Feat: Use `UptimeCalculator` for PingChart (#4264) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-05-19 22:03:32 +02:00
Matt Visnovsky 1c4740748c Re-use monitor.radiusPassword for community string 2024-05-08 11:00:10 -06:00
Matt Visnovsky f059d54349 Use frontend timeout 
Addresses https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1585616669
 2024-05-02 15:07:22 -06:00
Frank Elsinga b4bd003626
Merge branch 'master' into snmp-monitor 2024-05-01 00:01:03 +02:00
Matt Visnovsky 9d28fcff1a Update bean model backend 
Updates appropriate values async when editing the SNMP monitor
 2024-04-30 15:13:16 -06:00
Louis Lam 63a380326d Merge branch '1.23.X' into 1.23.13-to-2.0.0 
# Conflicts:
#	.github/workflows/auto-test.yml
#	package-lock.json
#	package.json
#	server/database.js
#	server/model/monitor.js
#	server/monitor-types/real-browser-monitor-type.js
#	server/util-server.js
#	test/cypress/unit/i18n.spec.js
 2024-04-25 15:42:53 +08:00
BigBoot bab427f715
Add `loginRequired` SocketIO event (#4636) 2024-04-21 20:39:44 +02:00
Louis Lam 7a9e2f5de6
Merge pull request from GHSA-23q2-5gf8-gjpp 2024-04-19 01:08:31 +08:00
Frank Elsinga 975761b448
made sure to use `Promise.allSettled` instead of sleeping for 500ms after login (#4592) 2024-03-19 00:16:04 +08:00
Frank Elsinga 0e3b3a9ab8
Made sure that more of the async usages are awaited (#4574) 2024-03-15 15:02:55 +01:00
Frank Elsinga 89158be7de
Merge branch 'master' into monitor_async_start_stop 2024-01-30 17:53:21 +01:00
Louis Lam 9356e7dd4f
Update clear stats (#4324) 2024-01-05 20:51:05 +08:00
Nelson Chan c9fe6b5d01
Feat: Refresh login token for the client initiating password change (#4214) 2023-12-18 19:52:49 +08:00
Louis Lam 996ff28ed9
Playwright + Native Node Test Runner (#3893) 2023-12-17 19:02:22 +08:00
Louis Lam 1a47563eb8 Merge branch '1.23.X' into version-merge 
# Conflicts:
#	package-lock.json
#	package.json
#	server/server.js
#	server/uptime-kuma-server.js
 2023-12-13 01:54:08 +08:00
Louis Lam f861a48dfc
Smoothing the update for origin check (#4216) 2023-12-12 16:23:41 +08:00
Louis Lam fa1214ae5e
Rebse #4213 (#4215) 
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
 2023-12-11 19:30:01 +08:00
Nelson Chan 99adac3eb9
Fix: typo for `disconnectAllSocketClients` (#4213) 2023-12-11 19:26:20 +08:00
Louis Lam 719ef856e8 Merge manually 2023-12-11 02:36:08 +08:00
Louis Lam 869ee8ec50 Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X 
# Conflicts:
#	.github/workflows/auto-test.yml
#	extra/reset-password.js
#	package-lock.json
#	package.json
#	server/routers/status-page-router.js
#	server/server.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js
#	src/components/ActionInput.vue
#	src/util.js
#	src/util.ts
 2023-12-11 02:13:47 +08:00
Louis Lam 530c8e5328
Drop cacheable-lookup (#4178) 
* WIP

* WIP
 2023-12-11 02:01:56 +08:00
Louis Lam 482049c72b
Merge pull request from GHSA-88j4-pcx8-q4q3 
* WIP, still need to handle npm run reset-password

* Implement it for "npm run reset-password"

Bug fixes and change along with this commit
- Move `ssl`, `hostname`, `port` to ./server/config.js, so `reset-password` is able to read it
- Fix: FBSD is missing, no idea who dropped it.
- Fix: Frontend code should not require any backend code (./server/config.js), moved "badgeConstants" to the common util (./src/util.ts) and drop vite-common.js

* Minor
 2023-12-10 20:40:40 +08:00
Louis Lam 2815cc73cf
Merge pull request from GHSA-mj22-23ff-2hrr 
* WIP

* WIP

* Handle parsing error

* Fix matching origin issue
 2023-12-10 20:39:43 +08:00
Nelson Chan 46432618e1
Feat: Add json-query to MQTT monitor type (#3857) 
* Feat: Add json-query MQTT monitor type

* Fix: Allow result to be null

* Fix: Remove unused parameter

* Chore: Update JSDoc

* Fix: Add default if checkType is not set

---------

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2023-12-03 01:36:19 +08:00
Louis Lam c5d9c54a04 Merge branch 'master' into 1.23.X-merge-to-2.X.X-2 
# Conflicts:
#	package.json
 2023-12-02 18:43:06 +08:00
Louis Lam 81c9900e23 Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2 
# Conflicts:
#	docker/debian-base.dockerfile
 2023-12-01 15:50:35 +08:00
Adam Hancock 62780001f7
Feature: remote browser support (#3904) 
* [empty commit] pull request for remote browser support

* Remote browser: Added UI screens and DB tables.

* Remote browser working

* Fixing tests

* Fix tests

* Fix tests

* fix tests

* Test browser

* revert init_db.js

* Changed drop down to ActionSelect

* Fix translations

* added remote browsers toggle

* revert changes package-lock

* Fix bad english

* Set default remote browser

* Remote browsers Requested changes

* fixed description.
 2023-12-01 15:29:10 +08:00
Louis Lam 1708b67949
Change execSync/spawnSync to async (#4123) 
* WIP

* Add missing await

* Update package-lock.json
 2023-11-30 16:12:04 +08:00