diff --git a/server/model/monitor.js b/server/model/monitor.js index 4bb859e9a..d6e1896a0 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -755,7 +755,7 @@ class Monitor extends BeanModel { await R.store(bean); log.debug("monitor", `[${this.name}] prometheus.update`); - this.prometheus.update(bean, tlsInfo); + this.prometheus?.update(bean, tlsInfo); previousBeat = bean; @@ -840,7 +840,7 @@ class Monitor extends BeanModel { clearTimeout(this.heartbeatInterval); this.isStop = true; - this.prometheus.remove(); + this.prometheus?.remove(); } /** diff --git a/server/notification-providers/telegram.js b/server/notification-providers/telegram.js index 614e487ed..3c490655d 100644 --- a/server/notification-providers/telegram.js +++ b/server/notification-providers/telegram.js @@ -13,6 +13,7 @@ class Telegram extends NotificationProvider { chat_id: notification.telegramChatID, text: msg, disable_notification: notification.telegramSendSilently ?? false, + protect_content: notification.telegramProtectContent ?? false, }; if (notification.telegramMessageThreadID) { params.message_thread_id = notification.telegramMessageThreadID; diff --git a/src/components/notifications/Telegram.vue b/src/components/notifications/Telegram.vue index 52a63b8c7..a7e46fded 100644 --- a/src/components/notifications/Telegram.vue +++ b/src/components/notifications/Telegram.vue @@ -42,6 +42,17 @@ {{ $t("telegramSendSilentlyDescription") }} + +
+
+ + +
+ +
+ {{ $t("telegramProtectContentDescription") }} +
+