mtfyun/uptime-kuma
1
0 Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2026-11-10 21:21:19 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,435 Commits 13 Branches 149 Tags
9bdac74a880ca6b24efc1820932854d0ca2bac75
Commit Graph
138 Commits
Author SHA1 Message Date
Louis Lam 9bdac74a88 chore: cleanup messy code (#8085) 2026-10-31 01:22:53 +08:00
Louis Lam 2e8bf7da56 feat: api & mcp skeleton (as alpha) (#8072) 2026-10-28 23:34:01 +08:00
Louis Lam 48cfd85f74 fix: dashboard live updates issues (#8046) 2026-10-25 22:48:05 +08:00
Louis Lam 9ced9ccd0e chore: improve dashboard performance + add more tests (#8030) 2026-10-25 02:34:12 +08:00
Louis Lam 2837424f92 Merge branch '2.5.X' into merge 
# Conflicts:
#	package-lock.json
#	package.json
 2026-10-05 12:36:26 +08:00
Louis Lam 5fa3db9ff9 fix: use UptimeCalculator for avg-response badge endpoint (#7886) 2026-09-20 20:57:24 +08:00
Louis Lam 46461fd0e7 Merge branch 'master' into 3.0.X 
# Conflicts:
#	package-lock.json
#	package.json
#	server/monitor-types/real-browser-monitor-type.js
#	src/components/Login.vue
 2026-09-12 12:18:24 +08:00
github-actions[bot]andLouis Lam d7b3cc2658 chore: Update dependencies (#7763) 
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2026-09-03 08:19:27 +00:00
Louis Lam 3abbeecddf Merge branch 'master' into 3.0.X-merge 
# Conflicts:
#	package-lock.json
#	package.json
#	src/util.js
 2026-05-17 15:36:42 +08:00
Nic Jansma 448643fcf0 fix: prometheus metrics have two series for a single monitor when that monitor has tags (#7125) 2026-03-10 16:29:35 +00:00
Louis Lam 73d3573198 Merge branch 'master' into 3.0.X-merge 
# Conflicts:
#	.github/workflows/validate.yml
#	extra/rdap-dns.json
#	extra/release/final.mjs
#	package-lock.json
#	package.json
#	src/util.js
 2026-03-06 22:26:21 +08:00
Louis Lam 303a609c05 Merge commit from fork 2026-03-05 09:30:32 +08:00
CassandraFrank ElsingaLouis Lam
 		174c63d479 feat: structured logging (JSON) (#5179) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2026-02-26 17:02:58 +00:00
Dreamandautofix-ci[bot] 9df8a957c7 fix: Explicitly pushing status=down now bypasses retry logic and goes directly to DOWN (#6595) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-02-07 09:52:25 +01:00
Angel98518 3ebd0ae2a2 fix: Add input validation for monitor ID in badge endpoints (#6789) 2026-01-22 16:39:40 +00:00
CopilotlouislamCommanderStorm
 		cde96900a2 fix: Ensure ping can handle pings larger than 24 days by changing INT to BIGINT and FLOAT(8,2) to FLOAT(20,2) (#6668) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: louislam <1336778+louislam@users.noreply.github.com>
Co-authored-by: CommanderStorm <26258709+CommanderStorm@users.noreply.github.com>
 2026-01-11 12:48:00 +00:00
Frank Elsingaandautofix-ci[bot] 0f61d7ee1b chore: enable formatting over the entire codebase in CI (#6655) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-01-09 02:10:36 +01:00
Louis LamandCopilot f4ff234ec8 [Push monitor] Fix: Prometheus update with incorrect value (#6436) 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-11-28 12:41:44 +00:00
Louis Lam 49eb0ff87b Fix: [Push Monitor] Send notifications during maintenance period (#5847) 2025-05-20 12:38:21 +02:00
zhang-weiandFrank Elsinga 289e824a5d Fix monitor reference in push notification logic (#5842) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-05-18 00:05:48 +02:00
Louis Lam eca90a2b00 Revert "feat: structured logging (JSON)" (#5175) 2024-10-09 07:43:44 +08:00
Cassandra b287a25de7 feat: structured logging (JSON) (#5118) 2024-09-24 17:51:21 +08:00
Qi Zhao 4941b17a46 perf: ⚡️ revert some overengineer code 2024-06-20 10:50:35 +08:00
Qi ZhaoandFrank Elsinga 58533e8f06 Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi ZhaoandFrank Elsinga 3f425dc160 Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi ZhaoandFrank Elsinga f63d36478d Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi ZhaoandFrank Elsinga 7270caccae Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi Zhao 53c4bba387 fix: 🐛 badge requestedDuration 2024-06-20 10:50:35 +08:00
Qi Zhao e5ff86e6ac fix: 🐛 status & ping badge duration 2024-06-20 10:50:35 +08:00
Stefan Ottosson 9c7aa13190 fix: remove check that method is correct 2024-05-24 08:29:09 +02:00
Stefan Ottosson 1ac5696463 Merge branch 'master' into feature/http-method-push-monitor 
# Conflicts:
#	src/pages/EditMonitor.vue
 2024-05-23 17:34:45 +02: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 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
Nelson Chan 67250d6302 Feat: Retries persistence (#3814) 
* Feat: Retries persistence

* Fix: Set duration for first beat of push monitor

* Feat: Update UptimeCalculator in push route

* Fix: Handle resend in push route

* Chore: Remove debug log
 2023-11-24 18:11:36 +08:00
Louis Lam ace1fe00c2 Merge branch 'master' into 1.23.X-merge-to-2.X.X 
# Conflicts:
#	docker/debian-base.dockerfile
#	package-lock.json
#	server/database.js
#	server/model/monitor.js
#	server/uptime-kuma-server.js
#	server/util-server.js
 2023-11-13 21:15:51 +08:00
Nelson Chan 38efd97b28 Fix: Support float ping in push route (#3987) 2023-11-09 23:39:44 +08:00
Louis Lam 852b3fa61b Merge branch '1.23.X' 
# Conflicts:
#	package-lock.json
#	server/database.js
#	server/server.js
#	server/util-server.js
 2023-10-09 21:28:01 +08:00
前端小武 1b148786a5 Fix: Update x-forwarded-host field when using reverse proxy (#3726) 2023-10-09 06:31:52 +08:00
Adam Stachowicz 6875ecdfbf Fix warnings (#3826) 2023-10-03 05:39:17 +08:00
Louis Lam 076331bf00 Uptime calculation improvement and 1-year uptime (#2750) 2023-09-01 05:19:21 +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
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
Nelson Chan 3e5e7e6e32 Fix: Incorrect options for cert-exp badge 2023-06-29 07:12:19 +08:00
Louis Lam 2e2747fb52 Handling DATE_ADD 2023-06-27 20:57:34 +08:00
Louis Lam 32f84b5e4e Merge pull request #2491 from RubenNL/fix-metrics-push 
Fixed the metrics for the push type.
 2023-04-02 02:05:03 +08:00
Louis Lam fbdeb30ce7 Merge pull request #2973 from chakflying/fix/limit-precision 
Fix: Apply toPrecision as last step
 2023-03-26 15:46:00 +08:00
Nelson Chan 4f05912276 Fix: Allow status badge with empty label 2023-03-25 02:44:15 +08:00
Nelson Chan bf525371d9 Fix: Apply toPrecision as last step 2023-03-24 22:42:50 +08:00
Nelson Chan bc87abf5c2 Fix: Clear uptime cache on push beat 2023-03-03 05:57:36 +08:00
Ruben van Dijk 896e33815d Merge branch 'louislam:master' into fix-metrics-push 2023-02-23 14:11:39 +01:00