Merge branch 'master' into fix/alert-82

[improve] improve url validation for serverChan (#3364 )
Signed-off-by: aias00 <liuhongyu@apache.org> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Calvin <naruse_shinji@163.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>
2026-09-17 09:40:58 +00:00 · 2025-05-18 17:07:46 +08:00 · 2025-05-18 16:48:31 +08:00 · 2025-05-18 16:17:31 +08:00 · 2025-05-18 14:09:09 +08:00 · 2025-05-18 13:48:30 +08:00
26 changed files with 222 additions and 150 deletions
@@ -544,7 +544,7 @@ WeChat Group : Add friend `ahertzbeat` and invite to the group.

 WeChat Public : Search ID `usthecom`.

-[QQ Group](https://jq.qq.com/?_wv=1027&k=Bud9OzdI) : Group num `630061200`
+[QQ Group](https://qm.qq.com/q/xxqecSC2cw) : Group num `1035688434`

 [Github Discussion](https://github.com/apache/hertzbeat/discussions)

@@ -542,7 +542,7 @@ Thanks these wonderful people, welcome to join us:

 微信公众号 : 搜索 ID `usthecom`.

-[QQ交流群](https://jq.qq.com/?_wv=1027&k=Bud9OzdI) : 群号 `630061200`
+[QQ交流群](https://qm.qq.com/q/xxqecSC2cw) : 群号 `1035688434`

 [Github Discussion](https://github.com/apache/hertzbeat/discussions)

@@ -546,7 +546,7 @@ WeChatグループ : `ahertzbeat` を検索.

 WeChat公式アカウント : `usthecom`を検索.

-[QQグループ](https://jq.qq.com/?_wv=1027&k=Bud9OzdI) : グループ番号　`630061200`
+[QQグループ](https://qm.qq.com/q/xxqecSC2cw) : グループ番号　`1035688434`

 [Github Discussion](https://github.com/apache/hertzbeat/discussions)

@@ -54,7 +54,15 @@ final class FlyBookAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl
            String notificationContent = JsonUtil.toJson(renderContent(noticeTemplate, alert));
            // todo priority custom the color 
            String cardMessage = createLarkMessage(receiver.getUserId(), notificationContent, (byte) 1);
-            String webHookUrl = alerterProperties.getFlyBookWebhookUrl() + receiver.getAccessToken();
+            String baseUrl = alerterProperties.getFlyBookWebhookUrl();
+            if (!isValidBaseUrl(baseUrl)) {
+                throw new AlertNoticeException("Invalid base URL for FlyBook webhook.");
+            }
+            String accessToken = receiver.getAccessToken();
+            if (!isValidAccessToken(accessToken)) {
+                throw new AlertNoticeException("Invalid access token for FlyBook webhook.");
+            }
+            String webHookUrl = baseUrl + accessToken;
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity<String> flyEntity = new HttpEntity<>(cardMessage, headers);
@@ -202,4 +210,14 @@ final class FlyBookAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl
    public byte type() {
        return 6;
    }
+    
+    private boolean isValidBaseUrl(String baseUrl) {
+        // Ensure the base URL is a trusted, fixed URL
+        return baseUrl != null && baseUrl.startsWith("https://trusted-domain.com/");
+    }
+
+    private boolean isValidAccessToken(String accessToken) {
+        // Validate the access token format (e.g., alphanumeric, specific length)
+        return accessToken != null && accessToken.matches("^[a-zA-Z0-9_-]{20,50}$");
+    }
 }
@@ -31,6 +31,8 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+import java.util.List;
+
 /**
 * Send alarm information through Server
 */
@@ -54,7 +56,16 @@ public class ServerChanAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity<ServerChanAlertNotifyHandlerImpl.ServerChanWebHookDto> httpEntity = new HttpEntity<>(serverChanWebHookDto, headers);
-            String webHookUrl = String.format(alerterProperties.getServerChanWebhookUrl(), receiver.getServerChanToken());
+            String sanitizedToken = receiver.getServerChanToken().replaceAll("[^a-zA-Z0-9_-]", "");
+            String webHookUrl = String.format(alerterProperties.getServerChanWebhookUrl(), sanitizedToken);
+            
+            // Validate the constructed URL against a whitelist
+            List<String> allowedBaseUrls = List.of("https://api.serverchan.com", "https://serverchan.example.com");
+            boolean isValidUrl = allowedBaseUrls.stream().anyMatch(webHookUrl::startsWith);
+            if (!isValidUrl) {
+                throw new AlertNoticeException("Invalid webhook URL: " + webHookUrl);
+            }
+            
            ResponseEntity<CommonRobotNotifyResp> responseEntity = restTemplate.postForEntity(webHookUrl,
                    httpEntity, CommonRobotNotifyResp.class);
            if (responseEntity.getStatusCode() == HttpStatus.OK) {
@@ -17,6 +17,7 @@

 package org.apache.hertzbeat.alert.notice.impl;

+import java.net.URI;
 import java.util.Objects;
 import lombok.Builder;
 import lombok.Data;
@@ -52,7 +53,12 @@ final class SlackAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl {
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity<SlackNotifyDTO> slackNotifyEntity = new HttpEntity<>(slackNotify, headers);
-            var entity = restTemplate.postForEntity(receiver.getSlackWebHookUrl(), slackNotifyEntity, String.class);
+            String slackWebHookUrl = receiver.getSlackWebHookUrl();
+            if (!isValidSlackWebHookUrl(slackWebHookUrl)) {
+                log.warn("Invalid Slack Webhook URL: {}", slackWebHookUrl);
+                throw new AlertNoticeException("Invalid Slack Webhook URL");
+            }
+            var entity = restTemplate.postForEntity(slackWebHookUrl, slackNotifyEntity, String.class);
            if (entity.getStatusCode() == HttpStatus.OK && entity.getBody() != null) {
                var body = entity.getBody();
                if (Objects.equals(SUCCESS, body)) {
@@ -81,4 +87,21 @@ final class SlackAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl {
        private String text;
    }

+
+    /**
+     * Validate if the Slack Webhook URL belongs to an allowed domain.
+     *
+     * @param url the Slack Webhook URL to validate
+     * @return true if the URL is valid, false otherwise
+     */
+    private boolean isValidSlackWebHookUrl(String url) {
+        try {
+            URI uri = new URI(url);
+            String host = uri.getHost();
+            return "hooks.slack.com".equals(host);
+        } catch (Exception e) {
+            log.warn("Error validating Slack Webhook URL: {}", url, e);
+            return false;
+        }
+    }
 }
@@ -42,9 +42,14 @@ import org.springframework.stereotype.Component;
 final class TelegramBotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl {

    @Override
-    public void send(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) throws AlertNoticeException {
+    public void send(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert)
+            throws AlertNoticeException {
        try {
-            String url = String.format(alerterProperties.getTelegramWebhookUrl(), receiver.getTgBotToken());
+            String token = receiver.getTgBotToken();
+            if (!isValidTelegramToken(token)) {
+                throw new AlertNoticeException("Invalid Telegram Bot Token");
+            }
+            String url = String.format(alerterProperties.getTelegramWebhookUrl(), token);
            TelegramBotNotifyDTO notifyBody = TelegramBotNotifyDTO.builder()
                    .chatId(receiver.getTgUserId())
                    .text(renderContent(noticeTemplate, alert))
@@ -54,7 +59,8 @@ final class TelegramBotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity<TelegramBotNotifyDTO> telegramEntity = new HttpEntity<>(notifyBody, headers);
-            ResponseEntity<TelegramBotNotifyResponse> entity = restTemplate.postForEntity(url, telegramEntity, TelegramBotNotifyResponse.class);
+            ResponseEntity<TelegramBotNotifyResponse> entity = restTemplate.postForEntity(url, telegramEntity,
+                    TelegramBotNotifyResponse.class);
            if (entity.getStatusCode() == HttpStatus.OK && entity.getBody() != null) {
                TelegramBotNotifyResponse body = entity.getBody();
                if (body.ok) {
@@ -99,4 +105,10 @@ final class TelegramBotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandler
        private String description;
    }

+    private boolean isValidTelegramToken(String token) {
+        // Adjusted pattern to match real Telegram Bot tokens like
+        // 110201543:AAHdqTcvCH1vGWJxfSeofSAs0K5PALDsaw
+        String tokenPattern = "^[0-9]+:[a-zA-Z0-9_-]+$";
+        return token != null && token.matches(tokenPattern);
+    }
 }
@@ -57,7 +57,12 @@ final class WeComRobotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerI
            HttpHeaders headers = new HttpHeaders();
            headers.setContentType(MediaType.APPLICATION_JSON);
            HttpEntity<WeWorkWebHookDto> httpEntity = new HttpEntity<>(weWorkWebHookDTO, headers);
-            String webHookUrl = alerterProperties.getWeWorkWebhookUrl() + receiver.getWechatId();
+            String wechatId = receiver.getWechatId();
+            if (!isValidWechatId(wechatId)) {
+                log.warn("Invalid WeChat ID: {}", wechatId);
+                throw new AlertNoticeException("Invalid WeChat ID provided.");
+            }
+            String webHookUrl = alerterProperties.getWeWorkWebhookUrl() + wechatId;
            ResponseEntity<CommonRobotNotifyResp> entity = restTemplate.postForEntity(webHookUrl, httpEntity, CommonRobotNotifyResp.class);
            if (entity.getStatusCode() == HttpStatus.OK) {
                assert entity.getBody() != null;
@@ -170,4 +175,15 @@ final class WeComRobotAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerI
        }

    }
+    
+    /**
+     * Validate the WeChat ID to ensure it meets the expected format.
+     *
+     * @param wechatId the WeChat ID to validate
+     * @return true if valid, false otherwise
+     */
+    private boolean isValidWechatId(String wechatId) {
+        // Example validation: ensure the ID is alphanumeric and non-empty
+        return StringUtils.isNotBlank(wechatId) && wechatId.matches("^[a-zA-Z0-9_-]+$");
+    }
 }
@@ -20,6 +20,7 @@ package org.apache.hertzbeat.alert.notice.impl;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;

 import org.apache.hertzbeat.alert.AlerterProperties;
@@ -51,10 +52,10 @@ class FlyBookAlertNotifyHandlerImplTest {

    @Mock
    private RestTemplate restTemplate;
-    
+
    @Mock
    private AlerterProperties alerterProperties;
-    
+
    @Mock
    private ResourceBundle bundle;

@@ -70,28 +71,33 @@ class FlyBookAlertNotifyHandlerImplTest {
        receiver = new NoticeReceiver();
        receiver.setId(1L);
        receiver.setName("test-receiver");
-        
+        receiver.setAccessToken("a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6");
+
        groupAlert = new GroupAlert();
        SingleAlert singleAlert = new SingleAlert();
        singleAlert.setLabels(new HashMap<>());
        singleAlert.getLabels().put("severity", "critical");
        singleAlert.getLabels().put("alertname", "Test Alert");
-        
+
        List<SingleAlert> alerts = new ArrayList<>();
        alerts.add(singleAlert);
        groupAlert.setAlerts(alerts);
-        
+
        template = new NoticeTemplate();
        template.setId(1L);
        template.setName("test-template");
        template.setContent("test content");
-        
-        when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
+
+        lenient().when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
+        lenient().when(alerterProperties.getFlyBookWebhookUrl()).thenReturn("https://trusted-domain.com/");
+        lenient().when(alerterProperties.getConsoleUrl()).thenReturn("https://console.example.com");
    }

    @Test
-    public void testNotifyAlertWithInvalidToken() {
-        assertThrows(AlertNoticeException.class, 
+    public void testNotifyAlertWithInvalidUrl() {
+        when(alerterProperties.getFlyBookWebhookUrl()).thenReturn("https://untrusted-domain.com/");
+
+        assertThrows(AlertNoticeException.class,
                () -> flyBookAlertNotifyHandler.send(receiver, template, groupAlert));
    }

@@ -99,33 +105,21 @@ class FlyBookAlertNotifyHandlerImplTest {
    public void testNotifyAlertSuccess() {
        CommonRobotNotifyResp successResp = new CommonRobotNotifyResp();
        successResp.setErrCode(0);
-        ResponseEntity<CommonRobotNotifyResp> responseEntity = 
-            new ResponseEntity<>(successResp, HttpStatus.OK);
+        ResponseEntity<CommonRobotNotifyResp> responseEntity = new ResponseEntity<>(successResp, HttpStatus.OK);

        when(restTemplate.postForEntity(
                any(String.class),
                any(),
-                eq(CommonRobotNotifyResp.class)
-        )).thenReturn(responseEntity);
+                eq(CommonRobotNotifyResp.class))).thenReturn(responseEntity);

        flyBookAlertNotifyHandler.send(receiver, template, groupAlert);
    }

    @Test
-    public void testNotifyAlertFailure() {
-        CommonRobotNotifyResp failResp = new CommonRobotNotifyResp();
-        failResp.setCode(1);
-        failResp.setErrMsg("Test Error");
-        ResponseEntity<CommonRobotNotifyResp> responseEntity = 
-            new ResponseEntity<>(failResp, HttpStatus.OK);
+    public void testNotifyAlertWithInvalidToken() {
+        receiver.setAccessToken("invalid");

-        when(restTemplate.postForEntity(
-                any(String.class),
-                any(),
-                eq(CommonRobotNotifyResp.class)
-        )).thenReturn(responseEntity);
-        
-        assertThrows(AlertNoticeException.class, 
+        assertThrows(AlertNoticeException.class,
                () -> flyBookAlertNotifyHandler.send(receiver, template, groupAlert));
    }
 }
@@ -20,6 +20,7 @@ package org.apache.hertzbeat.alert.notice.impl;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;

 import org.apache.hertzbeat.alert.AlerterProperties;
@@ -48,7 +49,7 @@ import java.util.ResourceBundle;
 */
@ExtendWith(MockitoExtension.class)
 class ServerChanAlertNotifyHandlerImplTest {
-
+    
    @Mock
    private RestTemplate restTemplate;
    
@@ -57,20 +58,21 @@ class ServerChanAlertNotifyHandlerImplTest {
    
    @Mock
    private ResourceBundle bundle;
-
+    
    @InjectMocks
    private ServerChanAlertNotifyHandlerImpl serverChanAlertNotifyHandler;
-
+    
    private NoticeReceiver receiver;
    private GroupAlert groupAlert;
    private NoticeTemplate template;
-
+    
    @BeforeEach
    public void setUp() {
        receiver = new NoticeReceiver();
        receiver.setId(1L);
        receiver.setName("test-receiver");
        receiver.setAccessToken("test-token");
+        receiver.setServerChanToken("SCT193569TSNm6xIabdjqeZPtOGOWcvU1e");
        
        groupAlert = new GroupAlert();
        SingleAlert singleAlert = new SingleAlert();
@@ -87,43 +89,31 @@ class ServerChanAlertNotifyHandlerImplTest {
        template.setName("test-template");
        template.setContent("test content");
        
-        when(alerterProperties.getServerChanWebhookUrl()).thenReturn("http://test.url/");
-        when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
+        lenient().when(alerterProperties.getServerChanWebhookUrl())
+                .thenReturn("https://api.serverchan.com/send/%s");
+        lenient().when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
    }
    
-
    @Test
    public void testNotifyAlertSuccess() {
        CommonRobotNotifyResp successResp = new CommonRobotNotifyResp();
        successResp.setErrCode(0);
        successResp.setMsg("success");
-        ResponseEntity<CommonRobotNotifyResp> responseEntity =
-                new ResponseEntity<>(successResp, HttpStatus.OK);
-
+        ResponseEntity<CommonRobotNotifyResp> responseEntity = new ResponseEntity<>(successResp, HttpStatus.OK);
+        
        when(restTemplate.postForEntity(
                any(String.class),
                any(),
-                eq(CommonRobotNotifyResp.class)
-        )).thenReturn(responseEntity);
+                eq(CommonRobotNotifyResp.class))).thenReturn(responseEntity);
        
        serverChanAlertNotifyHandler.send(receiver, template, groupAlert);
    }
-
+    
    @Test
-    public void testNotifyAlertFailure() {
-        CommonRobotNotifyResp failResp = new CommonRobotNotifyResp();
-        failResp.setCode(1);
-        failResp.setErrMsg("Test Error");
-        ResponseEntity<CommonRobotNotifyResp> responseEntity =
-                new ResponseEntity<>(failResp, HttpStatus.BAD_REQUEST);
-
-        when(restTemplate.postForEntity(
-                any(String.class),
-                any(),
-                eq(CommonRobotNotifyResp.class)
-        )).thenReturn(responseEntity);
+    public void testNotifyAlertWithInvalidUrl() {
+        when(alerterProperties.getServerChanWebhookUrl()).thenReturn("http://invalid-url.com/%s");
        
-        assertThrows(AlertNoticeException.class, 
+        assertThrows(AlertNoticeException.class,
                () -> serverChanAlertNotifyHandler.send(receiver, template, groupAlert));
    }
 }
@@ -51,7 +51,7 @@ class SlackAlertNotifyHandlerImplTest {

    @Mock
    private RestTemplate restTemplate;
-    
+
    @Mock
    private ResourceBundle bundle;

@@ -68,18 +68,18 @@ class SlackAlertNotifyHandlerImplTest {
        receiver.setId(1L);
        receiver.setName("test-receiver");
        receiver.setAccessToken("test-token");
-        receiver.setSlackWebHookUrl("http://localhost:8080");
-        
+        receiver.setSlackWebHookUrl("https://hooks.slack.com/services/ABCDEF/GHIJKL/mnopqrstuvwxyz");
+
        groupAlert = new GroupAlert();
        SingleAlert singleAlert = new SingleAlert();
        singleAlert.setLabels(new HashMap<>());
        singleAlert.getLabels().put("severity", "critical");
        singleAlert.getLabels().put("alertname", "Test Alert");
-        
+
        List<SingleAlert> alerts = new ArrayList<>();
        alerts.add(singleAlert);
        groupAlert.setAlerts(alerts);
-        
+
        template = new NoticeTemplate();
        template.setId(1L);
        template.setName("test-template");
@@ -90,22 +90,18 @@ class SlackAlertNotifyHandlerImplTest {

    @Test
    public void testNotifyAlertSuccess() {
-        ResponseEntity<String> responseEntity = 
-            new ResponseEntity<>("ok", HttpStatus.OK);
-        
+        ResponseEntity<String> responseEntity = new ResponseEntity<>("ok", HttpStatus.OK);
+
        when(restTemplate.postForEntity(any(String.class), any(), eq(String.class))).thenReturn(responseEntity);
-        
+
        slackAlertNotifyHandler.send(receiver, template, groupAlert);
    }

    @Test
-    public void testNotifyAlertFailure() {
-        ResponseEntity<String> responseEntity =
-                new ResponseEntity<>("invalid_payload", HttpStatus.BAD_REQUEST);
+    public void testNotifyAlertWithInvalidUrl() {
+        receiver.setSlackWebHookUrl("http://localhost:8080");

-        when(restTemplate.postForEntity(any(String.class), any(), eq(String.class))).thenReturn(responseEntity);
-        
-        assertThrows(AlertNoticeException.class, 
+        assertThrows(AlertNoticeException.class,
                () -> slackAlertNotifyHandler.send(receiver, template, groupAlert));
    }
 }
@@ -20,6 +20,7 @@ package org.apache.hertzbeat.alert.notice.impl;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;

 import org.apache.hertzbeat.alert.AlerterProperties;
@@ -51,10 +52,10 @@ class TelegramBotAlertNotifyHandlerImplTest {

    @Mock
    private RestTemplate restTemplate;
-    
+
    @Mock
    private AlerterProperties alerterProperties;
-    
+
    @Mock
    private ResourceBundle bundle;

@@ -70,58 +71,57 @@ class TelegramBotAlertNotifyHandlerImplTest {
        receiver = new NoticeReceiver();
        receiver.setId(1L);
        receiver.setName("test-receiver");
-        receiver.setAccessToken("test-token");
+        receiver.setTgBotToken("123456:ABC-DEF1234ghIkl-zyx57W2v1u123ew11");
        receiver.setTgUserId("123456789"); // Telegram specific - chat ID
-        
+
        groupAlert = new GroupAlert();
        SingleAlert singleAlert = new SingleAlert();
        singleAlert.setLabels(new HashMap<>());
        singleAlert.getLabels().put("severity", "critical");
        singleAlert.getLabels().put("alertname", "Test Alert");
-        
+
        List<SingleAlert> alerts = new ArrayList<>();
        alerts.add(singleAlert);
        groupAlert.setAlerts(alerts);
-        
+
        template = new NoticeTemplate();
        template.setId(1L);
        template.setName("test-template");
        template.setContent("test content");
-        
-        when(alerterProperties.getTelegramWebhookUrl()).thenReturn("https://api.telegram.org/bot%s/sendMessage");
-        when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
+
+        lenient().when(alerterProperties.getTelegramWebhookUrl())
+                .thenReturn("https://api.telegram.org/bot%s/sendMessage");
+        lenient().when(bundle.getString("alerter.notify.title")).thenReturn("Alert Notification");
    }

    @Test
    public void testNotifyAlertSuccess() {
-        TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse successResp = 
-            new TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse();
+        TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse successResp = new TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse();
        successResp.setOk(true);
        successResp.setDescription("Test Success");
-        
-        ResponseEntity<TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse> responseEntity = 
-            new ResponseEntity<>(successResp, HttpStatus.OK);
-        
-        when(restTemplate.postForEntity(any(String.class), any(), 
+
+        ResponseEntity<TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse> responseEntity = new ResponseEntity<>(
+                successResp, HttpStatus.OK);
+
+        when(restTemplate.postForEntity(any(String.class), any(),
                eq(TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse.class))).thenReturn(responseEntity);
-        
+
        telegramBotAlertNotifyHandler.send(receiver, template, groupAlert);
    }

    @Test
    public void testNotifyAlertFailure() {
-        TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse successResp =
-                new TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse();
-        successResp.setOk(false);
-        successResp.setDescription("Test failed");
+        TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse failureResp = new TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse();
+        failureResp.setOk(false);
+        failureResp.setDescription("Test failed");

-        ResponseEntity<TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse> responseEntity =
-                new ResponseEntity<>(successResp, HttpStatus.BAD_REQUEST);
+        ResponseEntity<TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse> responseEntity = new ResponseEntity<>(
+                failureResp, HttpStatus.OK);

        when(restTemplate.postForEntity(any(String.class), any(),
                eq(TelegramBotAlertNotifyHandlerImpl.TelegramBotNotifyResponse.class))).thenReturn(responseEntity);
-        
-        assertThrows(AlertNoticeException.class, 
+
+        assertThrows(AlertNoticeException.class,
                () -> telegramBotAlertNotifyHandler.send(receiver, template, groupAlert));
    }
 }
@@ -48,7 +48,7 @@ import java.util.ResourceBundle;
 */
@ExtendWith(MockitoExtension.class)
 class WeComRobotAlertNotifyHandlerImplTest {
-
+    
    @Mock
    private RestTemplate restTemplate;
    
@@ -57,20 +57,21 @@ class WeComRobotAlertNotifyHandlerImplTest {
    
    @Mock
    private ResourceBundle bundle;
-
+    
    @InjectMocks
    private WeComRobotAlertNotifyHandlerImpl weComRobotAlertNotifyHandler;
-
+    
    private NoticeReceiver receiver;
    private GroupAlert groupAlert;
    private NoticeTemplate template;
-
+    
    @BeforeEach
    public void setUp() {
        receiver = new NoticeReceiver();
        receiver.setId(1L);
        receiver.setName("test-receiver");
        receiver.setAccessToken("test-token");
+        receiver.setWechatId("test-wechat-id");
        
        groupAlert = new GroupAlert();
        SingleAlert singleAlert = new SingleAlert();
@@ -95,33 +96,29 @@ class WeComRobotAlertNotifyHandlerImplTest {
    public void testNotifyAlertSuccess() {
        CommonRobotNotifyResp successResp = new CommonRobotNotifyResp();
        successResp.setErrCode(0);
-        ResponseEntity<CommonRobotNotifyResp> responseEntity =
-                new ResponseEntity<>(successResp, HttpStatus.OK);
-
+        ResponseEntity<CommonRobotNotifyResp> responseEntity = new ResponseEntity<>(successResp, HttpStatus.OK);
+        
        when(restTemplate.postForEntity(
                any(String.class),
                any(),
-                eq(CommonRobotNotifyResp.class)
-        )).thenReturn(responseEntity);
+                eq(CommonRobotNotifyResp.class))).thenReturn(responseEntity);
        
        weComRobotAlertNotifyHandler.send(receiver, template, groupAlert);
    }
-
+    
    @Test
    public void testNotifyAlertFailure() {
        CommonRobotNotifyResp failResp = new CommonRobotNotifyResp();
        failResp.setCode(1);
        failResp.setErrMsg("Test Error");
-        ResponseEntity<CommonRobotNotifyResp> responseEntity =
-                new ResponseEntity<>(failResp, HttpStatus.OK);
-
+        ResponseEntity<CommonRobotNotifyResp> responseEntity = new ResponseEntity<>(failResp, HttpStatus.OK);
+        
        when(restTemplate.postForEntity(
                any(String.class),
                any(),
-                eq(CommonRobotNotifyResp.class)
-        )).thenReturn(responseEntity);
+                eq(CommonRobotNotifyResp.class))).thenReturn(responseEntity);
        
-        assertThrows(AlertNoticeException.class, 
+        assertThrows(AlertNoticeException.class,
                () -> weComRobotAlertNotifyHandler.send(receiver, template, groupAlert));
    }
 }
@@ -150,10 +150,7 @@ public class ServiceDiscoveryWorker implements InitializingBean {
                    // Thus, all monitors still in hostMonitorMap need to be cancelled.
                    final Set<Long> needCancelMonitorIdSet = subMonitorBindMap.values().stream()
                            .map(MonitorBind::getMonitorId).collect(Collectors.toSet());
-                    monitorService.cancelManageMonitors(needCancelMonitorIdSet);
-                    for (Long id : needCancelMonitorIdSet) {
-                        monitorBindDao.deleteMonitorBindByBizIdAndMonitorId(monitorId, id);
-                    }
+                    monitorService.deleteMonitors(needCancelMonitorIdSet);
                } catch (Exception exception) {
                    log.error(exception.getMessage(), exception);
                }
@@ -18,6 +18,8 @@
 package org.apache.hertzbeat.manager.dao;

 import java.util.List;
+import java.util.Set;
+
 import org.apache.hertzbeat.common.entity.manager.MonitorBind;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
@@ -31,9 +33,15 @@ public interface MonitorBindDao extends JpaRepository<MonitorBind, Long>, JpaSpe

    List<MonitorBind> findMonitorBindsByBizId(Long bizId);

+    List<MonitorBind> findMonitorBindsByBizIdIn(Set<Long> bizIds);
+
+
    void deleteByMonitorId(Long monitorId);
    
    @Modifying
    @Transactional
    void deleteMonitorBindByBizIdAndMonitorId(Long bizId, Long monitorId);
+
+    @Modifying
+    void deleteMonitorBindByBizIdIn(Set<Long> bizIds);
 }
@@ -37,6 +37,7 @@ import org.apache.hertzbeat.common.entity.manager.Collector;
 import org.apache.hertzbeat.common.entity.manager.CollectorMonitorBind;
 import org.apache.hertzbeat.common.entity.manager.Label;
 import org.apache.hertzbeat.common.entity.manager.Monitor;
+import org.apache.hertzbeat.common.entity.manager.MonitorBind;
 import org.apache.hertzbeat.common.entity.manager.Param;
 import org.apache.hertzbeat.common.entity.manager.ParamDefine;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
@@ -86,6 +87,7 @@ import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -529,12 +531,16 @@ public class MonitorServiceImpl implements MonitorService {
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
-        List<Monitor> monitors = monitorDao.findMonitorsByIdIn(ids);
+        Set<Long> subMonitorIds = monitorBindDao.findMonitorBindsByBizIdIn(ids).stream().map(MonitorBind::getMonitorId).collect(Collectors.toSet());
+        Set<Long> allMonitorIds = new HashSet<>(ids);
+        allMonitorIds.addAll(subMonitorIds);
+        List<Monitor> monitors = monitorDao.findMonitorsByIdIn(allMonitorIds);
        if (!monitors.isEmpty()) {
            monitorDao.deleteAll(monitors);
            paramDao.deleteParamsByMonitorIdIn(ids);
            Set<Long> monitorIds = monitors.stream().map(Monitor::getId).collect(Collectors.toSet());
            alertDefineBindDao.deleteAlertDefineMonitorBindsByMonitorIdIn(monitorIds);
+            monitorBindDao.deleteMonitorBindByBizIdIn(monitorIds);
            for (Monitor monitor : monitors) {
                monitorBindDao.deleteByMonitorId(monitor.getId());
                collectorMonitorBindDao.deleteCollectorMonitorBindsByMonitorId(monitor.getId());
@@ -650,6 +656,8 @@ public class MonitorServiceImpl implements MonitorService {
        }
        // Update monitoring status Delete corresponding monitoring periodic task
        // The jobId is not deleted, and the jobId is reused again after the management is started.
+        Set<Long> subMonitorIds = monitorBindDao.findMonitorBindsByBizIdIn(ids).stream().map(MonitorBind::getMonitorId).collect(Collectors.toSet());
+        ids.addAll(subMonitorIds);
        List<Monitor> managedMonitors = monitorDao.findMonitorsByIdIn(ids)
                .stream().filter(monitor ->
                        monitor.getStatus() != CommonConstants.MONITOR_PAUSED_CODE)
@@ -666,6 +674,8 @@ public class MonitorServiceImpl implements MonitorService {
    @Override
    public void enableManageMonitors(Set<Long> ids) {
        // Update monitoring status Add corresponding monitoring periodic task
+        Set<Long> subMonitorIds = monitorBindDao.findMonitorBindsByBizIdIn(ids).stream().map(MonitorBind::getMonitorId).collect(Collectors.toSet());
+        ids.addAll(subMonitorIds);
        List<Monitor> unManagedMonitors = monitorDao.findMonitorsByIdIn(ids)
                .stream().filter(monitor ->
                        monitor.getStatus() == CommonConstants.MONITOR_PAUSED_CODE)
@@ -14,7 +14,7 @@ WeChat Group : Add friend `ahertzbeat` and invite to the group.

 WeChat Public : Search  ID `usthecom`.

-[QQ Group](https://jq.qq.com/?_wv=1027&k=Bud9OzdI) : Group num `630061200`
+[QQ Group](https://qm.qq.com/q/xxqecSC2cw) : Group num `1035688434`

 [Github Discussion](https://github.com/apache/hertzbeat/discussions)

@@ -1,20 +1,20 @@
 ---
 id: greptime-init  
-title: Use Time Series Database GreptimeDB to Store Metrics Data (Optional)       
-sidebar_label: Metrics Store GreptimeDB
+title: Use Time Series Database Greptime to Store Metrics Data (Recommended)
+sidebar_label: Metrics Store Greptime (Recommended)
 ---

 Apache HertzBeat (incubating)'s historical data storage relies on the time series database, you can choose one of them to install and initialize, or not to install (note ⚠️ but it is strongly recommended to configure in the production environment)

-> It is recommended to use VictoriaMetrics as metrics storage.
+> It is recommended to use Greptime as metrics storage.

-[GreptimeDB](https://github.com/GreptimeTeam/greptimedb) is an open-source time-series database with a special focus on scalability, analytical capabilities and efficiency.
+[Greptime](https://github.com/GreptimeTeam/greptimedb) is an Open-source, cloud-native, unified observability database for metrics, logs and traces, supporting SQL/PromQL/Streaming.

 It's designed to work on infrastructure of the cloud era, and users benefit from its elasticity and commodity storage.

 **⚠️ If you do not configure a time series database, only the last hour of historical data is retained.**

-### Install GreptimeDB via Docker
+### Install GreptimeDvia Docker

 1. Download and install Docker environment
 Docker tools download refer to [Docker official document](https://docs.docker.com/get-docker/).
@@ -25,7 +25,7 @@ After the installation you can check if the Docker version normally output at th
   Docker version 20.10.12, build e91ed57
   ```

-2. Install GreptimeDB with Docker
+2. Install Greptime with Docker

    ```shell
    $ docker run -d -p 127.0.0.1:4000-4003:4000-4003 \
@@ -38,7 +38,7 @@ After the installation you can check if the Docker version normally output at th
    --postgres-addr 0.0.0.0:4003
    ```

-`-v "$(pwd)/greptimedb:/tmp/greptimedb"` is local persistent mount of greptimedb data directory. `$(pwd)/greptimedb` should be replaced with the actual local directory, default is the `greptimedb` directory under the current directory.
+`-v "$(pwd)/greptimedb:/tmp/greptimedb"` is local persistent mount of greptime data directory. `$(pwd)/greptimedb` should be replaced with the actual local directory, default is the `greptimedb` directory under the current directory.
 use```$ docker ps``` to check if the database started successfully

 ### Configure the database connection in hertzbeat `application.yml` configuration file
@@ -69,6 +69,6 @@ use```$ docker ps``` to check if the database started successfully

 ### FAQ

-1. Do both the time series databases Greptime, IoTDB or TDengine need to be configured? Can they both be used?
+1. Do both the time series databases need to be configured? Can they both be used?

   > You don't need to configure all of them, you can choose one of them. Use the enable parameter to control whether it is used or not. You can also install and configure neither, which only affects the historical chart data.
@@ -14,7 +14,7 @@ sidebar_label: 交流联系

 微信公众号 : 搜索 ID `usthecom`.

-[QQ交流群](https://jq.qq.com/?_wv=1027&k=Bud9OzdI) : 群号 `630061200`
+[QQ交流群](https://qm.qq.com/q/xxqecSC2cw) : 群号 `1035688434`

 [Github Discussion](https://github.com/apache/hertzbeat/discussions)

@@ -1,19 +1,18 @@
 ---
 id: greptime-init  
-title: 依赖时序数据库服务 GreptimeDB 安装初始化（可选）
-sidebar_label: 指标数据存储 GreptimeDB
+title: 依赖时序数据库服务 Greptime 安装初始化 (推荐)
+sidebar_label: 指标数据存储 Greptime (推荐)
 ---

 Apache HertzBeat (incubating) 的历史数据存储依赖时序数据库，任选其一安装初始化即可，也可不安装(注意⚠️但强烈建议生产环境配置)

-> 我们推荐使用并长期支持 VictoriaMetrics 作为存储。
+> 我们推荐使用并长期支持 Greptime 作为存储。

-[GreptimeDB](https://github.com/GreptimeTeam/greptimedb) is an open-source time-series database with a special focus on scalability, analytical capabilities and efficiency.
-It's designed to work on infrastructure of the cloud era, and users benefit from its elasticity and commodity storage.
+[Greptime](https://github.com/GreptimeTeam/greptimedb) 是一个开源的云原生统一可观测性数据库，用于度量、日志和追踪，支持SQL/PromQL/流式处理。

 **⚠️ 若不配置时序数据库，则只会留最近一小时历史数据**

-### 通过Docker方式安装GreptimeDB
+### 通过Docker方式安装Greptime

 1. 下载安装Docker环境
 Docker 工具自身的下载请参考 [Docker官网文档](https://docs.docker.com/get-docker/)。
@@ -24,7 +23,7 @@ Docker 工具自身的下载请参考 [Docker官网文档](https://docs.docker.c
   Docker version 20.10.12, build e91ed57
   ```

-2. Docker安装GreptimeDB
+2. Docker安装Greptime

   ```shell
   $ docker run -d -p 127.0.0.1:4000-4003:4000-4003 \
@@ -70,6 +69,6 @@ Docker 工具自身的下载请参考 [Docker官网文档](https://docs.docker.c

 ### 常见问题

-1. 时序数据库 GreptimeDB 或者 IoTDB 或者 TDengine 是否都需要配置，能不能都用
+1. 时序数据库是否都需要配置，能不能都用

   > 不需要都配置，任选其一即可，用enable参数控制其是否使用，也可都不安装配置，只影响历史图表数据。
@@ -14,7 +14,7 @@ sidebar_label: 交流联系

 微信公众号 : 搜索 ID `usthecom`.

-[QQ交流群](https://jq.qq.com/?_wv=1027&k=Bud9OzdI) : 群号 `630061200`
+[QQ交流群](https://qm.qq.com/q/xxqecSC2cw) : 群号 `1035688434`

 [Github Discussion](https://github.com/apache/hertzbeat/discussions)

@@ -13,7 +13,7 @@ slug: /
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8139/badge)](https://www.bestpractices.dev/projects/8139)
 [![Docker Pulls](https://img.shields.io/docker/pulls/apache/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/r/apache/hertzbeat)
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/hertzbeat)](https://artifacthub.io/packages/search?repo=hertzbeat)
-[![QQ](https://img.shields.io/badge/QQ-630061200-orange)](https://qm.qq.com/q/FltGGGIX2m)
+[![QQ](https://img.shields.io/badge/QQ-1035688434-orange)](https://qm.qq.com/q/FltGGGIX2m)
 [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow)

 ## 🎡 <font color="green">介绍</font>
@@ -41,6 +41,7 @@
          "type": "category",
          "label": "change-db",
          "items": [
+            "start/greptime-init",
            "start/victoria-metrics-init",
            "start/iotdb-init",
            "start/influxdb-init",
@@ -81,6 +81,11 @@
      "githubId": "29418975",
      "gitUrl": "https://github.com/zhangshenghang",
      "name": "Shenghang Zhang"
+    },
+    {
+      "githubId": "30208283",
+      "gitUrl": "https://github.com/LiuTianyou",
+      "name": "LiuTianyou"
    }
  ],
  "committer" : [
@@ -89,11 +94,6 @@
      "gitUrl": "https://github.com/crossoverJie",
      "name": "CrossoverJie"
    },
-    {
-      "githubId": "30208283",
-      "gitUrl": "https://github.com/LiuTianyou",
-      "name": "LiuTianyou"
-    },
    {
      "githubId": "3371163",
      "gitUrl": "https://github.com/kerwin612",
@@ -14,7 +14,7 @@ WeChat Group : Add friend `ahertzbeat` and invite to the group.

 WeChat Public : Search  ID `usthecom`.

-[QQ Group](https://jq.qq.com/?_wv=1027&k=Bud9OzdI) : Group num `630061200`
+[QQ Group](https://qm.qq.com/q/xxqecSC2cw) : Group num `1035688434`

 [Github Discussion](https://github.com/apache/hertzbeat/discussions)

@@ -13,7 +13,7 @@ slug: /
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8139/badge)](https://www.bestpractices.dev/projects/8139)
 [![Docker Pulls](https://img.shields.io/docker/pulls/apache/hertzbeat?style=%20for-the-badge&logo=docker&label=DockerHub%20Download)](https://hub.docker.com/r/apache/hertzbeat)
 [![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/hertzbeat)](https://artifacthub.io/packages/search?repo=hertzbeat)
-[![QQ](https://img.shields.io/badge/QQ-630061200-orange)](https://qm.qq.com/q/FltGGGIX2m)
+[![QQ](https://img.shields.io/badge/QQ-1035688434-orange)](https://qm.qq.com/q/FltGGGIX2m)
 [![YouTube Channel Subscribers](https://img.shields.io/youtube/channel/subscribers/UCri75zfWX0GHqJFPENEbLow?logo=youtube&label=YouTube%20Channel)](https://www.youtube.com/channel/UCri75zfWX0GHqJFPENEbLow)

 **Home: [hertzbeat.apache.org](https://hertzbeat.apache.org)**
Author	SHA1	Message	Date
aias00	a6b834b3d4	Merge branch 'master' into fix/alert-82	2025-05-18 17:07:46 +08:00
aias00 Copilot Autofix powered by AI Calvin tomsun28	dc8ae844c1	[improve] improve url validation for serverChan (#3364 ) Signed-off-by: aias00 <liuhongyu@apache.org> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Calvin <naruse_shinji@163.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-05-18 16:48:31 +08:00
aias00 Copilot Autofix powered by AI Calvin tomsun28	91a7593b87	[improve] improve url validation for SlackAlertNotifyHandlerImpl (#3363 ) Signed-off-by: aias00 <liuhongyu@apache.org> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: Calvin <naruse_shinji@163.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-05-18 16:17:31 +08:00
aias00 Copilot Autofix powered by AI tomsun28	4442a52adf	[improve] improve url validation for TelegramBotAlertNotifyHandlerImpl (#3362 ) Signed-off-by: aias00 <liuhongyu@apache.org> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-05-18 14:09:09 +08:00
Calvin	6ba0873b8f	Merge branch 'master' into fix/alert-82	2025-05-18 13:48:30 +08:00
aias00 Copilot Autofix powered by AI tomsun28	60e3437e82	[improve] improve url validation for WeComRobotAlertNotifyHandlerImpl (#3361 ) Signed-off-by: aias00 <liuhongyu@apache.org> Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Co-authored-by: tomsun28 <tomsun28@outlook.com>	2025-05-18 13:31:39 +08:00
Sherlock Yin yinyijun tomsun28 Copilot Calvin aias00	21d6ec2f1b	[bugfix] Incorrect SD sub-monitor status (#3340 ) Signed-off-by: Sherlock Yin <sherlock.yin1994@gmail.com> Co-authored-by: yinyijun <yinyijun6@mgtv.com> Co-authored-by: tomsun28 <tomsun28@outlook.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Calvin <naruse_shinji@163.com> Co-authored-by: aias00 <liuhongyu@apache.org>	2025-05-18 01:00:37 +08:00
liuhy	f1351cb7b9	fix alert	2025-05-17 15:13:23 +08:00
aias00andCopilot Autofix powered by AI	2ed39220be	Potential fix for code scanning alert no. 82: Server-side request forgery Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com> Signed-off-by: aias00 <liuhongyu@apache.org>	2025-05-17 14:29:30 +08:00
tomsun28	3ed50f39cb	[doc] new ppmc liutianyou and update qq num (#3357 ) Signed-off-by: tomsun28 <tomsun28@outlook.com>	2025-05-17 11:08:39 +08:00
Logic	dfba21f224	[doc](start): update greptime-init documentation (#3355 )	2025-05-16 20:41:08 +08:00