Commit Graph

1985 Commits

Author SHA1 Message Date
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 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
Frank Elsinga e4552a2184 simplify extractAddress(monitorJSON) a bit more 2026-01-02 06:47:29 +01:00
Frank Elsinga 1532acaaf3 don't call extractAddress twice 2026-01-02 06:46:50 +01:00
Frank Elsinga f695304537 Merge branch 'master' into add-og-meta-tags 2026-01-02 06:41:04 +01:00
Frank Elsinga 6a95a88213 Update server/model/status_page.js 2026-01-02 06:40:27 +01:00
Julian Speckmann 4ee7fb208d Merge branch 'master' into security/improved-security 2026-01-02 04:29:06 +01:00
iotux 49962ebe6b Merge branch 'louislam:master' into feature/local-service-monitor 2026-01-01 23:19:30 +07:00
Frank Elsinga 9abded0baf fix imports 2026-01-01 16:34:05 +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
DanielDerefaka c9381154a6 feat(status-page): add og:type and og:image Open Graph meta tags
Added additional Open Graph meta tags to status pages for better
social media sharing:
- og:type (set to "website")
- og:image (uses the status page icon if configured)

This complements the existing og:title and og:description tags.

Fixes #6514
2026-01-01 11:41:11 +01:00
DanielDerefaka b16aa9c832 fix(discord): hide empty Service URL and N/A Ping fields
- Only show Service URL field when extractAddress returns a non-empty value
- Only show Ping field when ping value is not null
- This fixes unnecessary 'https://' and 'N/A' values showing for groups

Fixes #3327

Contribution by Gittensor, see my contribution statistics at https://gittensor.io/miners/details?githubId=101010297
2026-01-01 11:07:16 +01:00
iotux 2c47174a04 Merge branch 'feature/local-service-monitor' of https://github.com/iotux/uptime-kuma into feature/local-service-monitor 2026-01-01 09:55:14 +01:00
iotux 97d836d7f4 Modified according to review 2026-01-01 09:41:24 +01:00
iotux 6bc382ef4d Update server/monitor-types/system-service.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2026-01-01 08:41:09 +01:00