Andrey/uptime-kuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,646 Commits 20 Branches 128 Tags 54 MiB
951f109512
Commit Graph

1999 Commits

Author SHA1 Message Date
Angel98518
951f109512 fix: add error logging to cloudflared socket handler empty catch blocks 
Previously, errors in cloudflared socket handlers were silently swallowed
by empty catch blocks, making debugging difficult. This commit adds
proper error logging to all empty catch blocks in the cloudflared
socket handler to improve observability and debugging.

- Added error logging to join handler
- Added error logging to leave handler
- Added error logging to start handler
- Added error logging to removeToken handler
 2026-01-06 19:31:25 +01:00
MkDev11
b1355c67f0
feat(serwersms): add group messaging support (#6610) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2026-01-06 17:12:51 +00:00
IsayIsee
2cf2faa3a9
Merge branch 'master' into my_dev 2026-01-06 17:48:30 +08:00
autofix-ci[bot]
e28bdeeb84
[autofix.ci] apply automated fixes 2026-01-06 09:47:51 +00:00
IsayIsee
cae76f022f
Implement message sanitization for Aliyun SMS 
Added a method to remove IP addresses and domains from SMS messages to comply with Aliyun SMS restrictions.
 2026-01-06 17:21:11 +08:00
leonace924
f0751fcf5a fix: update the test 2026-01-06 02:37:05 -05:00
leonace924
806dadce5c fix: update the test 2026-01-06 02:11:49 -05:00
leonace924
c7702a3b23 fix: update the test to pass CI test 2026-01-06 02:05:23 -05:00
leonace924
a034436769 fix: apply both updates to mssql server monitor and mssql test 2026-01-06 01:54:38 -05:00
leonace924
32456d32fe fix: address the comment 2026-01-06 01:42:20 -05:00
Pegasus
9437d25074 Update server/monitor-types/mysql.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2026-01-06 01:42:20 -05:00
Pegasus
857f4e9550 Update server/monitor-types/mysql.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2026-01-06 01:42:20 -05:00
Pegasus
0188769636 Update server/monitor-types/mysql.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2026-01-06 01:42:20 -05:00
leonace924
e6481fa8aa fix: remove duplicate and keep old behavior 2026-01-06 01:42:20 -05:00
leonace924
2d94803876 fix: remove unused code 2026-01-06 01:42:20 -05: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
leonace924
ad1b0c10a0 fix: address the comments 2026-01-06 00:15:54 -05:00
leonace924
ac87fa1969 feat: add rss title field and handle rss link from request 2026-01-06 00:15:53 -05:00
mkdev11
8b145d2522 refactor: split MQTT check() into smaller functions 
Per CommanderStorm's feedback, refactor the check() method into:
- checkKeyword() - for legacy keyword matching
- checkJsonQuery() - for legacy JSONata query
- checkConditions() - for new conditions system

Also add test cases for MQTT conditions:
- Message condition with contains operator
- Topic condition with equals operator
- Condition mismatch rejection
- Multiple conditions with AND logic

This improves readability and maintainability.
 2026-01-06 03:48:31 +02:00
mkdev11
e22784aaea fix: guard against undefined conditions in MQTT monitor 
Add check for monitor.conditions before calling fromMonitor() to
prevent JSON.parse(undefined) error when monitors don't have
conditions defined.
 2026-01-06 03:19:22 +02:00
mkdev11
cf1391db6b feat: add conditions support for MQTT monitor type 
Add rich conditions support to MQTT monitor similar to DNS monitor,
allowing users to define flexible conditions on:
- topic: The MQTT topic that received the message
- message: The raw message content
- json_value: JSONata-extracted value from JSON payloads

This provides a more intuitive and powerful way to validate MQTT
messages compared to the basic keyword/json-query checks.

Maintains backward compatibility with existing keyword and json-query
check types.

Closes #5992
 2026-01-06 03:08:10 +02:00
Frank Elsinga
1f1d28aaa2
Merge branch 'master' into google-chat-url-link 2026-01-06 00:51:50 +01:00
mkdev11
4cad39740e refactor: use extractAddress() method for monitor address 
Address review feedback from CommanderStorm to use the inherited
extractAddress() method instead of directly accessing monitorJSON["url"].
This properly handles different monitor types (ping, port, dns, etc.).
 2026-01-06 01:43:40 +02:00
Frank Elsinga
038184f7fe
Update server/model/monitor.js 2026-01-05 20:25:22 +01:00
Frank Elsinga
b2c9ccbeee
Update server/model/monitor.js 2026-01-05 20:25:14 +01:00
Frank Elsinga
d7db40ba52
Merge branch 'master' into CommanderStorm-patch-2 2026-01-05 18:13:26 +01:00
mkdev11
13b49bb417 feat: add monitored URL link to Google Chat notifications 
Add the monitored service URL as a clickable link in Google Chat
notifications, allowing users to quickly navigate to the affected
service for immediate investigation.

Closes #5952
 2026-01-05 15:56:26 +02:00
Frank Elsinga
31b8dd64c7
Merge branch 'master' into master 2026-01-05 09:40:39 +01:00
Frank Elsinga
b25b2c7faa
Update server/model/monitor.js 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2026-01-05 08:41:11 +01:00
Frank Elsinga
3ae495e33b
Update server/model/monitor.js 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2026-01-05 08:41:00 +01:00
Frank Elsinga
e9043c7352
Update server/model/monitor.js 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2026-01-05 08:40:32 +01:00
autofix-ci[bot]
6ce5e90650
[autofix.ci] apply automated fixes 2026-01-05 07:37:25 +00:00
Frank Elsinga
5af0753415
Enhance error handling for container state checks 2026-01-05 08:30:23 +01:00
Eddie Fiorentine
afa81fdef8
Update server/monitor-types/sip-options.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2026-01-04 22:22:25 -05:00
Eddie Fiorentine
7827033456
Update server/monitor-types/sip-options.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2026-01-04 22:22:17 -05:00
Eddie Fiorentine
032eb891ae
Update server/monitor-types/sip-options.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2026-01-04 22:21:51 -05:00
GivenBY
e83039f30b Fix: reuse base template renderer and escape MarkdownV2 output 2026-01-04 10:36:34 +05:30
GivenBY
e69a427791
Merge branch 'louislam:master' into fix-telegram-markdown-escape 2026-01-04 10:26:29 +05:30
Frank Elsinga
5baac436d3
Merge branch 'master' into master 2026-01-03 17:12:44 +01:00
Frank Elsinga
d172f2fde9
Merge branch 'master' into feature/umami-analytics-status-page 2026-01-03 16:57:11 +01:00
GivenBY
6675ce5086 Fix: escape Telegram MarkdownV2 after template rendering 2026-01-03 20:52:39 +05:30
Markus Reisenhofer
d096e2902c
feat(gamedig): Update gamedig implementation to v5 (#4949) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2026-01-03 05:56:38 +00:00
Frank Elsinga
cb9e29a00c
Merge branch 'master' into feature/local-service-monitor 2026-01-02 17:38:22 +01:00
Frank Elsinga
a36b365f4d
fix(rss): fix the rss endpoint having the wrong content type (#6570) 2026-01-02 16:02:31 +00: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
e99cd18268
Update server/monitor-types/system-service.js 
Thanks for your help wit this

Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2026-01-02 07:07:47 +01:00
Frank Elsinga
7ca370b048
Merge branch 'master' into security/improved-security 2026-01-02 07:06:28 +01:00
iotux
700eefafe4
Merge branch 'louislam:master' into feature/local-service-monitor 2026-01-02 13:04:15 +07:00
Frank Elsinga
cd874e787b
Merge branch 'master' into fix/discord-empty-service-url 2026-01-02 06:48:45 +01:00