Commit Graph

91 Commits

Author SHA1 Message Date
Frank Elsinga
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
leonace924
d825352410 feat: extract MySQL/MariaDB monitor to its own monitor-type and enable conditions support 2026-01-06 01:42:20 -05:00
Frank Elsinga
5baac436d3 Merge branch 'master' into master 2026-01-03 17:12:44 +01:00
iotux
b3f84f0bf8 Merge branch 'louislam:master' into feature/local-service-monitor 2026-01-02 13:56:19 +07:00
Frank Elsinga
951b375a60 Merge branch 'master' into feature/5934 2026-01-02 07:27:51 +01:00
iotux
a6239a6200 Fixed a linting err 2026-01-01 12:18:56 +01:00
iotux
1faed64e13 Merge remote-tracking branch 'upstream/master' into feature/local-service-monitor 2026-01-01 12:11:27 +01:00
Pedro Magno
534ba5d547 chore: Extract the sqlserver monitor to its own monitor-type. Enable support conditions for a single result value. 2025-12-30 11:06:04 +00:00
iotux
77d0e73878 Resolve merge conflict in server/server.js and server/uptime-kuma-server.js 2025-12-17 17:49:59 +01:00
iotux
3b0ab450d3 fix: tags are not saved if you don't save 2 times (#6491) 2025-12-17 11:50:28 +01:00
iotux
0f951ef123 Added Windows Service Monitor & changed local to systen 2025-12-15 16:27:20 +01:00
iotux
7461bd296f feat: Add 'local service' monitor type
This adds a new monitor type to check local services by executing a shell command. It also includes fixes for Prometheus errors when adding new tags and for the UI not updating when tags are changed.
2025-12-14 16:39:00 +01:00
Dalton Pearson
91edeaeb9c Extracted the postgresql monitor to its own monitor-type (#6443)
Co-authored-by: Dalton Pearson <dalton.pearson@praemo.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-12-04 14:16:06 +00:00
Frank Elsinga
b230ab0a06 migrated grpc keyword to the newer monitoringtype (#4821)
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2025-11-29 23:21:45 +08:00
PoleTransformer
5d1b372072 Add Websocket Upgrade Test (#5613)
Co-authored-by: Your Name <you@example.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2025-11-27 21:05:44 +01:00
Shaan
0eebe86f81 feat: add SSL/STARTTLS option and certificate monitoring to TCP Port monitor (#6401)
Co-authored-by: Jacques ROUSSEL <jacques.roussel@rouaje.com>
Co-authored-by: rouja <jacques0roussel@gmail.com>
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-11-24 18:30:13 +13:00
Frank Elsinga
dda1a3f442 Chore:extracted the redis monitor to a different monitoring type (#4393)
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2025-11-16 04:55:38 +08:00
Mario Garrido
d9fa67ae03 Monitor GameDig: Resolve domain to IP before request 2025-07-01 05:36:58 +01: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
Brad Koehn
c67f6efe29 added SMTP monitor (#5489)
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2025-05-18 22:35:55 +02:00
Frank Elsinga
0876b1cbf5 chore:extracted the group monitor to a different monitoring type (#4395) 2025-04-22 13:14:12 +02:00
Eddie Fiorentine
e5477fba0d add newline 2024-11-19 19:55:18 -05:00
Eddie Fiorentine
c40f8e7ba5 Feature: SIP options ping Monitor Type using sipsak binary 2024-11-19 19:40:23 -05: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
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
Frank Elsinga
5dc4bb64d5 Merge branch 'master' into snmp-monitor 2024-06-12 19:55:31 +02:00
Sebastian Lang
a3ac954140 Add support for custom mongodb commands (#4445)
Co-authored-by: Sebastian Lang <sebastian.lang@damovo.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-05-19 21:59:57 +02:00
Matt Visnovsky
d92003e172 SNMP Initial Commits
This commit introduces a new SNMP monitor feature to the application, allowing users to monitor devices using SNMP (Simple Network Management Protocol).
2024-04-26 19:05:56 -06:00
Frank Elsinga
0e3b3a9ab8 Made sure that more of the async usages are awaited (#4574) 2024-03-15 15:02:55 +01: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
Nelson Chan
4185ec20b0 Fix: Origin undefined on error handling (#4224) 2023-12-13 01:35:39 +08:00
Louis Lam
f861a48dfc Smoothing the update for origin check (#4216) 2023-12-12 16:23:41 +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
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
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
Louis Lam
60be875edd Fix a merge issue 2023-11-25 03:28:45 +08:00
Louis Lam
e9bf02fc2c Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
# Conflicts:
#	package-lock.json
#	package.json
#	server/model/monitor.js
#	server/monitor-types/tailscale-ping.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js
2023-11-25 03:25:03 +08:00
Louis Lam
121d1a11af Revert "Restart running monitors if no heartbeat (#3952)" (#4088)
This reverts commit c43223a16d.
2023-11-24 02:23:38 +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
Louis Lam
c43223a16d Restart running monitors if no heartbeat (#3952) 2023-11-01 09:36:12 +08:00
Louis Lam
8412e19fe6 Add a comment 2023-10-19 09:41:30 +08:00
Louis Lam
bbaba29222 Set default ua for axios: Uptime-Kuma/version instead of axios/version 2023-10-18 21:54:49 +08:00
Louis Lam
03e43ab364 Log color and simplify startup log for production (#3889) 2023-10-14 03:00:34 +08:00
Frank Elsinga
d6af9162c1 Chore: Extracted the dns monitor to its own monitor-type (#3413)
* extracted the dns monitor to its own monitor-type

* linting fixes

* another formatting fix

* Fix: Improve dnsMessage handling (#3614)

* fixed docs

* fixed formatting changes
2023-09-09 18:14:55 +08:00
Louis Lam
a13fc7079e Merge branch 'master' into 2.0.X
# Conflicts:
#	package-lock.json
2023-08-30 01:39:16 +08:00