Merge branch 'master' into fix/alert-53

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>

README.md

@@ -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)
 

README_CN.md

@@ -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)
 

README_JP.md

@@ -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)
 

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/ServerChanAlertNotifyHandlerImpl.java

@@ -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) {

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/SlackAlertNotifyHandlerImpl.java

@@ -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;
+        }
+    }
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/TelegramBotAlertNotifyHandlerImpl.java

@@ -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);
+    }
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/WeComRobotAlertNotifyHandlerImpl.java

@@ -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_-]+$");
+    }
 }

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/notice/impl/ServerChanAlertNotifyHandlerImplTest.java

@@ -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));
     }
 }

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/notice/impl/SlackAlertNotifyHandlerImplTest.java

@@ -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));
     }
 }

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/notice/impl/TelegramBotAlertNotifyHandlerImplTest.java

@@ -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));
     }
 }

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/notice/impl/WeComRobotAlertNotifyHandlerImplTest.java

@@ -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));
     }
 }

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/sd/ServiceDiscoveryWorker.java

@@ -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);
                 }

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/dao/MonitorBindDao.java

@@ -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);
 }

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java

@@ -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)

hertzbeat-manager/src/main/resources/define/app-almalinux.yml

@@ -27,7 +27,7 @@ help:
   zh-CN: Hertzbeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSH 协议</a> 对 AlmaLinux 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>您可以点击“<i>新建 AlmaLinux</i>”并配置HOST端口账户等相关参数进行添加，支持SSH账户密码或密钥认证。或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: HertzBeat uses <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSH protocol</a> to monitors AlmaLinux operating system's general performance metrics such as cpu, memory, disk, basic, interface, disk_free, top_process etc. <br>You can click the "<i>New AlmaLinux</i>" and config host port and other related params to add, auth support password or secretKey. Or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSH 协议</a> 對 AlmaLinux 操作系统的通用性能指標 (系統信息、CPU、內存、磁盤、網卡、文件系統、TOP資源進程等) 進行採集監控。<br>您可以點擊“<i>新建AlmaLinux</i>”並配置HOST端口賬戶等相關參數進行添加，支持SSH賬戶密碼或密鑰認證。或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> AlmaLinux 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>「<i>新規 AlmaLinux</i>」クリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
+  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> AlmaLinux 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>「<i>新規 AlmaLinux</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/almalinux
   en-US: https://hertzbeat.apache.org/docs/help/almalinux

hertzbeat-manager/src/main/resources/define/app-api.yml

@@ -21,11 +21,13 @@ app: api
 name:
   zh-CN: HTTP API
   en-US: HTTP API
+  ja-JP: HTTP API
 # The description and help of this monitoring type
 help:
   zh-CN: Hertzbeat 将调用 HTTP API 接口，查看接口是否可用，并以 ms 为指标单位对其响应时间等指标进行监测。您可以先点击“新增 HTTP API”按钮并进行配置，或在“更多操作”中导入已有配置。
   en-US: The platform will invoke an HTTP API endpoint to verify its accessibility and monitor various metrics, including response time, measured in milliseconds (ms). <br>To set up this functionality, you could click the "Add HTTP API" button and proceed with the configuration or import an existing setup through the "More Actions" menu.
   zh-TW: Hertzbeat將調用HTTP API介面，查看介面是否可用，並以ms為名額組織對其回應時間等名額進行監測。 您可以先點擊“新增HTTP API”按鈕並進行配寘，或在“更多操作”中導入已有配寘。
+  ja-JP: Hertzbeatは、HTTP APIを呼び出して利用可能かどうかを確認し、応答時間(ms)などのメトリクスを監視します。「新規HTTP API」をクリックして設定しましょう。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/api
   en-US: https://hertzbeat.apache.org/docs/help/api
@@ -37,6 +39,7 @@ params:
     name:
       zh-CN: 目标Host
       en-US: Target Host
+      ja-JP: 目標ホスト
     # type-param field type(most mapping the html input type)
     type: host
     # required-true or false
@@ -47,6 +50,7 @@ params:
     name:
       zh-CN: 端口
       en-US: Port
+      ja-JP: ポート
     # type-param field type(most mapping the html input type)
     type: number
     # when type is number, range is required
@@ -61,6 +65,7 @@ params:
     name:
       zh-CN: 请求方式
       en-US: Method
+      ja-JP: リクエストメソッド
     # type-param field type(most mapping the html input type)
     type: radio
     # required-true or false
@@ -81,6 +86,7 @@ params:
     name:
       zh-CN: 相对路径
       en-US: URI
+      ja-JP: URI
     # type-param field type(most mapping the html input type)
     type: text
     # when type is text, use limit to limit string length
@@ -95,6 +101,7 @@ params:
     name:
       zh-CN: 启用HTTPS
       en-US: HTTPS
+      ja-JP: HTTPS利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -105,6 +112,7 @@ params:
     name:
       zh-CN: 超时时间(ms)
       en-US: Timeout(ms)
+      ja-JP: タイムアウト（ｍｓ）
     # type-param field type(most mapping the html input type)
     type: number
     # required-true or false
@@ -117,6 +125,7 @@ params:
     name:
       zh-CN: 请求Headers
       en-US: Headers
+      ja-JP: ヘッダ
     # type-param field type(most mapping the html input type)
     type: key-value
     # required-true or false
@@ -131,6 +140,7 @@ params:
     name:
       zh-CN: 查询Params
       en-US: Params
+      ja-JP: パラメータ
     # type-param field type(most mapping the html input type)
     type: key-value
     # required-true or false
@@ -145,6 +155,7 @@ params:
     name:
       zh-CN: Content-Type
       en-US: Content-Type
+      ja-JP: コンテンツタイプ
     # type-param field type(most mapping the html input type)
     type: text
     # param field input placeholder
@@ -179,6 +190,7 @@ params:
     name:
       zh-CN: 认证方式
       en-US: Auth Type
+      ja-JP: 認証方法
     # type-param field type(most mapping the html input type)
     type: radio
     # required-true or false
@@ -197,6 +209,7 @@ params:
     name:
       zh-CN: 用户名
       en-US: Username
+      ja-JP: ユーザー名
     # type-param field type(most mapping the html input type)
     type: text
     # when type is text, use limit to limit string length
@@ -211,6 +224,7 @@ params:
     name:
       zh-CN: 密码
       en-US: Password
+      ja-JP: パスワード
     # type-param field type(most mapping the html input type)
     type: password
     # required-true or false
@@ -223,6 +237,7 @@ params:
     name:
       zh-CN: 计数关键字
       en-US: Keyword
+      ja-JP: キーワード
     # type-param field type(most mapping the html input type)
     type: text
     # param field input placeholder
@@ -237,6 +252,7 @@ params:
     name:
       zh-CN: 校验成功状态码
       en-US: Verify Success Code
+      ja-JP: 成功ステータスコードの検証
     # type-param field type(most mapping the html input type)
     type: array
     # param field input placeholder
@@ -252,6 +268,7 @@ params:
     name:
       zh-CN: 启用URL编码（UTF-8）
       en-US: Enable URL Encoding(UTF-8)
+      ja-JP: URL Encoding利用（UTF-8）
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -267,6 +284,7 @@ metrics:
     i18n:
       zh-CN: 概要
       en-US: Summary
+      ja-JP: 概要
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     priority: 0
@@ -279,11 +297,13 @@ metrics:
         i18n:
           zh-CN: 响应时间
           en-US: Response Time
+          ja-JP: 応答時間
       - field: keyword
         type: 0
         i18n:
           zh-CN: 关键词数量
           en-US: Keyword
+          ja-JP: キーワード
     # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: http
     # the config content when protocol is http
@@ -329,6 +349,7 @@ metrics:
     i18n:
       zh-CN: 请求头
       en-US: Header
+      ja-JP: ヘッダ
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     priority: 1
@@ -340,11 +361,13 @@ metrics:
         i18n:
           zh-CN: Content Type
           en-US: Content Type
+          ja-JP: コンテンツタイプ
       - field: Content-Length
         type: 1
         i18n:
           zh-CN: 响应内容长度
           en-US: Content Length
+          ja-JP: コンテンツの長さ
     # the protocol used for monitoring, eg: sql, ssh, http, telnet, wmi, snmp, sdk
     protocol: http
     # the config content when protocol is http

hertzbeat-manager/src/main/resources/define/app-api_code.yml

@@ -21,11 +21,13 @@ app: api_code
 name:
   zh-CN: API业务状态码
   en-US: API Code
+  ja-JP: APIコード
 # The description and help of this monitoring type
 help:
   zh-CN: 监控 HTTP API 接口，对 API 返回的业务自定义状态码(非 Http 状态码)进行监控。此需通过配置 JsonPath 来解析您 API 的业务状态码路径。<br>您可以点击 “<i>新建 API Code</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: Monitor HTTP API to monitor business-defined status codes (non-HTTP status codes) returned by API. To do this, you need to configure JsonPath to resolve the business status code path of your API. <br>You could click the "<i>New API Codes</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: 監控 HTTP API 接口，對 API 返回的業務自定義狀態碼(非 Http 狀態碼)進行監控。此需通過配置 JsonPath 來解析您 API 的業務狀態碼路徑。<br>您可以點擊“<i>新建API Code</i>”並進行配寘，或者選擇“<i>更多操作</i>”，導入已有配寘。
+  ja-JP: 目標ホスト
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/api_code
   en-US: https://hertzbeat.apache.org/docs/help/api_code
@@ -37,6 +39,7 @@ params:
     name:
       zh-CN: 目标Host
       en-US: Target Host
+      ja-JP: 目標ホスト
     # type-param field type(most mapping the html input type)
     type: host
     # required-true or false
@@ -47,6 +50,7 @@ params:
     name:
       zh-CN: 端口
       en-US: Port
+      ja-JP: ポート
     # type-param field type(most mapping the html input type)
     type: number
     # when type is number, range is required
@@ -61,6 +65,7 @@ params:
     name:
       zh-CN: 请求方式
       en-US: Method
+      ja-JP: リクエストメソッド
     # type-param field type(most mapping the html input type)
     type: radio
     # required-true or false
@@ -81,6 +86,7 @@ params:
     name:
       zh-CN: 相对路径
       en-US: URI
+      ja-JP: URI
     # type-param field type(most mapping the html input type)
     type: text
     # when type is text, use limit to limit string length
@@ -95,6 +101,7 @@ params:
     name:
       zh-CN: 启用HTTPS
       en-US: HTTPS
+      ja-JP: HTTPS利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -105,6 +112,7 @@ params:
     name:
       zh-CN: 超时时间(ms)
       en-US: Timeout(ms)
+      ja-JP: タイムアウト（ｍｓ）
     # type-param field type(most mapping the html input type)
     type: number
     # required-true or false
@@ -117,6 +125,7 @@ params:
     name:
       zh-CN: JsonPath解析状态码路径
       en-US: JsonPath Parse Code
+      ja-JP: JsonPath 解析ステータスコード
     # type-param field type(most mapping the html input type)
     type: text
     # required-true or false
@@ -131,6 +140,7 @@ params:
     name:
       zh-CN: 请求Headers
       en-US: Headers
+      ja-JP: ヘッダ
     # type-param field type(most mapping the html input type)
     type: key-value
     # required-true or false
@@ -146,6 +156,7 @@ params:
     name:
       zh-CN: 查询Params
       en-US: Params
+      ja-JP: パラメータ
     # type-param field type(most mapping the html input type)
     type: key-value
     # required-true or false
@@ -162,6 +173,7 @@ params:
     name:
       zh-CN: Content-Type
       en-US: Content-Type
+      ja-JP: コンテンツタイプ
     # type-param field type(most mapping the html input type)
     type: text
     # param field input placeholder
@@ -176,6 +188,7 @@ params:
     name:
       zh-CN: 请求BODY
       en-US: BODY
+      ja-JP: ボディ
     # type-param field type(most mapping the html input type)
     type: textarea
     # param field input placeholder
@@ -195,6 +208,7 @@ params:
     name:
       zh-CN: 认证方式
       en-US: Auth Type
+      ja-JP: 認証方法
     # type-param field type(most mapping the html input type)
     type: radio
     # required-true or false
@@ -215,6 +229,7 @@ params:
     name:
       zh-CN: 用户名
       en-US: Username
+      ja-JP: ユーザー名
     # type-param field type(most mapping the html input type)
     type: text
     # when type is text, use limit to limit string length
@@ -229,6 +244,7 @@ params:
     name:
       zh-CN: 密码
       en-US: Password
+      ja-JP: パスワード
     # type-param field type(most mapping the html input type)
     type: password
     # required-true or false
@@ -241,6 +257,7 @@ params:
     name:
       zh-CN: 认证Token
       en-US: Access Token
+      ja-JP: アクセストークン
     # type-param field type(most mapping the html input type)
     type: text
     # required-true or false
@@ -253,6 +270,7 @@ params:
     name:
       zh-CN: 计数关键字
       en-US: Keyword
+      ja-JP: キーワード
     # type-param field type(most mapping the html input type)
     type: text
     # param field input placeholder
@@ -268,6 +286,7 @@ metrics:
     i18n:
       zh-CN: 状态
       en-US: Status
+      ja-JP: ステータス
     # metrics scheduling priority(0->127)->(high->low), metrics with the same priority will be scheduled in parallel
     # priority 0's metrics is availability metrics, it will be scheduled first, only availability metrics collect success will the scheduling continue
     priority: 0
@@ -279,11 +298,13 @@ metrics:
         i18n:
           zh-CN: 响应时间
           en-US: Response Time
+          ja-JP: 応答時間
       - field: code
         type: 1
         i18n:
           zh-CN: 业务状态码
           en-US: Status Code
+          ja-JP: ステータスコード
     aliasFields:
       - ^_^jsonPath^_^
       - responseTime

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/controller/MetricsDataController.java

@@ -17,8 +17,6 @@
 
 package org.apache.hertzbeat.warehouse.controller;
 
-import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE;
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -33,6 +31,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE;
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+
 /**
  * Indicator data query interface
  */
@@ -99,7 +100,9 @@ public class MetricsDataController {
         String app = names[0];
         String metrics = names[1];
         String metric = names[2];
+        
         MetricsHistoryData historyData = metricsDataService.getMetricHistoryData(monitorId, app, metrics, metric, label, history, interval);
         return ResponseEntity.ok(Message.success(historyData));
     }
+
 }

hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/vm/VictoriaMetricsDataStorage.java

@@ -361,7 +361,12 @@ public class VictoriaMetricsDataStorage extends AbstractHistoryDataStorage {
                         + SignConstants.BLANK + encodedAuth);
             }
             HttpEntity<Void> httpEntity = new HttpEntity<>(headers);
-            URI uri = UriComponentsBuilder.fromHttpUrl(victoriaMetricsProp.url() + QUERY_RANGE_PATH)
+            // Ensure victoriaMetricsProp.url() is a trusted base URL
+            String baseUrl = victoriaMetricsProp.url();
+            if (!isTrustedBaseUrl(baseUrl)) {
+                throw new IllegalStateException("Untrusted base URL: " + baseUrl);
+            }
+            URI uri = UriComponentsBuilder.fromHttpUrl(baseUrl + QUERY_RANGE_PATH)
                     .queryParam(URLEncoder.encode("query", StandardCharsets.UTF_8), URLEncoder.encode("{" + timeSeriesSelector + "}", StandardCharsets.UTF_8))
                     .queryParam("step", "4h")
                     .queryParam("start", startTime)
@@ -532,4 +537,9 @@ public class VictoriaMetricsDataStorage extends AbstractHistoryDataStorage {
          */
         private Long[] timestamps;
     }
+
+    private boolean isTrustedBaseUrl(String url) {
+        // Define a trusted base URL
+        return url.equals("http://trusted-victoriametrics-server.com");
+    }
 }

home/docs/community/contact.md

@@ -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)
 

home/docs/help/almalinux.md

@@ -9,40 +9,47 @@ keywords: [open-source monitoring system, open-source operating system monitorin
 
 ### Configuration Parameters
 
-|  Parameter Name   |                                                      Parameter Help Description                                                       |
-|-------------------|---------------------------------------------------------------------------------------------------------------------------------------|
-| Monitoring Host   | The monitored peer's IPv4, IPv6, or domain name. Note ⚠️ No protocol header (e.g., https://, http://).                                |
-| Task Name         | A unique name to identify this monitoring task.                                                                                       |
-| Port              | The port provided by Linux SSH, default is 22.                                                                                        |
-| Timeout           | Set the connection timeout in milliseconds, default is 6000 ms.                                                                       |
-| Connection Reuse  | Set whether to reuse SSH connections, default is false. If false, a new connection will be created for each retrieval of information. |
-| Username          | SSH connection username, optional.                                                                                                    |
-| Password          | SSH connection password, optional.                                                                                                    |
-| Collector         | Configure which collector to use for scheduling data collection for this monitoring.                                                  |
-| Monitoring Period | The interval time for periodic data collection, in seconds, with a minimum interval of 30 seconds.                                    |
-| Binding Tags      | Used for classifying and managing monitoring resources.                                                                               |
-| Description Note  | Additional notes to identify and describe this monitoring, where users can make notes.                                                |
-| Key               | The key required to connect to the server.                                                                                            |
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
 
 ### Data Collection Metrics
 
 #### Metric Set: Basic System Information
 
-|  Metric Name   | Metric Unit | Metric Help Description  |
-|----------------|-------------|--------------------------|
-| Host Name      | None        | Host name                |
-| System Version | None        | Operating system version |
-| Uptime         | None        | Uptime                   |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
 
 #### Metric Set: CPU Information
 
-|  Metric Name   | Metric Unit |      Metric Help Description      |
+| Metric Name    | Metric Unit | Metric Help Description           |
 |----------------|-------------|-----------------------------------|
 | info           | None        | CPU model                         |
-| cores          | Cores       | Number of CPU cores               |
-| interrupt      | Count       | Number of CPU interrupts          |
+| cores          | None        | Number of CPU cores               |
+| interrupt      | None        | Number of CPU interrupts          |
 | load           | None        | Average CPU load (1/5/15 minutes) |
-| context_switch | Count       | Number of context switches        |
+| context_switch | None        | Number of context switches        |
 | usage          | %           | CPU usage                         |
 
 #### Metric Set: Memory Information
@@ -58,13 +65,13 @@ keywords: [open-source monitoring system, open-source operating system monitorin
 
 #### Metric Set: Disk Information
 
-|  Metric Name  | Metric Unit |        Metric Help Description         |
+| Metric Name   | Metric Unit | Metric Help Description                |
 |---------------|-------------|----------------------------------------|
-| disk_num      | Count       | Total number of disks                  |
-| partition_num | Count       | Total number of partitions             |
-| block_write   | Blocks      | Total number of blocks written to disk |
-| block_read    | Blocks      | Total number of blocks read from disk  |
-| write_rate    | IOPS        | Disk block write rate per second       |
+| disk_num      | None        | Total number of disks                  |
+| partition_num | None        | Total number of partitions             |
+| block_write   | None        | Total number of blocks written to disk |
+| block_read    | None        | Total number of blocks read from disk  |
+| write_rate    | iops        | Disk block write rate per second       |
 
 #### Metric Set: Network Card Information
 
@@ -105,5 +112,3 @@ Statistics for the top 10 processes using memory. Statistics include: process ID
 | mem_usage   | %           | Memory usage            |
 | cpu_usage   | %           | CPU usage               |
 | command     | None        | Executed command        |
-
----

home/docs/help/centos.md

@@ -9,73 +9,106 @@ keywords: [open source monitoring tool, open source os monitoring tool, monitori
 
 ### Configuration parameter
 
-|   Parameter name    |                                                                        Parameter help description                                                                         |
-|---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Monitoring Host     | Monitored IPV4, IPV6 or domain name. Note⚠️Without protocol header (eg: https://, http://)                                                                                |
-| Monitoring name     | Identify the name of this monitoring. The name needs to be unique                                                                                                         |
-| Port                | Port provided by Linux SSH. The default is 22                                                                                                                             |
-| Username            | SSH connection user name, optional                                                                                                                                        |
-| Password            | SSH connection password, optional                                                                                                                                         |
-| Collection interval | Interval time of monitor periodic data collection, unit: second, and the minimum interval that can be set is 30 seconds                                                   |
-| Whether to detect   | Whether to detect and check the availability of monitoring before adding monitoring. Adding and modifying operations will continue only after the detection is successful |
-| Description remarks | For more information about identifying and describing this monitoring, users can note information here                                                                    |
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
 
-### Collection Metric
+### Data Collection Metrics
 
-#### Metric set：basic
+#### Metric Set: Basic System Information
 
-| Metric name | Metric unit | Metric help description  |
-|-------------|-------------|--------------------------|
-| hostname    | none        | Host name                |
-| version     | none        | Operating system version |
-| uptime      | none        | System running time      |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
 
-#### Metric set：cpu
+#### Metric Set: CPU Information
 
-|  Metric name   | Metric unit |            Metric help description             |
-|----------------|-------------|------------------------------------------------|
-| info           | none        | CPU model                                      |
-| cores          | cores       | Number of CPU cores                            |
-| interrupt      | number      | Number of CPU interrupts                       |
-| load           | none        | Average load of CPU in the last 1/5/15 minutes |
-| context_switch | number      | Number of current context switches             |
-| usage          | %           | CPU usage                                      |
+| Metric Name    | Metric Unit | Metric Help Description           |
+|----------------|-------------|-----------------------------------|
+| info           | None        | CPU model                         |
+| cores          | None        | Number of CPU cores               |
+| interrupt      | None        | Number of CPU interrupts          |
+| load           | None        | Average CPU load (1/5/15 minutes) |
+| context_switch | None        | Number of context switches        |
+| usage          | %           | CPU usage                         |
 
-#### Metric set：memory
+#### Metric Set: Memory Information
 
-| Metric name | Metric unit |       Metric help description       |
+| Metric Name | Metric Unit |       Metric Help Description       |
 |-------------|-------------|-------------------------------------|
 | total       | Mb          | Total memory capacity               |
-| used        | Mb          | User program memory                 |
+| used        | Mb          | Memory used by user programs        |
 | free        | Mb          | Free memory capacity                |
-| buff_cache  | Mb          | Memory occupied by cache            |
+| buff_cache  | Mb          | Memory used for cache               |
 | available   | Mb          | Remaining available memory capacity |
-| usage       | %           | Memory usage                        |
+| usage       | %           | Memory usage rate                   |
 
-#### Metric set：disk
+#### Metric Set: Disk Information
 
-|  Metric name  | Metric unit |        Metric help description         |
+| Metric Name   | Metric Unit | Metric Help Description                |
 |---------------|-------------|----------------------------------------|
-| disk_num      | blocks      | Total number of disks                  |
-| partition_num | partitions  | Total number of partitions             |
-| block_write   | blocks      | Total number of blocks written to disk |
-| block_read    | blocks      | Number of blocks read from disk        |
-| write_rate    | iops        | Rate of writing disk blocks per second |
+| disk_num      | None        | Total number of disks                  |
+| partition_num | None        | Total number of partitions             |
+| block_write   | None        | Total number of blocks written to disk |
+| block_read    | None        | Total number of blocks read from disk  |
+| write_rate    | iops        | Disk block write rate per second       |
 
-#### Metric set：interface
+#### Metric Set: Network Card Information
 
-|  Metric name   | Metric unit |   Metric help description    |
-|----------------|-------------|------------------------------|
-| interface_name | none        | Network card name            |
-| receive_bytes  | byte        | Inbound data traffic(bytes)  |
-| transmit_bytes | byte        | Outbound data traffic(bytes) |
+|  Metric Name   | Metric Unit |    Metric Help Description    |
+|----------------|-------------|-------------------------------|
+| interface_name | None        | Network card name             |
+| receive_bytes  | Byte        | Inbound data traffic (bytes)  |
+| transmit_bytes | Byte        | Outbound data traffic (bytes) |
 
-#### Metric set：disk_free
+#### Metric Set: File System
 
-| Metric name | Metric unit | Metric help description |
+| Metric Name | Metric Unit | Metric Help Description |
 |-------------|-------------|-------------------------|
-| filesystem  | none        | File system name        |
+| filesystem  | None        | Name of the file system |
 | used        | Mb          | Used disk size          |
 | available   | Mb          | Available disk size     |
-| usage       | %           | usage                   |
-| mounted     | none        | Mount point directory   |
+| usage       | %           | Usage rate              |
+| mounted     | None        | Mount point directory   |
+
+#### Metric Set: Top 10 CPU Processes
+
+Statistics for the top 10 processes using the CPU. Statistics include: process ID, CPU usage, memory usage, and executed command.
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| cpu_usage   | %           | CPU usage               |
+| mem_usage   | %           | Memory usage            |
+| command     | None        | Executed command        |
+
+#### Metric Set: Top 10 Memory Processes
+
+Statistics for the top 10 processes using memory. Statistics include: process ID, memory usage, CPU usage, and executed command.
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| mem_usage   | %           | Memory usage            |
+| cpu_usage   | %           | CPU usage               |
+| command     | None        | Executed command        |

home/docs/help/debian.md

@@ -9,89 +9,106 @@ keywords: [Open Source Monitoring System, Operating System Monitoring, Debian Mo
 
 ## Configuration Parameters
 
-|     Parameter Name      |                                              Metric help description                                              |
-|-------------------------|-------------------------------------------------------------------------------------------------------------------|
-| Target Host             | The monitored destination IPV4, IPV6, or domain name. Note: no protocol header (e.g., https://, http://).         |
-| Task Name               | A unique name to identify this monitoring task.                                                                   |
-| Port                    | SSH port of the Debian system, default: 22                                                                        |
-| Timeout                 | Timeout for the connection, in milliseconds, default: 6000 milliseconds.                                          |
-| Connection Reuse        | Whether to reuse the SSH connection, default: false. False means a new connection will be created for each query. |
-| Username                | Server username                                                                                                   |
-| Password                | Server password                                                                                                   |
-| Collector               | Configure which collector to use for scheduling this monitoring.                                                  |
-| Monitoring Period       | The interval for periodically collecting data, in seconds, with a minimum interval of 30 seconds.                 |
-| Binding Tags            | Used for categorizing and managing monitoring resources.                                                          |
-| Metric help description | Additional notes and Metric help descriptions for this monitoring, users can add notes here.                      |
-| Key                     | Key required to connect to the server.                                                                            |
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
 
-### Monitoring Metrics
+### Data Collection Metrics
 
 #### Metric Set: Basic System Information
 
-|  Metric Name   | Metric Unit | Metric help description  |
-|----------------|-------------|--------------------------|
-| Host Name      | N/A         | Host name                |
-| System Version | N/A         | Operating system version |
-| Uptime         | N/A         | Boot time                |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
 
 #### Metric Set: CPU Information
 
-|  Metric Name   | Metric Unit | Metric help description |
-|----------------|-------------|-------------------------|
-| Info           | N/A         | Model                   |
-| Cores          | N/A         | Number of cores         |
-| Interrupt      | N/A         | Number of interrupts    |
-| Load           | N/A         | Load                    |
-| Context Switch | N/A         | Context switches        |
-| Usage          | %           | Usage rate              |
+| Metric Name    | Metric Unit | Metric Help Description           |
+|----------------|-------------|-----------------------------------|
+| info           | None        | CPU model                         |
+| cores          | None        | Number of CPU cores               |
+| interrupt      | None        | Number of CPU interrupts          |
+| load           | None        | Average CPU load (1/5/15 minutes) |
+| context_switch | None        | Number of context switches        |
+| usage          | %           | CPU usage                         |
 
 #### Metric Set: Memory Information
 
-|     Metric Name     | Metric Unit |   Metric help description    |
-|---------------------|-------------|------------------------------|
-| Total Memory        | Mb          | Total memory capacity        |
-| User Program Memory | Mb          | Memory used by user programs |
-| Free Memory         | Mb          | Free memory capacity         |
-| Buff Cache Memory   | Mb          | Memory used by cache         |
-| Available Memory    | Mb          | Available memory             |
-| Memory Usage        | %           | Memory usage rate            |
+| Metric Name | Metric Unit |       Metric Help Description       |
+|-------------|-------------|-------------------------------------|
+| total       | Mb          | Total memory capacity               |
+| used        | Mb          | Memory used by user programs        |
+| free        | Mb          | Free memory capacity                |
+| buff_cache  | Mb          | Memory used for cache               |
+| available   | Mb          | Remaining available memory capacity |
+| usage       | %           | Memory usage rate                   |
 
 #### Metric Set: Disk Information
 
-|  Metric Name  | Metric Unit |    Metric help description    |
-|---------------|-------------|-------------------------------|
-| Disk Num      | N/A         | Total number of disks         |
-| Partition Num | N/A         | Total number of partitions    |
-| Block Write   | N/A         | Number of disk blocks written |
-| Block Read    | N/A         | Number of disk blocks read    |
-| Write Rate    | iops        | Disk write rate               |
+| Metric Name   | Metric Unit | Metric Help Description                |
+|---------------|-------------|----------------------------------------|
+| disk_num      | None        | Total number of disks                  |
+| partition_num | None        | Total number of partitions             |
+| block_write   | None        | Total number of blocks written to disk |
+| block_read    | None        | Total number of blocks read from disk  |
+| write_rate    | iops        | Disk block write rate per second       |
 
-#### Metric Set: Network Interface Information
+#### Metric Set: Network Card Information
 
-Statistics for all network interface cards, including interface name, incoming data traffic, and outgoing data traffic.
-Metric Unit: Mb
+|  Metric Name   | Metric Unit |    Metric Help Description    |
+|----------------|-------------|-------------------------------|
+| interface_name | None        | Network card name             |
+| receive_bytes  | Byte        | Inbound data traffic (bytes)  |
+| transmit_bytes | Byte        | Outbound data traffic (bytes) |
 
 #### Metric Set: File System
 
-Statistics for all mounted file systems. Statistics include: file system, usage, available space, usage rate, mount point.
-Metric Unit:
-
-- Usage: Mb
-- Available Space: Mb
-- Usage Rate: %
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| filesystem  | None        | Name of the file system |
+| used        | Mb          | Used disk size          |
+| available   | Mb          | Available disk size     |
+| usage       | %           | Usage rate              |
+| mounted     | None        | Mount point directory   |
 
 #### Metric Set: Top 10 CPU Processes
 
-Statistics for the top 10 processes by CPU usage. Statistics include: process ID, CPU usage rate, memory usage rate, command being executed.
-Metric Unit:
+Statistics for the top 10 processes using the CPU. Statistics include: process ID, CPU usage, memory usage, and executed command.
 
-- CPU Usage Rate: %
-- Memory Usage Rate: %
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| cpu_usage   | %           | CPU usage               |
+| mem_usage   | %           | Memory usage            |
+| command     | None        | Executed command        |
 
 #### Metric Set: Top 10 Memory Processes
 
-Statistics for the top 10 processes by memory usage. Statistics include: process ID, memory usage rate, CPU usage rate, command being executed.
-Metric Unit:
+Statistics for the top 10 processes using memory. Statistics include: process ID, memory usage, CPU usage, and executed command.
 
-- Memory Usage Rate: %
-- CPU Usage Rate: %
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| mem_usage   | %           | Memory usage            |
+| cpu_usage   | %           | CPU usage               |
+| command     | None        | Executed command        |

home/docs/help/euleros.md

@@ -9,97 +9,104 @@ keywords: [ Open Source Monitoring System, Open Source OS Monitoring, EulerOS Mo
 
 ### Configuration Parameters
 
-|   Parameter Name    |                                                    Parameter help description                                                    |
-|---------------------|----------------------------------------------------------------------------------------------------------------------------------|
-| Monitoring Host     | The IP, IPV6, or domain name of the monitored endpoint. Note ⚠️: Do not include protocol headers (eg: https://, http://).        |
-| Task Name           | Identifies the name of this monitoring, ensuring uniqueness.                                                                     |
-| Port                | Port provided by Linux SSH externally, defaults to 22.                                                                           |
-| Timeout             | Sets the timeout for connection in milliseconds (ms), defaults to 6000 ms.                                                       |
-| Connection Reuse    | Sets whether the SSH connection is reused, defaults to: false. Creates a new connection for each information retrieval if false. |
-| Username            | SSH connection username, optional.                                                                                               |
-| Password            | SSH connection password, optional.                                                                                               |
-| Collector           | Specifies which collector schedules the collection for this monitoring.                                                          |
-| Monitoring Interval | Interval for periodically collecting data, in seconds. Minimum interval is 30 seconds.                                           |
-| Binding Tags        | Used for categorizing and managing monitored resources.                                                                          |
-| Description         | Additional remarks and descriptions for this monitoring, for users' reference.                                                   |
-| PrivateKey          | Key required for connecting to the server.                                                                                       |
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
 
-### Collected Metrics
+### Data Collection Metrics
 
-#### Metric Set: Basic Info
+#### Metric Set: Basic System Information
 
-|  Metric Name   | Metric Unit |  Metric help description  |
-|----------------|-------------|---------------------------|
-| Host Name      | None        | Host name.                |
-| System Version | None        | Operating system version. |
-| Uptime         | None        | System uptime.            |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
 
-#### Metric Set: CPU Info
+#### Metric Set: CPU Information
 
-|  Metric Name   | Metric Unit |          Metric help description          |
-|----------------|-------------|-------------------------------------------|
-| info           | None        | CPU model.                                |
-| cores          | None        | Number of CPU cores.                      |
-| interrupt      | None        | Number of CPU interrupts.                 |
-| load           | None        | Average load for the last 1/5/15 minutes. |
-| context_switch | None        | Current context switches.                 |
-| usage          | %           | CPU usage percentage.                     |
+| Metric Name    | Metric Unit | Metric Help Description           |
+|----------------|-------------|-----------------------------------|
+| info           | None        | CPU model                         |
+| cores          | None        | Number of CPU cores               |
+| interrupt      | None        | Number of CPU interrupts          |
+| load           | None        | Average CPU load (1/5/15 minutes) |
+| context_switch | None        | Number of context switches        |
+| usage          | %           | CPU usage                         |
 
-#### Metric Set: Memory Info
+#### Metric Set: Memory Information
 
-| Metric Name | Metric Unit |      Metric help description       |
-|-------------|-------------|------------------------------------|
-| total       | Mb          | Total memory capacity.             |
-| used        | Mb          | Used memory by user programs.      |
-| free        | Mb          | Free memory capacity.              |
-| buff_cache  | Mb          | Memory used for buffers and cache. |
-| available   | Mb          | Available memory capacity.         |
-| usage       | %           | Memory usage percentage.           |
+| Metric Name | Metric Unit |       Metric Help Description       |
+|-------------|-------------|-------------------------------------|
+| total       | Mb          | Total memory capacity               |
+| used        | Mb          | Memory used by user programs        |
+| free        | Mb          | Free memory capacity                |
+| buff_cache  | Mb          | Memory used for cache               |
+| available   | Mb          | Remaining available memory capacity |
+| usage       | %           | Memory usage rate                   |
 
-#### Metric Set: Disk Info
+#### Metric Set: Disk Information
 
-|  Metric Name  | Metric Unit |      Metric help description       |
-|---------------|-------------|------------------------------------|
-| disk_num      | None        | Total number of disks.             |
-| partition_num | None        | Total number of partitions.        |
-| block_write   | None        | Total blocks written to disk.      |
-| block_read    | None        | Total blocks read from disk.       |
-| write_rate    | iops        | Rate of blocks written per second. |
+| Metric Name   | Metric Unit | Metric Help Description                |
+|---------------|-------------|----------------------------------------|
+| disk_num      | None        | Total number of disks                  |
+| partition_num | None        | Total number of partitions             |
+| block_write   | None        | Total number of blocks written to disk |
+| block_read    | None        | Total number of blocks read from disk  |
+| write_rate    | iops        | Disk block write rate per second       |
 
-#### Metric Set: Interface Info
+#### Metric Set: Network Card Information
 
-|  Metric Name   | Metric Unit |    Metric help description     |
-|----------------|-------------|--------------------------------|
-| interface_name | None        | Name of the network interface. |
-| receive_bytes  | Mb          | Inbound data traffic.          |
-| transmit_bytes | Mb          | Outbound data traffic.         |
+|  Metric Name   | Metric Unit |    Metric Help Description    |
+|----------------|-------------|-------------------------------|
+| interface_name | None        | Network card name             |
+| receive_bytes  | Byte        | Inbound data traffic (bytes)  |
+| transmit_bytes | Byte        | Outbound data traffic (bytes) |
 
-#### Metric Set: Disk Free
+#### Metric Set: File System
 
-| Metric Name | Metric Unit | Metric help description  |
-|-------------|-------------|--------------------------|
-| filesystem  | None        | Name of the file system. |
-| used        | Mb          | Used disk space.         |
-| available   | Mb          | Available disk space.    |
-| usage       | %           | Disk usage percentage.   |
-| mounted     | None        | Mount point directory.   |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| filesystem  | None        | Name of the file system |
+| used        | Mb          | Used disk size          |
+| available   | Mb          | Available disk size     |
+| usage       | %           | Usage rate              |
+| mounted     | None        | Mount point directory   |
 
-#### Metric Set: Top10 CPU Process
+#### Metric Set: Top 10 CPU Processes
 
-Top 10 processes consuming CPU. Metrics include: Process ID, CPU usage, Memory usage, Command.
+Statistics for the top 10 processes using the CPU. Statistics include: process ID, CPU usage, memory usage, and executed command.
 
-| Metric Name | Metric Unit | Metric help description |
+| Metric Name | Metric Unit | Metric Help Description |
 |-------------|-------------|-------------------------|
 | pid         | None        | Process ID              |
 | cpu_usage   | %           | CPU usage               |
 | mem_usage   | %           | Memory usage            |
 | command     | None        | Executed command        |
 
-#### Metric Set: Top10 Memory Process
+#### Metric Set: Top 10 Memory Processes
 
-Top 10 processes consuming memory. Metrics include: Process ID, Memory usage, CPU usage, Command.
+Statistics for the top 10 processes using memory. Statistics include: process ID, memory usage, CPU usage, and executed command.
 
-| Metric Name | Metric Unit | Metric help description |
+| Metric Name | Metric Unit | Metric Help Description |
 |-------------|-------------|-------------------------|
 | pid         | None        | Process ID              |
 | mem_usage   | %           | Memory usage            |

home/docs/help/fedora.md

@@ -0,0 +1,114 @@
+---
+id: fedora
+title: Monitoring Fedora Operating System
+sidebar_label: Fedora OS Operating System
+keywords: [ Open Source Monitoring System, Open Source OS Monitoring, Fedora OS Monitoring ]
+---
+
+> Collect and monitor general performance metrics for Fedora operating systems (system information, CPU, memory, disk, network interface, file system, top resource processes, etc.).
+
+### Configuration Parameters
+
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
+
+### Data Collection Metrics
+
+#### Metric Set: Basic System Information
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
+
+#### Metric Set: CPU Information
+
+| Metric Name    | Metric Unit | Metric Help Description           |
+|----------------|-------------|-----------------------------------|
+| info           | None        | CPU model                         |
+| cores          | None        | Number of CPU cores               |
+| interrupt      | None        | Number of CPU interrupts          |
+| load           | None        | Average CPU load (1/5/15 minutes) |
+| context_switch | None        | Number of context switches        |
+| usage          | %           | CPU usage                         |
+
+#### Metric Set: Memory Information
+
+| Metric Name | Metric Unit |       Metric Help Description       |
+|-------------|-------------|-------------------------------------|
+| total       | Mb          | Total memory capacity               |
+| used        | Mb          | Memory used by user programs        |
+| free        | Mb          | Free memory capacity                |
+| buff_cache  | Mb          | Memory used for cache               |
+| available   | Mb          | Remaining available memory capacity |
+| usage       | %           | Memory usage rate                   |
+
+#### Metric Set: Disk Information
+
+| Metric Name   | Metric Unit | Metric Help Description                |
+|---------------|-------------|----------------------------------------|
+| disk_num      | None        | Total number of disks                  |
+| partition_num | None        | Total number of partitions             |
+| block_write   | None        | Total number of blocks written to disk |
+| block_read    | None        | Total number of blocks read from disk  |
+| write_rate    | iops        | Disk block write rate per second       |
+
+#### Metric Set: Network Card Information
+
+|  Metric Name   | Metric Unit |    Metric Help Description    |
+|----------------|-------------|-------------------------------|
+| interface_name | None        | Network card name             |
+| receive_bytes  | Byte        | Inbound data traffic (bytes)  |
+| transmit_bytes | Byte        | Outbound data traffic (bytes) |
+
+#### Metric Set: File System
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| filesystem  | None        | Name of the file system |
+| used        | Mb          | Used disk size          |
+| available   | Mb          | Available disk size     |
+| usage       | %           | Usage rate              |
+| mounted     | None        | Mount point directory   |
+
+#### Metric Set: Top 10 CPU Processes
+
+Statistics for the top 10 processes using the CPU. Statistics include: process ID, CPU usage, memory usage, and executed command.
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| cpu_usage   | %           | CPU usage               |
+| mem_usage   | %           | Memory usage            |
+| command     | None        | Executed command        |
+
+#### Metric Set: Top 10 Memory Processes
+
+Statistics for the top 10 processes using memory. Statistics include: process ID, memory usage, CPU usage, and executed command.
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| mem_usage   | %           | Memory usage            |
+| cpu_usage   | %           | CPU usage               |
+| command     | None        | Executed command        |

home/docs/help/freebsd.md

@@ -9,40 +9,47 @@ keywords: [ Open Source Monitoring System, Open Source Operating System Monitori
 
 ### Configuration Parameters
 
-|   Parameter Name    |                                                  Parameter help description                                                  |
-|---------------------|------------------------------------------------------------------------------------------------------------------------------|
-| Monitoring Host     | The IPv4, IPv6, or domain name of the monitored peer. Note ⚠️ without the protocol header (eg: https://, http://).           |
-| Task Name           | Identifies the name of this monitor, ensuring uniqueness of the name.                                                        |
-| Port                | The port where SSH for Linux is exposed, default is 22.                                                                      |
-| Timeout             | Set the connection timeout, in milliseconds, default is 6000 milliseconds.                                                   |
-| Reuse Connection    | Set whether SSH connections are reused, default is: false. If false, a connection is created for each information retrieval. |
-| Username            | SSH connection username, optional.                                                                                           |
-| Password            | SSH connection password, optional.                                                                                           |
-| Collector           | Configure which collector to use for scheduling collection for this monitor.                                                 |
-| Monitoring Interval | Interval for periodically collecting data, in seconds. The minimum interval that can be set is 30 seconds.                   |
-| Bind Labels         | Used to categorize and manage monitored resources.                                                                           |
-| Description         | Additional information for identifying and describing this monitor. Users can add remarks here.                              |
-| PrivateKey          | Private key required to connect to the server.                                                                               |
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
 
 ### Collection Metrics
 
 #### Metric Set: Basic Info
 
-|  Metric Name   | Metric Unit | Metric help description  |
-|----------------|-------------|--------------------------|
-| Host Name      | None        | Host name                |
-| System Version | None        | Operating system version |
-| Uptime         | None        | System uptime            |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
 
 #### Metric Set: CPU Info
 
 |  Metric Name   | Metric Unit |           Metric help description            |
 |----------------|-------------|----------------------------------------------|
 | info           | None        | CPU model                                    |
-| cores          | Number      | Number of CPU cores                          |
-| interrupt      | Number      | Number of CPU interrupts                     |
+| cores          | None        | Number of CPU cores                          |
+| interrupt      | None        | Number of CPU interrupts                     |
 | load           | None        | Average CPU load for the last 1/5/15 minutes |
-| context_switch | Number      | Current context switches                     |
+| context_switch | None        | Current context switches                     |
 | usage          | %           | CPU usage                                    |
 
 #### Metric Set: Memory Info

home/docs/help/linux.md

@@ -9,73 +9,106 @@ keywords: [open source monitoring tool, open source linux monitoring tool, monit
 
 ### Configuration parameter
 
-|   Parameter name    |                                                                        Parameter help description                                                                         |
-|---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Monitoring Host     | Monitored IPV4, IPV6 or domain name. Note⚠️Without protocol header (eg: https://, http://)                                                                                |
-| Monitoring name     | Identify the name of this monitoring. The name needs to be unique                                                                                                         |
-| Port                | Port provided by Linux SSH. The default is 22                                                                                                                             |
-| Username            | SSH connection user name, optional                                                                                                                                        |
-| Password            | SSH connection password, optional                                                                                                                                         |
-| Collection interval | Interval time of monitor periodic data collection, unit: second, and the minimum interval that can be set is 30 seconds                                                   |
-| Whether to detect   | Whether to detect and check the availability of monitoring before adding monitoring. Adding and modifying operations will continue only after the detection is successful |
-| Description remarks | For more information about identifying and describing this monitoring, users can note information here                                                                    |
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
 
-### Collection Metric
+### Data Collection Metrics
 
-#### Metric set：basic
+#### Metric Set: Basic System Information
 
-| Metric name | Metric unit | Metric help description  |
-|-------------|-------------|--------------------------|
-| hostname    | none        | Host name                |
-| version     | none        | Operating system version |
-| uptime      | none        | System running time      |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
 
-#### Metric set：cpu
+#### Metric Set: CPU Information
 
-|  Metric name   | Metric unit |            Metric help description             |
-|----------------|-------------|------------------------------------------------|
-| info           | none        | CPU model                                      |
-| cores          | cores       | Number of CPU cores                            |
-| interrupt      | number      | Number of CPU interrupts                       |
-| load           | none        | Average load of CPU in the last 1/5/15 minutes |
-| context_switch | number      | Number of current context switches             |
-| usage          | %           | CPU usage                                      |
+| Metric Name    | Metric Unit | Metric Help Description           |
+|----------------|-------------|-----------------------------------|
+| info           | None        | CPU model                         |
+| cores          | None        | Number of CPU cores               |
+| interrupt      | None        | Number of CPU interrupts          |
+| load           | None        | Average CPU load (1/5/15 minutes) |
+| context_switch | None        | Number of context switches        |
+| usage          | %           | CPU usage                         |
 
-#### Metric set：memory
+#### Metric Set: Memory Information
 
-| Metric name | Metric unit |       Metric help description       |
+| Metric Name | Metric Unit |       Metric Help Description       |
 |-------------|-------------|-------------------------------------|
 | total       | Mb          | Total memory capacity               |
-| used        | Mb          | User program memory                 |
+| used        | Mb          | Memory used by user programs        |
 | free        | Mb          | Free memory capacity                |
-| buff_cache  | Mb          | Memory occupied by cache            |
+| buff_cache  | Mb          | Memory used for cache               |
 | available   | Mb          | Remaining available memory capacity |
-| usage       | %           | Memory usage                        |
+| usage       | %           | Memory usage rate                   |
 
-#### Metric set：disk
+#### Metric Set: Disk Information
 
-|  Metric name  | Metric unit |        Metric help description         |
+| Metric Name   | Metric Unit | Metric Help Description                |
 |---------------|-------------|----------------------------------------|
-| disk_num      | blocks      | Total number of disks                  |
-| partition_num | partitions  | Total number of partitions             |
-| block_write   | blocks      | Total number of blocks written to disk |
-| block_read    | blocks      | Number of blocks read from disk        |
-| write_rate    | iops        | Rate of writing disk blocks per second |
+| disk_num      | None        | Total number of disks                  |
+| partition_num | None        | Total number of partitions             |
+| block_write   | None        | Total number of blocks written to disk |
+| block_read    | None        | Total number of blocks read from disk  |
+| write_rate    | iops        | Disk block write rate per second       |
 
-#### Metric set：interface
+#### Metric Set: Network Card Information
 
-|  Metric name   | Metric unit |   Metric help description    |
-|----------------|-------------|------------------------------|
-| interface_name | none        | Network card name            |
-| receive_bytes  | byte        | Inbound data traffic(bytes)  |
-| transmit_bytes | byte        | Outbound data traffic(bytes) |
+|  Metric Name   | Metric Unit |    Metric Help Description    |
+|----------------|-------------|-------------------------------|
+| interface_name | None        | Network card name             |
+| receive_bytes  | Byte        | Inbound data traffic (bytes)  |
+| transmit_bytes | Byte        | Outbound data traffic (bytes) |
 
-#### Metric set：disk_free
+#### Metric Set: File System
 
-| Metric name | Metric unit | Metric help description |
+| Metric Name | Metric Unit | Metric Help Description |
 |-------------|-------------|-------------------------|
-| filesystem  | none        | File system name        |
+| filesystem  | None        | Name of the file system |
 | used        | Mb          | Used disk size          |
 | available   | Mb          | Available disk size     |
-| usage       | %           | usage                   |
-| mounted     | none        | Mount point directory   |
+| usage       | %           | Usage rate              |
+| mounted     | None        | Mount point directory   |
+
+#### Metric Set: Top 10 CPU Processes
+
+Statistics for the top 10 processes using the CPU. Statistics include: process ID, CPU usage, memory usage, and executed command.
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| cpu_usage   | %           | CPU usage               |
+| mem_usage   | %           | Memory usage            |
+| command     | None        | Executed command        |
+
+#### Metric Set: Top 10 Memory Processes
+
+Statistics for the top 10 processes using memory. Statistics include: process ID, memory usage, CPU usage, and executed command.
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| mem_usage   | %           | Memory usage            |
+| cpu_usage   | %           | CPU usage               |
+| command     | None        | Executed command        |

home/docs/help/opensuse.md

@@ -9,99 +9,106 @@ keywords: [open source monitoring system, open source operating system monitorin
 
 ### Configuration Parameters
 
-|  Parameter Name   |                                                      Parameter Help Description                                                       |
-|-------------------|---------------------------------------------------------------------------------------------------------------------------------------|
-| Monitored Host    | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                     |
-| Task Name         | The name that identifies this monitoring, which must be unique.                                                                       |
-| Port              | The port provided by Linux SSH, default is 22.                                                                                        |
-| Timeout           | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                      |
-| Connection Reuse  | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved. |
-| Username          | SSH connection username, optional.                                                                                                    |
-| Password          | SSH connection password, optional.                                                                                                    |
-| Collector         | Configures which collector is used to schedule data collection for this monitoring.                                                   |
-| Monitoring Period | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                     |
-| Binding Tags      | Used for categorized management of monitoring resources.                                                                              |
-| Description       | Additional notes and descriptions for this monitoring, where users can make notes.                                                    |
-| Key               | The key required to connect to the server.                                                                                            |
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
 
-### Collection Metrics
+### Data Collection Metrics
 
-#### Metric Set: System Basic Information
+#### Metric Set: Basic System Information
 
-|  Metric Name   | Unit | Metric Help Description  |
-|----------------|------|--------------------------|
-| Host Name      | None | Host name                |
-| System Version | None | Operating system version |
-| Uptime         | None | Uptime                   |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
 
 #### Metric Set: CPU Information
 
-|  Metric Name   | Unit  |            Metric Help Description            |
-|----------------|-------|-----------------------------------------------|
-| info           | None  | CPU model                                     |
-| cores          | Cores | Number of CPU cores                           |
-| interrupt      | Count | Number of CPU interrupts                      |
-| load           | None  | Average CPU load over the last 1/5/15 minutes |
-| context_switch | Count | Number of context switches                    |
-| usage          | %     | CPU usage rate                                |
+| Metric Name    | Metric Unit | Metric Help Description           |
+|----------------|-------------|-----------------------------------|
+| info           | None        | CPU model                         |
+| cores          | None        | Number of CPU cores               |
+| interrupt      | None        | Number of CPU interrupts          |
+| load           | None        | Average CPU load (1/5/15 minutes) |
+| context_switch | None        | Number of context switches        |
+| usage          | %           | CPU usage                         |
 
 #### Metric Set: Memory Information
 
-| Metric Name | Unit |       Metric Help Description       |
-|-------------|------|-------------------------------------|
-| total       | Mb   | Total memory capacity               |
-| used        | Mb   | Memory used by user programs        |
-| free        | Mb   | Free memory capacity                |
-| buff_cache  | Mb   | Memory used for cache               |
-| available   | Mb   | Remaining available memory capacity |
-| usage       | %    | Memory usage rate                   |
+| Metric Name | Metric Unit |       Metric Help Description       |
+|-------------|-------------|-------------------------------------|
+| total       | Mb          | Total memory capacity               |
+| used        | Mb          | Memory used by user programs        |
+| free        | Mb          | Free memory capacity                |
+| buff_cache  | Mb          | Memory used for cache               |
+| available   | Mb          | Remaining available memory capacity |
+| usage       | %           | Memory usage rate                   |
 
 #### Metric Set: Disk Information
 
-|  Metric Name  | Unit  |        Metric Help Description         |
-|---------------|-------|----------------------------------------|
-| disk_num      | Count | Total number of disks                  |
-| partition_num | Count | Total number of partitions             |
-| block_write   | Count | Total number of blocks written to disk |
-| block_read    | Count | Total number of blocks read from disk  |
-| write_rate    | iops  | Disk block write rate per second       |
+| Metric Name   | Metric Unit | Metric Help Description                |
+|---------------|-------------|----------------------------------------|
+| disk_num      | None        | Total number of disks                  |
+| partition_num | None        | Total number of partitions             |
+| block_write   | None        | Total number of blocks written to disk |
+| block_read    | None        | Total number of blocks read from disk  |
+| write_rate    | iops        | Disk block write rate per second       |
 
 #### Metric Set: Network Card Information
 
-|  Metric Name   | Unit | Metric Help Description |
-|----------------|------|-------------------------|
-| interface_name | None | Network card name       |
-| receive_bytes  | Mb   | Inbound data traffic    |
-| transmit_bytes | Mb   | Outbound data traffic   |
+|  Metric Name   | Metric Unit |    Metric Help Description    |
+|----------------|-------------|-------------------------------|
+| interface_name | None        | Network card name             |
+| receive_bytes  | Byte        | Inbound data traffic (bytes)  |
+| transmit_bytes | Byte        | Outbound data traffic (bytes) |
 
 #### Metric Set: File System
 
-| Metric Name | Unit | Metric Help Description |
-|-------------|------|-------------------------|
-| filesystem  | None | Name of the file system |
-| used        | Mb   | Used disk size          |
-| available   | Mb   | Available disk size     |
-| usage       | %    | Usage rate              |
-| mounted     | None | Mount point directory   |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| filesystem  | None        | Name of the file system |
+| used        | Mb          | Used disk size          |
+| available   | Mb          | Available disk size     |
+| usage       | %           | Usage rate              |
+| mounted     | None        | Mount point directory   |
 
 #### Metric Set: Top 10 CPU Processes
 
-Statistics for the top 10 processes using the CPU. Statistics include: Process ID, CPU usage, memory usage, executed command.
+Statistics for the top 10 processes using the CPU. Statistics include: process ID, CPU usage, memory usage, and executed command.
 
-| Metric Name | Unit | Metric Help Description |
-|-------------|------|-------------------------|
-| pid         | None | Process ID              |
-| cpu_usage   | %    | CPU usage rate          |
-| mem_usage   | %    | Memory usage rate       |
-| command     | None | Executed command        |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| cpu_usage   | %           | CPU usage               |
+| mem_usage   | %           | Memory usage            |
+| command     | None        | Executed command        |
 
 #### Metric Set: Top 10 Memory Processes
 
-Statistics for the top 10 processes using memory. Statistics include: Process ID, memory usage, CPU usage, executed command.
+Statistics for the top 10 processes using memory. Statistics include: process ID, memory usage, CPU usage, and executed command.
 
-| Metric Name | Unit | Metric Help Description |
-|-------------|------|-------------------------|
-| pid         | None | Process ID              |
-| mem_usage   | %    | Memory usage rate       |
-| cpu_usage   | %    | CPU usage rate          |
-| command     | None | Executed command        |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| mem_usage   | %           | Memory usage            |
+| cpu_usage   | %           | CPU usage               |
+| command     | None        | Executed command        |

home/docs/help/redhat.md

@@ -9,97 +9,104 @@ keywords: [ Open Source Monitoring System, Open Source OS Monitoring, RedHat OS
 
 ### Configuration Parameters
 
-|   Parameter Name    |                                                    Parameter help description                                                    |
-|---------------------|----------------------------------------------------------------------------------------------------------------------------------|
-| Monitoring Host     | The IP, IPV6, or domain name of the monitored endpoint. Note ⚠️: Do not include protocol headers (eg: https://, http://).        |
-| Task Name           | Identifies the name of this monitoring, ensuring uniqueness.                                                                     |
-| Port                | Port provided by Linux SSH externally, defaults to 22.                                                                           |
-| Timeout             | Sets the timeout for connection in milliseconds (ms), defaults to 6000 ms.                                                       |
-| Connection Reuse    | Sets whether the SSH connection is reused, defaults to: false. Creates a new connection for each information retrieval if false. |
-| Username            | SSH connection username, optional.                                                                                               |
-| Password            | SSH connection password, optional.                                                                                               |
-| Collector           | Specifies which collector schedules the collection for this monitoring.                                                          |
-| Monitoring Interval | Interval for periodically collecting data, in seconds. Minimum interval is 30 seconds.                                           |
-| Binding Tags        | Used for categorizing and managing monitored resources.                                                                          |
-| Description         | Additional remarks and descriptions for this monitoring, for users' reference.                                                   |
-| PrivateKey          | Key required for connecting to the server.                                                                                       |
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
 
-### Collected Metrics
+### Data Collection Metrics
 
-#### Metric Set: Basic Info
+#### Metric Set: Basic System Information
 
-|  Metric Name   | Metric Unit |  Metric help description  |
-|----------------|-------------|---------------------------|
-| Host Name      | None        | Host name.                |
-| System Version | None        | Operating system version. |
-| Uptime         | None        | System uptime.            |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
 
-#### Metric Set: CPU Info
+#### Metric Set: CPU Information
 
-|  Metric Name   | Metric Unit |          Metric help description          |
-|----------------|-------------|-------------------------------------------|
-| info           | None        | CPU model.                                |
-| cores          | None        | Number of CPU cores.                      |
-| interrupt      | None        | Number of CPU interrupts.                 |
-| load           | None        | Average load for the last 1/5/15 minutes. |
-| context_switch | None        | Current context switches.                 |
-| usage          | %           | CPU usage percentage.                     |
+| Metric Name    | Metric Unit | Metric Help Description           |
+|----------------|-------------|-----------------------------------|
+| info           | None        | CPU model                         |
+| cores          | None        | Number of CPU cores               |
+| interrupt      | None        | Number of CPU interrupts          |
+| load           | None        | Average CPU load (1/5/15 minutes) |
+| context_switch | None        | Number of context switches        |
+| usage          | %           | CPU usage                         |
 
-#### Metric Set: Memory Info
+#### Metric Set: Memory Information
 
-| Metric Name | Metric Unit |      Metric help description       |
-|-------------|-------------|------------------------------------|
-| total       | Mb          | Total memory capacity.             |
-| used        | Mb          | Used memory by user programs.      |
-| free        | Mb          | Free memory capacity.              |
-| buff_cache  | Mb          | Memory used for buffers and cache. |
-| available   | Mb          | Available memory capacity.         |
-| usage       | %           | Memory usage percentage.           |
+| Metric Name | Metric Unit |       Metric Help Description       |
+|-------------|-------------|-------------------------------------|
+| total       | Mb          | Total memory capacity               |
+| used        | Mb          | Memory used by user programs        |
+| free        | Mb          | Free memory capacity                |
+| buff_cache  | Mb          | Memory used for cache               |
+| available   | Mb          | Remaining available memory capacity |
+| usage       | %           | Memory usage rate                   |
 
-#### Metric Set: Disk Info
+#### Metric Set: Disk Information
 
-|  Metric Name  | Metric Unit |      Metric help description       |
-|---------------|-------------|------------------------------------|
-| disk_num      | None        | Total number of disks.             |
-| partition_num | None        | Total number of partitions.        |
-| block_write   | None        | Total blocks written to disk.      |
-| block_read    | None        | Total blocks read from disk.       |
-| write_rate    | iops        | Rate of blocks written per second. |
+| Metric Name   | Metric Unit | Metric Help Description                |
+|---------------|-------------|----------------------------------------|
+| disk_num      | None        | Total number of disks                  |
+| partition_num | None        | Total number of partitions             |
+| block_write   | None        | Total number of blocks written to disk |
+| block_read    | None        | Total number of blocks read from disk  |
+| write_rate    | iops        | Disk block write rate per second       |
 
-#### Metric Set: Interface Info
+#### Metric Set: Network Card Information
 
-|  Metric Name   | Metric Unit |    Metric help description     |
-|----------------|-------------|--------------------------------|
-| interface_name | None        | Name of the network interface. |
-| receive_bytes  | Mb          | Inbound data traffic.          |
-| transmit_bytes | Mb          | Outbound data traffic.         |
+|  Metric Name   | Metric Unit |    Metric Help Description    |
+|----------------|-------------|-------------------------------|
+| interface_name | None        | Network card name             |
+| receive_bytes  | Byte        | Inbound data traffic (bytes)  |
+| transmit_bytes | Byte        | Outbound data traffic (bytes) |
 
-#### Metric Set: Disk Free
+#### Metric Set: File System
 
-| Metric Name | Metric Unit | Metric help description  |
-|-------------|-------------|--------------------------|
-| filesystem  | None        | Name of the file system. |
-| used        | Mb          | Used disk space.         |
-| available   | Mb          | Available disk space.    |
-| usage       | %           | Disk usage percentage.   |
-| mounted     | None        | Mount point directory.   |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| filesystem  | None        | Name of the file system |
+| used        | Mb          | Used disk size          |
+| available   | Mb          | Available disk size     |
+| usage       | %           | Usage rate              |
+| mounted     | None        | Mount point directory   |
 
-#### Metric Set: Top10 CPU Process
+#### Metric Set: Top 10 CPU Processes
 
-Top 10 processes consuming CPU. Metrics include: Process ID, CPU usage, Memory usage, Command.
+Statistics for the top 10 processes using the CPU. Statistics include: process ID, CPU usage, memory usage, and executed command.
 
-| Metric Name | Metric Unit | Metric help description |
+| Metric Name | Metric Unit | Metric Help Description |
 |-------------|-------------|-------------------------|
 | pid         | None        | Process ID              |
 | cpu_usage   | %           | CPU usage               |
 | mem_usage   | %           | Memory usage            |
 | command     | None        | Executed command        |
 
-#### Metric Set: Top10 Memory Process
+#### Metric Set: Top 10 Memory Processes
 
-Top 10 processes consuming memory. Metrics include: Process ID, Memory usage, CPU usage, Command.
+Statistics for the top 10 processes using memory. Statistics include: process ID, memory usage, CPU usage, and executed command.
 
-| Metric Name | Metric Unit | Metric help description |
+| Metric Name | Metric Unit | Metric Help Description |
 |-------------|-------------|-------------------------|
 | pid         | None        | Process ID              |
 | mem_usage   | %           | Memory usage            |

home/docs/help/rockylinux.md

@@ -9,97 +9,104 @@ keywords: [ Open Source Monitoring System, Open Source OS Monitoring, Rocky Linu
 
 ### Configuration Parameters
 
-|   Parameter Name    |                                                    Parameter help description                                                    |
-|---------------------|----------------------------------------------------------------------------------------------------------------------------------|
-| Monitoring Host     | The IP, IPV6, or domain name of the monitored endpoint. Note ⚠️: Do not include protocol headers (eg: https://, http://).        |
-| Task Name           | Identifies the name of this monitoring, ensuring uniqueness.                                                                     |
-| Port                | Port provided by Linux SSH externally, defaults to 22.                                                                           |
-| Timeout             | Sets the timeout for connection in milliseconds (ms), defaults to 6000 ms.                                                       |
-| Connection Reuse    | Sets whether the SSH connection is reused, defaults to: false. Creates a new connection for each information retrieval if false. |
-| Username            | SSH connection username, optional.                                                                                               |
-| Password            | SSH connection password, optional.                                                                                               |
-| Collector           | Specifies which collector schedules the collection for this monitoring.                                                          |
-| Monitoring Interval | Interval for periodically collecting data, in seconds. Minimum interval is 30 seconds.                                           |
-| Binding Tags        | Used for categorizing and managing monitored resources.                                                                          |
-| Description         | Additional remarks and descriptions for this monitoring, for users' reference.                                                   |
-| PrivateKey          | Key required for connecting to the server.                                                                                       |
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
 
-### Collected Metrics
+### Data Collection Metrics
 
-#### Metric Set: Basic Info
+#### Metric Set: Basic System Information
 
-|  Metric Name   | Metric Unit |  Metric help description  |
-|----------------|-------------|---------------------------|
-| Host Name      | None        | Host name.                |
-| System Version | None        | Operating system version. |
-| Uptime         | None        | System uptime.            |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
 
-#### Metric Set: CPU Info
+#### Metric Set: CPU Information
 
-|  Metric Name   | Metric Unit |          Metric help description          |
-|----------------|-------------|-------------------------------------------|
-| info           | None        | CPU model.                                |
-| cores          | None        | Number of CPU cores.                      |
-| interrupt      | None        | Number of CPU interrupts.                 |
-| load           | None        | Average load for the last 1/5/15 minutes. |
-| context_switch | None        | Current context switches.                 |
-| usage          | %           | CPU usage percentage.                     |
+| Metric Name    | Metric Unit | Metric Help Description           |
+|----------------|-------------|-----------------------------------|
+| info           | None        | CPU model                         |
+| cores          | None        | Number of CPU cores               |
+| interrupt      | None        | Number of CPU interrupts          |
+| load           | None        | Average CPU load (1/5/15 minutes) |
+| context_switch | None        | Number of context switches        |
+| usage          | %           | CPU usage                         |
 
-#### Metric Set: Memory Info
+#### Metric Set: Memory Information
 
-| Metric Name | Metric Unit |      Metric help description       |
-|-------------|-------------|------------------------------------|
-| total       | Mb          | Total memory capacity.             |
-| used        | Mb          | Used memory by user programs.      |
-| free        | Mb          | Free memory capacity.              |
-| buff_cache  | Mb          | Memory used for buffers and cache. |
-| available   | Mb          | Available memory capacity.         |
-| usage       | %           | Memory usage percentage.           |
+| Metric Name | Metric Unit |       Metric Help Description       |
+|-------------|-------------|-------------------------------------|
+| total       | Mb          | Total memory capacity               |
+| used        | Mb          | Memory used by user programs        |
+| free        | Mb          | Free memory capacity                |
+| buff_cache  | Mb          | Memory used for cache               |
+| available   | Mb          | Remaining available memory capacity |
+| usage       | %           | Memory usage rate                   |
 
-#### Metric Set: Disk Info
+#### Metric Set: Disk Information
 
-|  Metric Name  | Metric Unit |      Metric help description       |
-|---------------|-------------|------------------------------------|
-| disk_num      | None        | Total number of disks.             |
-| partition_num | None        | Total number of partitions.        |
-| block_write   | None        | Total blocks written to disk.      |
-| block_read    | None        | Total blocks read from disk.       |
-| write_rate    | iops        | Rate of blocks written per second. |
+| Metric Name   | Metric Unit | Metric Help Description                |
+|---------------|-------------|----------------------------------------|
+| disk_num      | None        | Total number of disks                  |
+| partition_num | None        | Total number of partitions             |
+| block_write   | None        | Total number of blocks written to disk |
+| block_read    | None        | Total number of blocks read from disk  |
+| write_rate    | iops        | Disk block write rate per second       |
 
-#### Metric Set: Interface Info
+#### Metric Set: Network Card Information
 
-|  Metric Name   | Metric Unit |    Metric help description     |
-|----------------|-------------|--------------------------------|
-| interface_name | None        | Name of the network interface. |
-| receive_bytes  | Mb          | Inbound data traffic.          |
-| transmit_bytes | Mb          | Outbound data traffic.         |
+|  Metric Name   | Metric Unit |    Metric Help Description    |
+|----------------|-------------|-------------------------------|
+| interface_name | None        | Network card name             |
+| receive_bytes  | Byte        | Inbound data traffic (bytes)  |
+| transmit_bytes | Byte        | Outbound data traffic (bytes) |
 
-#### Metric Set: Disk Free
+#### Metric Set: File System
 
-| Metric Name | Metric Unit | Metric help description  |
-|-------------|-------------|--------------------------|
-| filesystem  | None        | Name of the file system. |
-| used        | Mb          | Used disk space.         |
-| available   | Mb          | Available disk space.    |
-| usage       | %           | Disk usage percentage.   |
-| mounted     | None        | Mount point directory.   |
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| filesystem  | None        | Name of the file system |
+| used        | Mb          | Used disk size          |
+| available   | Mb          | Available disk size     |
+| usage       | %           | Usage rate              |
+| mounted     | None        | Mount point directory   |
 
-#### Metric Set: Top10 CPU Process
+#### Metric Set: Top 10 CPU Processes
 
-Top 10 processes consuming CPU. Metrics include: Process ID, CPU usage, Memory usage, Command.
+Statistics for the top 10 processes using the CPU. Statistics include: process ID, CPU usage, memory usage, and executed command.
 
-| Metric Name | Metric Unit | Metric help description |
+| Metric Name | Metric Unit | Metric Help Description |
 |-------------|-------------|-------------------------|
 | pid         | None        | Process ID              |
 | cpu_usage   | %           | CPU usage               |
 | mem_usage   | %           | Memory usage            |
 | command     | None        | Executed command        |
 
-#### Metric Set: Top10 Memory Process
+#### Metric Set: Top 10 Memory Processes
 
-Top 10 processes consuming memory. Metrics include: Process ID, Memory usage, CPU usage, Command.
+Statistics for the top 10 processes using memory. Statistics include: process ID, memory usage, CPU usage, and executed command.
 
-| Metric Name | Metric Unit | Metric help description |
+| Metric Name | Metric Unit | Metric Help Description |
 |-------------|-------------|-------------------------|
 | pid         | None        | Process ID              |
 | mem_usage   | %           | Memory usage            |

home/docs/help/ubuntu.md

@@ -9,73 +9,114 @@ keywords: [open source monitoring tool, open source linux ubuntu monitoring tool
 
 ### Configuration parameter
 
-|   Parameter name    |                                                                        Parameter help description                                                                         |
-|---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Monitoring Host     | Monitored IPV4, IPV6 or domain name. Note⚠️Without protocol header (eg: https://, http://)                                                                                |
-| Monitoring name     | Identify the name of this monitoring. The name needs to be unique                                                                                                         |
-| Port                | Port provided by Linux SSH. The default is 22                                                                                                                             |
-| Username            | SSH connection user name, optional                                                                                                                                        |
-| Password            | SSH connection password, optional                                                                                                                                         |
-| Collection interval | Interval time of monitor periodic data collection, unit: second, and the minimum interval that can be set is 30 seconds                                                   |
-| Whether to detect   | Whether to detect and check the availability of monitoring before adding monitoring. Adding and modifying operations will continue only after the detection is successful |
-| Description remarks | For more information about identifying and describing this monitoring, users can note information here                                                                    |
+| Parameter Name        | Parameter Help Description                                                                                                                                                            |
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| Monitored Host        | The IPV4, IPV6, or domain name of the host being monitored. Note ⚠️ No protocol header (e.g., https://, http://).                                                                     |
+| Task Name             | The name that identifies this monitoring, which must be unique.                                                                                                                       |
+| Port                  | The port provided by Linux SSH, default is 22.                                                                                                                                        |
+| Timeout               | Sets the connection timeout in milliseconds, default is 6000 ms.                                                                                                                      |
+| Connection Reuse      | Sets whether SSH connections are reused, default is :false. If false, a new connection is created each time information is retrieved.                                                 |
+| Use Proxy Connection  | Sets Whether connect via proxy, default is false.                                                                                                                                     |
+| Username              | SSH connection username, optional.                                                                                                                                                    |
+| Password              | SSH connection password, optional.                                                                                                                                                    |
+| Collector             | Configures which collector is used to schedule data collection for this monitoring.                                                                                                   |
+| Monitoring Period     | The interval time for periodic data collection in seconds, with a minimum interval of 30 seconds.                                                                                     |
+| Binding Tags          | Used for categorized management of monitoring resources.                                                                                                                              |
+| Description           | Additional notes and descriptions for this monitoring, where users can make notes.                                                                                                    |
+| PrivateKey            | The private key required to connect to the server.                                                                                                                                    |
+| PrivateKey PassPhrase | The password phrase used to encrypt the SSH private key. If the private key was generated with a passphrase, this field must be filled to decrypt and use the key for authentication. |
+| Proxy Host            | The address of the proxy server, supporting IPV4, IPV6, or domain name format. Required when using SSH jump host to access the target host.                                           |
+| Proxy Port            | The port number of the proxy service, default is 22.                                                                                                                                  |
+| Proxy Username        | The authentication username required to connect to the proxy server.                                                                                                                  |
+| Proxy Username        | The authentication password required to connect to the proxy server.                                                                                                                  |
+| Proxy PrivateKey      | The private key required to authenticate with the proxy server.                                                                                                                       |
 
-### Collection Metric
+### Collected Metrics
 
-#### Metric set：basic
+### Data Collection Metrics
 
-| Metric name | Metric unit | Metric help description  |
-|-------------|-------------|--------------------------|
-| hostname    | none        | Host name                |
-| version     | none        | Operating system version |
-| uptime      | none        | System running time      |
+#### Metric Set: Basic System Information
 
-#### Metric set：cpu
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| hostname    | None        | Host name               |
+| version     | None        | System version          |
+| uptime      | None        | System Uptime           |
 
-|  Metric name   | Metric unit |            Metric help description             |
-|----------------|-------------|------------------------------------------------|
-| info           | none        | CPU model                                      |
-| cores          | cores       | Number of CPU cores                            |
-| interrupt      | number      | Number of CPU interrupts                       |
-| load           | none        | Average load of CPU in the last 1/5/15 minutes |
-| context_switch | number      | Number of current context switches             |
-| usage          | %           | CPU usage                                      |
+#### Metric Set: CPU Information
 
-#### Metric set：memory
+| Metric Name    | Metric Unit | Metric Help Description           |
+|----------------|-------------|-----------------------------------|
+| info           | None        | CPU model                         |
+| cores          | None        | Number of CPU cores               |
+| interrupt      | None        | Number of CPU interrupts          |
+| load           | None        | Average CPU load (1/5/15 minutes) |
+| context_switch | None        | Number of context switches        |
+| usage          | %           | CPU usage                         |
 
-| Metric name | Metric unit |       Metric help description       |
+#### Metric Set: Memory Information
+
+| Metric Name | Metric Unit |       Metric Help Description       |
 |-------------|-------------|-------------------------------------|
 | total       | Mb          | Total memory capacity               |
-| used        | Mb          | User program memory                 |
+| used        | Mb          | Memory used by user programs        |
 | free        | Mb          | Free memory capacity                |
-| buff_cache  | Mb          | Memory occupied by cache            |
+| buff_cache  | Mb          | Memory used for cache               |
 | available   | Mb          | Remaining available memory capacity |
-| usage       | %           | Memory usage                        |
+| usage       | %           | Memory usage rate                   |
 
-#### Metric set：disk
+#### Metric Set: Disk Information
 
-|  Metric name  | Metric unit |        Metric help description         |
+| Metric Name   | Metric Unit | Metric Help Description                |
 |---------------|-------------|----------------------------------------|
-| disk_num      | blocks      | Total number of disks                  |
-| partition_num | partitions  | Total number of partitions             |
-| block_write   | blocks      | Total number of blocks written to disk |
-| block_read    | blocks      | Number of blocks read from disk        |
-| write_rate    | iops        | Rate of writing disk blocks per second |
+| disk_num      | None        | Total number of disks                  |
+| partition_num | None        | Total number of partitions             |
+| block_write   | None        | Total number of blocks written to disk |
+| block_read    | None        | Total number of blocks read from disk  |
+| write_rate    | iops        | Disk block write rate per second       |
 
-#### Metric set：interface
+#### Metric Set: Network Card Information
 
-|  Metric name   | Metric unit |   Metric help description    |
-|----------------|-------------|------------------------------|
-| interface_name | none        | Network card name            |
-| receive_bytes  | byte        | Inbound data traffic(bytes)  |
-| transmit_bytes | byte        | Outbound data traffic(bytes) |
+|  Metric Name   | Metric Unit |    Metric Help Description    |
+|----------------|-------------|-------------------------------|
+| interface_name | None        | Network card name             |
+| receive_bytes  | Byte        | Inbound data traffic (bytes)  |
+| transmit_bytes | Byte        | Outbound data traffic (bytes) |
 
-#### Metric set：disk_free
+#### Metric Set: File System
 
-| Metric name | Metric unit | Metric help description |
+| Metric Name | Metric Unit | Metric Help Description |
 |-------------|-------------|-------------------------|
-| filesystem  | none        | File system name        |
+| filesystem  | None        | Name of the file system |
 | used        | Mb          | Used disk size          |
 | available   | Mb          | Available disk size     |
-| usage       | %           | usage                   |
-| mounted     | none        | Mount point directory   |
+| usage       | %           | Usage rate              |
+| mounted     | None        | Mount point directory   |
+
+#### Metric Set: Top 10 CPU Processes
+
+Statistics for the top 10 processes using the CPU. Statistics include: process ID, CPU usage, memory usage, and executed command.
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| cpu_usage   | %           | CPU usage               |
+| mem_usage   | %           | Memory usage            |
+| command     | None        | Executed command        |
+
+#### Metric Set: Top 10 Memory Processes
+
+Statistics for the top 10 processes using memory. Statistics include: process ID, memory usage, CPU usage, and executed command.
+
+| Metric Name | Metric Unit | Metric Help Description |
+|-------------|-------------|-------------------------|
+| pid         | None        | Process ID              |
+| mem_usage   | %           | Memory usage            |
+| cpu_usage   | %           | CPU usage               |
+| command     | None        | Executed command        |
+
+#### Metric Set: Average CPU Temperature Across All Cores
+
+| Metric Name  | Metric Unit | Metric help description |
+|--------------|-------------|-------------------------|
+| avg_cpu_temp | C           | Average Temp All Cores  |

home/docs/start/greptime-init.md

@@ -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.

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/contact.md

@@ -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)
 

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/almalinux.md

@@ -9,40 +9,47 @@ keywords: [开源监控系统, 开源操作系统监控, AlmaLinux操作系统
 
 ### 配置参数
 
-|  参数名称  |                        参数帮助描述                        |
-|--------|------------------------------------------------------|
-| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
-| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                  |
-| 端口     | Linux SSH对外提供的端口，默认为22。                              |
-| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                           |
-| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次回去信息都会创建一个连接           |
-| 用户名    | SSH连接用户名，可选                                          |
-| 密码     | SSH连接密码，可选                                           |
-| 采集器    | 配置此监控使用哪台采集器调度采集                                     |
-| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                       |
-| 绑定标签   | 用于对监控资源进行分类管理                                        |
-| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                          |
-| 密钥     | 连接服务器所需密钥                                            |
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号。                                                          |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
 
 ### 采集指标
 
 #### 指标集合：系统基本信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| Host Name      | 无    | 主机名称   |
-| System Version | 无    | 操作系统版本 |
-| Uptime         | 无    | 启动时间   |
+| 指标名称     | 指标单位 | 指标帮助描述 |
+|----------|------|--------|
+| hostname | 无    | 主机名称   |
+| version  | 无    | 操作系统版本 |
+| uptime   | 无    | 启动时间   |
 
 #### 指标集合：CPU 信息
 
-|      指标名称      | 指标单位 |       指标帮助描述       |
+| 指标名称           | 指标单位 | 指标帮助描述             |
 |----------------|------|--------------------|
 | info           | 无    | CPU型号              |
-| cores          | 核数   | CPU内核数量            |
-| interrupt      | 个数   | CPU中断数量            |
+| cores          | 无    | CPU内核数量            |
+| interrupt      | 无    | CPU中断数量            |
 | load           | 无    | CPU最近1/5/15分钟的平均负载 |
-| context_switch | 个数   | 当前上下文切换数量          |
+| context_switch | 无    | 当前上下文切换数量          |
 | usage          | %    | CPU使用率             |
 
 #### 指标集合：内存信息
@@ -60,10 +67,10 @@ keywords: [开源监控系统, 开源操作系统监控, AlmaLinux操作系统
 
 |     指标名称      | 指标单位 |  指标帮助描述   |
 |---------------|------|-----------|
-| disk_num      | 块数   | 磁盘总数      |
-| partition_num | 分区数  | 分区总数      |
-| block_write   | 块数   | 写入磁盘的总块数  |
-| block_read    | 块数   | 从磁盘读出的块数  |
+| disk_num      | 无    | 磁盘总数      |
+| partition_num | 无    | 分区总数      |
+| block_write   | 无    | 写入磁盘的总块数  |
+| block_read    | 无    | 从磁盘读出的块数  |
 | write_rate    | iops | 每秒写磁盘块的速率 |
 
 #### 指标集合：网卡信息
@@ -71,8 +78,8 @@ keywords: [开源监控系统, 开源操作系统监控, AlmaLinux操作系统
 |      指标名称      | 指标单位 |    指标帮助描述     |
 |----------------|------|---------------|
 | interface_name | 无    | 网卡名称          |
-| receive_bytes  | byte | 入站数据流量(bytes) |
-| transmit_bytes | byte | 出站数据流量(bytes) |
+| receive_bytes  | Byte | 入站数据流量(bytes) |
+| transmit_bytes | Byte | 出站数据流量(bytes) |
 
 #### 指标集合：文件系统
 

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/centos.md

@@ -9,39 +9,50 @@ keywords: [开源监控系统, 开源操作系统监控, CentOS操作系统监
 
 ### 配置参数
 
-|  参数名称  |                        参数帮助描述                        |
-|--------|------------------------------------------------------|
-| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
-| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                  |
-| 端口     | Linux SSH对外提供的端口，默认为22。                              |
-| 用户名    | SSH连接用户名，可选                                          |
-| 密码     | SSH连接密码，可选                                           |
-| 采集间隔   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                       |
-| 是否探测   | 新增监控前是否先探测检查监控可用性，探测成功才会继续新增修改操作                     |
-| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                          |
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号,默认为22。                                                    |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
 
 ### 采集指标
 
-#### 指标集合：basic
+#### 指标集合：系统基本信息
 
-|   指标名称   | 指标单位 | 指标帮助描述 |
+| 指标名称     | 指标单位 | 指标帮助描述 |
 |----------|------|--------|
 | hostname | 无    | 主机名称   |
 | version  | 无    | 操作系统版本 |
-| uptime   | 无    | 系统运行时间 |
+| uptime   | 无    | 启动时间   |
 
-#### 指标集合：cpu
+#### 指标集合：CPU 信息
 
-|      指标名称      | 指标单位 |       指标帮助描述       |
+| 指标名称           | 指标单位 | 指标帮助描述             |
 |----------------|------|--------------------|
 | info           | 无    | CPU型号              |
-| cores          | 核数   | CPU内核数量            |
-| interrupt      | 个数   | CPU中断数量            |
+| cores          | 无    | CPU内核数量            |
+| interrupt      | 无    | CPU中断数量            |
 | load           | 无    | CPU最近1/5/15分钟的平均负载 |
-| context_switch | 个数   | 当前上下文切换数量          |
+| context_switch | 无    | 当前上下文切换数量          |
 | usage          | %    | CPU使用率             |
 
-#### 指标集合：memory
+#### 指标集合：内存信息
 
 |    指标名称    | 指标单位 |  指标帮助描述  |
 |------------|------|----------|
@@ -52,25 +63,25 @@ keywords: [开源监控系统, 开源操作系统监控, CentOS操作系统监
 | available  | Mb   | 剩余可用内存容量 |
 | usage      | %    | 内存使用率    |
 
-#### 指标集合：disk
+#### 指标集合：磁盘信息
 
 |     指标名称      | 指标单位 |  指标帮助描述   |
 |---------------|------|-----------|
-| disk_num      | 块数   | 磁盘总数      |
-| partition_num | 分区数  | 分区总数      |
-| block_write   | 块数   | 写入磁盘的总块数  |
-| block_read    | 块数   | 从磁盘读出的块数  |
+| disk_num      | 无    | 磁盘总数      |
+| partition_num | 无    | 分区总数      |
+| block_write   | 无    | 写入磁盘的总块数  |
+| block_read    | 无    | 从磁盘读出的块数  |
 | write_rate    | iops | 每秒写磁盘块的速率 |
 
-#### 指标集合：interface
+#### 指标集合：网卡信息
 
 |      指标名称      | 指标单位 |    指标帮助描述     |
 |----------------|------|---------------|
 | interface_name | 无    | 网卡名称          |
-| receive_bytes  | byte | 入站数据流量(bytes) |
-| transmit_bytes | byte | 出站数据流量(bytes) |
+| receive_bytes  | Byte | 入站数据流量(bytes) |
+| transmit_bytes | Byte | 出站数据流量(bytes) |
 
-#### 指标集合：disk_free
+#### 指标集合：文件系统
 
 |    指标名称    | 指标单位 | 指标帮助描述  |
 |------------|------|---------|
@@ -79,3 +90,25 @@ keywords: [开源监控系统, 开源操作系统监控, CentOS操作系统监
 | available  | Mb   | 可用磁盘大小  |
 | usage      | %    | 使用率     |
 | mounted    | 无    | 挂载点目录   |
+
+#### 指标集合：Top10 CPU进程
+
+统计进程使用CPU的Top10进程。统计信息包括：进程ID、CPU占用率、内存占用率、执行命令。
+
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| cpu_usage | %    | CPU占用率 |
+| mem_usage | %    | 内存占用率  |
+| command   | 无    | 执行命令   |
+
+#### 指标集合：Top10 内存进程
+
+统计进程使用内存的Top10进程。统计信息包括：进程ID、内存占用率、CPU占用率、执行命令。
+
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| mem_usage | %    | 内存占用率  |
+| cpu_usage | %    | CPU占用率 |
+| command   | 无    | 执行命令   |

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/debian.md

@@ -1,6 +1,6 @@
 ---
 id: debian  
-title: 监控：debian 系统监控  
+title: 监控：Debian 系统监控  
 sidebar_label: Debian 操作系统
 keywords: [开源监控系统, 操作系统监控, Debian监控]
 ---
@@ -9,93 +9,106 @@ keywords: [开源监控系统, 操作系统监控, Debian监控]
 
 ## 配置参数
 
-|  参数名称  |                        参数帮助描述                        |
-|--------|------------------------------------------------------|
-| 目标Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
-| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                  |
-| 端口     | Debian系统的ssh端口，默认: 22                                |
-| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                           |
-| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次回去信息都会创建一个连接           |
-| 用户名    | 服务器用户名                                               |
-| 密码     | 服务器密码                                                |
-| 采集器    | 配置此监控使用哪台采集器调度采集                                     |
-| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                       |
-| 绑定标签   | 用于对监控资源进行分类管理                                        |
-| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                          |
-| 密钥     | 连接服务器所需密钥                                            |
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号。                                                          |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
 
 ### 采集指标
 
 #### 指标集合：系统基本信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| Host Name      | 无    | 主机名称   |
-| System Version | 无    | 操作系统版本 |
-| Uptime         | 无    | 启动时间   |
+| 指标名称     | 指标单位 | 指标帮助描述 |
+|----------|------|--------|
+| hostname | 无    | 主机名称   |
+| version  | 无    | 操作系统版本 |
+| uptime   | 无    | 启动时间   |
 
 #### 指标集合：CPU 信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| Info           | 无    | 型号     |
-| Cores          | 无    | 核数     |
-| Interrupt      | 无    | 中断数    |
-| Load           | 无    | 负载     |
-| Context Switch | 无    | 上下文切换  |
-| Usage          | %    | 使用率    |
+| 指标名称           | 指标单位 | 指标帮助描述             |
+|----------------|------|--------------------|
+| info           | 无    | CPU型号              |
+| cores          | 无    | CPU内核数量            |
+| interrupt      | 无    | CPU中断数量            |
+| load           | 无    | CPU最近1/5/15分钟的平均负载 |
+| context_switch | 无    | 当前上下文切换数量          |
+| usage          | %    | CPU使用率             |
 
 #### 指标集合：内存信息
 
-|        指标名称         | 指标单位 | 指标帮助描述  |
-|---------------------|------|---------|
-| Total Memory        | Mb   | 总内存容量   |
-| User Program Memory | Mb   | 用户程序内存量 |
-| Free Memory         | Mb   | 空闲内存容量  |
-| Buff Cache Memory   | Mb   | 缓存占用内存  |
-| Available Memory    | Mb   | 剩余可用内存  |
-| Memory Usage        | %    | 内存使用率   |
+|    指标名称    | 指标单位 |  指标帮助描述  |
+|------------|------|----------|
+| total      | Mb   | 总内存容量    |
+| used       | Mb   | 用户程序内存量  |
+| free       | Mb   | 空闲内存容量   |
+| buff_cache | Mb   | 缓存占用内存   |
+| available  | Mb   | 剩余可用内存容量 |
+| usage      | %    | 内存使用率    |
 
 #### 指标集合：磁盘信息
 
-|     指标名称      | 指标单位 | 指标帮助描述 |
-|---------------|------|--------|
-| Disk Num      | 无    | 磁盘总数   |
-| Partition Num | 无    | 分区总数   |
-| Block Write   | 无    | 写磁盘块数  |
-| Block Read    | 无    | 读磁盘块数  |
-| Write Rate    | iops | 磁盘写速率  |
+|     指标名称      | 指标单位 |  指标帮助描述   |
+|---------------|------|-----------|
+| disk_num      | 无    | 磁盘总数      |
+| partition_num | 无    | 分区总数      |
+| block_write   | 无    | 写入磁盘的总块数  |
+| block_read    | 无    | 从磁盘读出的块数  |
+| write_rate    | iops | 每秒写磁盘块的速率 |
 
 #### 指标集合：网卡信息
 
-统计所有网卡的网卡名称、入站数据流量、出站数据流量。
-
-单位：Mb
+|      指标名称      | 指标单位 |    指标帮助描述     |
+|----------------|------|---------------|
+| interface_name | 无    | 网卡名称          |
+| receive_bytes  | Byte | 入站数据流量(bytes) |
+| transmit_bytes | Byte | 出站数据流量(bytes) |
 
 #### 指标集合：文件系统
 
-统计所有挂载的文件系统的使用情况。统计信息包括：文件系统、已使用量、可用量、使用率、挂载点。
-
-单位：
-
-- 已使用量：Mb
-- 可用量：Mb
-- 使用率：%
+|    指标名称    | 指标单位 | 指标帮助描述  |
+|------------|------|---------|
+| filesystem | 无    | 文件系统的名称 |
+| used       | Mb   | 已使用磁盘大小 |
+| available  | Mb   | 可用磁盘大小  |
+| usage      | %    | 使用率     |
+| mounted    | 无    | 挂载点目录   |
 
 #### 指标集合：Top10 CPU进程
 
 统计进程使用CPU的Top10进程。统计信息包括：进程ID、CPU占用率、内存占用率、执行命令。
 
-单位：
-
-- CPU占用率：%
-- 内存占用率：%
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| cpu_usage | %    | CPU占用率 |
+| mem_usage | %    | 内存占用率  |
+| command   | 无    | 执行命令   |
 
 #### 指标集合：Top10 内存进程
 
 统计进程使用内存的Top10进程。统计信息包括：进程ID、内存占用率、CPU占用率、执行命令。
 
-单位：
-
-- 内存占用率：%
-- CPU占用率：%
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| mem_usage | %    | 内存占用率  |
+| cpu_usage | %    | CPU占用率 |
+| command   | 无    | 执行命令   |

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/euleros.md

@@ -9,34 +9,41 @@ keywords: [ 开源监控系统, 开源操作系统监控, EulerOS操作系统监
 
 ### 配置参数
 
-|  参数名称  |                        参数帮助描述                        |
-|--------|------------------------------------------------------|
-| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
-| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                  |
-| 端口     | Linux SSH对外提供的端口，默认为22。                              |
-| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                           |
-| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接。          |
-| 用户名    | SSH连接用户名，可选。                                         |
-| 密码     | SSH连接密码，可选。                                          |
-| 采集器    | 配置此监控使用哪台采集器调度采集。                                    |
-| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒。                      |
-| 绑定标签   | 用于对监控资源进行分类管理。                                       |
-| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息。                         |
-| 密钥     | 连接服务器所需密钥。                                           |
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号。                                                          |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
 
 ### 采集指标
 
 #### 指标集合：系统基本信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| Host Name      | 无    | 主机名称   |
-| System Version | 无    | 操作系统版本 |
-| Uptime         | 无    | 启动时间   |
+| 指标名称     | 指标单位 | 指标帮助描述 |
+|----------|------|--------|
+| hostname | 无    | 主机名称   |
+| version  | 无    | 操作系统版本 |
+| uptime   | 无    | 启动时间   |
 
 #### 指标集合：CPU 信息
 
-|      指标名称      | 指标单位 |       指标帮助描述       |
+| 指标名称           | 指标单位 | 指标帮助描述             |
 |----------------|------|--------------------|
 | info           | 无    | CPU型号              |
 | cores          | 无    | CPU内核数量            |
@@ -68,11 +75,11 @@ keywords: [ 开源监控系统, 开源操作系统监控, EulerOS操作系统监
 
 #### 指标集合：网卡信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| interface_name | 无    | 网卡名称   |
-| receive_bytes  | Mb   | 入站数据流量 |
-| transmit_bytes | Mb   | 出站数据流量 |
+|      指标名称      | 指标单位 |    指标帮助描述     |
+|----------------|------|---------------|
+| interface_name | 无    | 网卡名称          |
+| receive_bytes  | Byte | 入站数据流量(bytes) |
+| transmit_bytes | Byte | 出站数据流量(bytes) |
 
 #### 指标集合：文件系统
 

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/fedora.md

@@ -0,0 +1,114 @@
+---
+id: fedora
+title: 监控：Fedora操作系统监控
+sidebar_label: Fedora 操作系统
+keywords: [ 开源监控系统, 开源操作系统监控, Fedora操作系统监控 ]
+---
+
+> 对Fedora操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。
+
+### 配置参数
+
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号,默认为22。                                                    |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
+
+### 采集指标
+
+#### 指标集合：系统基本信息
+
+| 指标名称     | 指标单位 | 指标帮助描述 |
+|----------|------|--------|
+| hostname | 无    | 主机名称   |
+| version  | 无    | 操作系统版本 |
+| uptime   | 无    | 启动时间   |
+
+#### 指标集合：CPU 信息
+
+| 指标名称           | 指标单位 | 指标帮助描述             |
+|----------------|------|--------------------|
+| info           | 无    | CPU型号              |
+| cores          | 无    | CPU内核数量            |
+| interrupt      | 无    | CPU中断数量            |
+| load           | 无    | CPU最近1/5/15分钟的平均负载 |
+| context_switch | 无    | 当前上下文切换数量          |
+| usage          | %    | CPU使用率             |
+
+#### 指标集合：内存信息
+
+|    指标名称    | 指标单位 |  指标帮助描述  |
+|------------|------|----------|
+| total      | Mb   | 总内存容量    |
+| used       | Mb   | 用户程序内存量  |
+| free       | Mb   | 空闲内存容量   |
+| buff_cache | Mb   | 缓存占用内存   |
+| available  | Mb   | 剩余可用内存容量 |
+| usage      | %    | 内存使用率    |
+
+#### 指标集合：磁盘信息
+
+|     指标名称      | 指标单位 |  指标帮助描述   |
+|---------------|------|-----------|
+| disk_num      | 无    | 磁盘总数      |
+| partition_num | 无    | 分区总数      |
+| block_write   | 无    | 写入磁盘的总块数  |
+| block_read    | 无    | 从磁盘读出的块数  |
+| write_rate    | iops | 每秒写磁盘块的速率 |
+
+#### 指标集合：网卡信息
+
+|      指标名称      | 指标单位 |    指标帮助描述     |
+|----------------|------|---------------|
+| interface_name | 无    | 网卡名称          |
+| receive_bytes  | Byte | 入站数据流量(bytes) |
+| transmit_bytes | Byte | 出站数据流量(bytes) |
+
+#### 指标集合：文件系统
+
+|    指标名称    | 指标单位 | 指标帮助描述  |
+|------------|------|---------|
+| filesystem | 无    | 文件系统的名称 |
+| used       | Mb   | 已使用磁盘大小 |
+| available  | Mb   | 可用磁盘大小  |
+| usage      | %    | 使用率     |
+| mounted    | 无    | 挂载点目录   |
+
+#### 指标集合：Top10 CPU进程
+
+统计进程使用CPU的Top10进程。统计信息包括：进程ID、CPU占用率、内存占用率、执行命令。
+
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| cpu_usage | %    | CPU占用率 |
+| mem_usage | %    | 内存占用率  |
+| command   | 无    | 执行命令   |
+
+#### 指标集合：Top10 内存进程
+
+统计进程使用内存的Top10进程。统计信息包括：进程ID、内存占用率、CPU占用率、执行命令。
+
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| mem_usage | %    | 内存占用率  |
+| cpu_usage | %    | CPU占用率 |
+| command   | 无    | 执行命令   |

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/freebsd.md

@@ -9,50 +9,59 @@ keywords: [ 开源监控系统, 开源操作系统监控, FreeBSD操作系统监
 
 ### 配置参数
 
-|  参数名称  |                        参数帮助描述                        |
-|--------|------------------------------------------------------|
-| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
-| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                  |
-| 端口     | Linux SSH对外提供的端口，默认为22。                              |
-| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                           |
-| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接。          |
-| 用户名    | SSH连接用户名，可选。                                         |
-| 密码     | SSH连接密码，可选。                                          |
-| 采集器    | 配置此监控使用哪台采集器调度采集。                                    |
-| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒。                      |
-| 绑定标签   | 用于对监控资源进行分类管理。                                       |
-| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息。                         |
-| 密钥     | 连接服务器所需密钥。                                           |
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号,默认为22。                                                    |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
 
 ### 采集指标
 
 #### 指标集合：系统基本信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| Host Name      | 无    | 主机名称   |
-| System Version | 无    | 操作系统版本 |
-| Uptime         | 无    | 启动时间   |
+| 指标名称     | 指标单位 | 指标帮助描述 |
+|----------|------|--------|
+| hostname | 无    | 主机名称   |
+| version  | 无    | 操作系统版本 |
+| uptime   | 无    | 启动时间   |
 
 #### 指标集合：CPU 信息
 
-|      指标名称      | 指标单位 |       指标帮助描述       |
+| 指标名称           | 指标单位 | 指标帮助描述             |
 |----------------|------|--------------------|
 | info           | 无    | CPU型号              |
-| cores          | 核数   | CPU内核数量            |
-| interrupt      | 个数   | CPU中断数量            |
+| cores          | 无    | CPU内核数量            |
+| interrupt      | 无    | CPU中断数量            |
 | load           | 无    | CPU最近1/5/15分钟的平均负载 |
-| context_switch | 个数   | 当前上下文切换数量          |
+| context_switch | 无    | 当前上下文切换数量          |
 | usage          | %    | CPU使用率             |
 
 #### 指标集合：内存信息
 
-|   指标名称   | 指标单位 | 指标帮助描述  |
-|----------|------|---------|
-| physmem  | Mb   | 物理内存    |
-| usermem  | Mb   | 用户程序内存量 |
-| realmem  | Mb   | 实际内存    |
-| availmem | Mb   | 可用内存    |
+|    指标名称    | 指标单位 |  指标帮助描述  |
+|------------|------|----------|
+| total      | Mb   | 总内存容量    |
+| used       | Mb   | 用户程序内存量  |
+| free       | Mb   | 空闲内存容量   |
+| buff_cache | Mb   | 缓存占用内存   |
+| available  | Mb   | 剩余可用内存容量 |
+| usage      | %    | 内存使用率    |
 
 #### 指标集合：文件系统
 

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/linux.md

@@ -9,39 +9,50 @@ keywords: [开源监控系统, 开源操作系统监控, Linux操作系统监控
 
 ### 配置参数
 
-|  参数名称  |                        参数帮助描述                        |
-|--------|------------------------------------------------------|
-| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
-| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                  |
-| 端口     | Linux SSH对外提供的端口，默认为22。                              |
-| 用户名    | SSH连接用户名，可选                                          |
-| 密码     | SSH连接密码，可选                                           |
-| 采集间隔   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                       |
-| 是否探测   | 新增监控前是否先探测检查监控可用性，探测成功才会继续新增修改操作                     |
-| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                          |
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号,默认为22。                                                    |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
 
 ### 采集指标
 
-#### 指标集合：basic
+#### 指标集合：系统基本信息
 
-|   指标名称   | 指标单位 | 指标帮助描述 |
+| 指标名称     | 指标单位 | 指标帮助描述 |
 |----------|------|--------|
 | hostname | 无    | 主机名称   |
 | version  | 无    | 操作系统版本 |
-| uptime   | 无    | 系统运行时间 |
+| uptime   | 无    | 启动时间   |
 
-#### 指标集合：cpu
+#### 指标集合：CPU 信息
 
-|      指标名称      | 指标单位 |       指标帮助描述       |
+| 指标名称           | 指标单位 | 指标帮助描述             |
 |----------------|------|--------------------|
 | info           | 无    | CPU型号              |
-| cores          | 核数   | CPU内核数量            |
-| interrupt      | 个数   | CPU中断数量            |
+| cores          | 无    | CPU内核数量            |
+| interrupt      | 无    | CPU中断数量            |
 | load           | 无    | CPU最近1/5/15分钟的平均负载 |
-| context_switch | 个数   | 当前上下文切换数量          |
+| context_switch | 无    | 当前上下文切换数量          |
 | usage          | %    | CPU使用率             |
 
-#### 指标集合：memory
+#### 指标集合：内存信息
 
 |    指标名称    | 指标单位 |  指标帮助描述  |
 |------------|------|----------|
@@ -52,25 +63,25 @@ keywords: [开源监控系统, 开源操作系统监控, Linux操作系统监控
 | available  | Mb   | 剩余可用内存容量 |
 | usage      | %    | 内存使用率    |
 
-#### 指标集合：disk
+#### 指标集合：磁盘信息
 
 |     指标名称      | 指标单位 |  指标帮助描述   |
 |---------------|------|-----------|
-| disk_num      | 块数   | 磁盘总数      |
-| partition_num | 分区数  | 分区总数      |
-| block_write   | 块数   | 写入磁盘的总块数  |
-| block_read    | 块数   | 从磁盘读出的块数  |
+| disk_num      | 无    | 磁盘总数      |
+| partition_num | 无    | 分区总数      |
+| block_write   | 无    | 写入磁盘的总块数  |
+| block_read    | 无    | 从磁盘读出的块数  |
 | write_rate    | iops | 每秒写磁盘块的速率 |
 
-#### 指标集合：interface
+#### 指标集合：网卡信息
 
 |      指标名称      | 指标单位 |    指标帮助描述     |
 |----------------|------|---------------|
 | interface_name | 无    | 网卡名称          |
-| receive_bytes  | byte | 入站数据流量(bytes) |
-| transmit_bytes | byte | 出站数据流量(bytes) |
+| receive_bytes  | Byte | 入站数据流量(bytes) |
+| transmit_bytes | Byte | 出站数据流量(bytes) |
 
-#### 指标集合：disk_free
+#### 指标集合：文件系统
 
 |    指标名称    | 指标单位 | 指标帮助描述  |
 |------------|------|---------|
@@ -79,3 +90,25 @@ keywords: [开源监控系统, 开源操作系统监控, Linux操作系统监控
 | available  | Mb   | 可用磁盘大小  |
 | usage      | %    | 使用率     |
 | mounted    | 无    | 挂载点目录   |
+
+#### 指标集合：Top10 CPU进程
+
+统计进程使用CPU的Top10进程。统计信息包括：进程ID、CPU占用率、内存占用率、执行命令。
+
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| cpu_usage | %    | CPU占用率 |
+| mem_usage | %    | 内存占用率  |
+| command   | 无    | 执行命令   |
+
+#### 指标集合：Top10 内存进程
+
+统计进程使用内存的Top10进程。统计信息包括：进程ID、内存占用率、CPU占用率、执行命令。
+
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| mem_usage | %    | 内存占用率  |
+| cpu_usage | %    | CPU占用率 |
+| command   | 无    | 执行命令   |

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/opensuse.md

@@ -9,40 +9,47 @@ keywords: [开源监控系统, 开源操作系统监控, OpenSUSE操作系统监
 
 ### 配置参数
 
-|  参数名称  |                        参数帮助描述                        |
-|--------|------------------------------------------------------|
-| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
-| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                  |
-| 端口     | Linux SSH对外提供的端口，默认为22。                              |
-| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                           |
-| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接           |
-| 用户名    | SSH连接用户名，可选                                          |
-| 密码     | SSH连接密码，可选                                           |
-| 采集器    | 配置此监控使用哪台采集器调度采集                                     |
-| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                       |
-| 绑定标签   | 用于对监控资源进行分类管理                                        |
-| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                          |
-| 密钥     | 连接服务器所需密钥                                            |
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号。                                                          |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
 
 ### 采集指标
 
 #### 指标集合：系统基本信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| Host Name      | 无    | 主机名称   |
-| System Version | 无    | 操作系统版本 |
-| Uptime         | 无    | 启动时间   |
+| 指标名称     | 指标单位 | 指标帮助描述 |
+|----------|------|--------|
+| hostname | 无    | 主机名称   |
+| version  | 无    | 操作系统版本 |
+| uptime   | 无    | 启动时间   |
 
 #### 指标集合：CPU 信息
 
-|      指标名称      | 指标单位 |       指标帮助描述       |
+| 指标名称           | 指标单位 | 指标帮助描述             |
 |----------------|------|--------------------|
 | info           | 无    | CPU型号              |
-| cores          | 核数   | CPU内核数量            |
-| interrupt      | 个数   | CPU中断数量            |
+| cores          | 无    | CPU内核数量            |
+| interrupt      | 无    | CPU中断数量            |
 | load           | 无    | CPU最近1/5/15分钟的平均负载 |
-| context_switch | 个数   | 当前上下文切换数量          |
+| context_switch | 无    | 当前上下文切换数量          |
 | usage          | %    | CPU使用率             |
 
 #### 指标集合：内存信息
@@ -60,19 +67,19 @@ keywords: [开源监控系统, 开源操作系统监控, OpenSUSE操作系统监
 
 |     指标名称      | 指标单位 |  指标帮助描述   |
 |---------------|------|-----------|
-| disk_num      | 块数   | 磁盘总数      |
-| partition_num | 分区数  | 分区总数      |
-| block_write   | 块数   | 写入磁盘的总块数  |
-| block_read    | 块数   | 从磁盘读出的块数  |
+| disk_num      | 无    | 磁盘总数      |
+| partition_num | 无    | 分区总数      |
+| block_write   | 无    | 写入磁盘的总块数  |
+| block_read    | 无    | 从磁盘读出的块数  |
 | write_rate    | iops | 每秒写磁盘块的速率 |
 
 #### 指标集合：网卡信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| interface_name | 无    | 网卡名称   |
-| receive_bytes  | Mb   | 入站数据流量 |
-| transmit_bytes | Mb   | 出站数据流量 |
+|      指标名称      | 指标单位 |    指标帮助描述     |
+|----------------|------|---------------|
+| interface_name | 无    | 网卡名称          |
+| receive_bytes  | Byte | 入站数据流量(bytes) |
+| transmit_bytes | Byte | 出站数据流量(bytes) |
 
 #### 指标集合：文件系统
 

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/redhat.md

@@ -9,34 +9,41 @@ keywords: [ 开源监控系统, 开源操作系统监控, RedHat操作系统监
 
 ### 配置参数
 
-|  参数名称  |                        参数帮助描述                        |
-|--------|------------------------------------------------------|
-| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
-| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                  |
-| 端口     | Linux SSH对外提供的端口，默认为22。                              |
-| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                           |
-| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接。          |
-| 用户名    | SSH连接用户名，可选。                                         |
-| 密码     | SSH连接密码，可选。                                          |
-| 采集器    | 配置此监控使用哪台采集器调度采集。                                    |
-| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒。                      |
-| 绑定标签   | 用于对监控资源进行分类管理。                                       |
-| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息。                         |
-| 密钥     | 连接服务器所需密钥。                                           |
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号,默认为22。                                                    |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
 
 ### 采集指标
 
 #### 指标集合：系统基本信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| Host Name      | 无    | 主机名称   |
-| System Version | 无    | 操作系统版本 |
-| Uptime         | 无    | 启动时间   |
+| 指标名称     | 指标单位 | 指标帮助描述 |
+|----------|------|--------|
+| hostname | 无    | 主机名称   |
+| version  | 无    | 操作系统版本 |
+| uptime   | 无    | 启动时间   |
 
 #### 指标集合：CPU 信息
 
-|      指标名称      | 指标单位 |       指标帮助描述       |
+| 指标名称           | 指标单位 | 指标帮助描述             |
 |----------------|------|--------------------|
 | info           | 无    | CPU型号              |
 | cores          | 无    | CPU内核数量            |
@@ -68,11 +75,11 @@ keywords: [ 开源监控系统, 开源操作系统监控, RedHat操作系统监
 
 #### 指标集合：网卡信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| interface_name | 无    | 网卡名称   |
-| receive_bytes  | Mb   | 入站数据流量 |
-| transmit_bytes | Mb   | 出站数据流量 |
+|      指标名称      | 指标单位 |    指标帮助描述     |
+|----------------|------|---------------|
+| interface_name | 无    | 网卡名称          |
+| receive_bytes  | Byte | 入站数据流量(bytes) |
+| transmit_bytes | Byte | 出站数据流量(bytes) |
 
 #### 指标集合：文件系统
 

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/rockylinux.md

@@ -9,34 +9,41 @@ keywords: [ 开源监控系统, 开源操作系统监控, Rocky Linux操作系
 
 ### 配置参数
 
-|  参数名称  |                        参数帮助描述                        |
-|--------|------------------------------------------------------|
-| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
-| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                  |
-| 端口     | Linux SSH对外提供的端口，默认为22。                              |
-| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                           |
-| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接。          |
-| 用户名    | SSH连接用户名，可选。                                         |
-| 密码     | SSH连接密码，可选。                                          |
-| 采集器    | 配置此监控使用哪台采集器调度采集。                                    |
-| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒。                      |
-| 绑定标签   | 用于对监控资源进行分类管理。                                       |
-| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息。                         |
-| 密钥     | 连接服务器所需密钥。                                           |
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号。                                                          |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
 
 ### 采集指标
 
 #### 指标集合：系统基本信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| Host Name      | 无    | 主机名称   |
-| System Version | 无    | 操作系统版本 |
-| Uptime         | 无    | 启动时间   |
+| 指标名称     | 指标单位 | 指标帮助描述 |
+|----------|------|--------|
+| hostname | 无    | 主机名称   |
+| version  | 无    | 操作系统版本 |
+| uptime   | 无    | 启动时间   |
 
 #### 指标集合：CPU 信息
 
-|      指标名称      | 指标单位 |       指标帮助描述       |
+| 指标名称           | 指标单位 | 指标帮助描述             |
 |----------------|------|--------------------|
 | info           | 无    | CPU型号              |
 | cores          | 无    | CPU内核数量            |
@@ -68,11 +75,11 @@ keywords: [ 开源监控系统, 开源操作系统监控, Rocky Linux操作系
 
 #### 指标集合：网卡信息
 
-|      指标名称      | 指标单位 | 指标帮助描述 |
-|----------------|------|--------|
-| interface_name | 无    | 网卡名称   |
-| receive_bytes  | Mb   | 入站数据流量 |
-| transmit_bytes | Mb   | 出站数据流量 |
+|      指标名称      | 指标单位 |    指标帮助描述     |
+|----------------|------|---------------|
+| interface_name | 无    | 网卡名称          |
+| receive_bytes  | Byte | 入站数据流量(bytes) |
+| transmit_bytes | Byte | 出站数据流量(bytes) |
 
 #### 指标集合：文件系统
 

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/ubuntu.md

@@ -9,39 +9,50 @@ keywords: [开源监控系统, 开源操作系统监控, Ubuntu监控]
 
 ### 配置参数
 
-|  参数名称  |                        参数帮助描述                        |
-|--------|------------------------------------------------------|
-| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。 |
-| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                  |
-| 端口     | Linux SSH对外提供的端口，默认为22。                              |
-| 用户名    | SSH连接用户名，可选                                          |
-| 密码     | SSH连接密码，可选                                           |
-| 采集间隔   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                       |
-| 是否探测   | 新增监控前是否先探测检查监控可用性，探测成功才会继续新增修改操作                     |
-| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                          |
+| 参数名称   | 参数帮助描述                                                              |
+|--------|---------------------------------------------------------------------|
+| 监控Host | 被监控的对端IPV4，IPV6或域名。注意⚠️不带协议头(eg: https://, http://)。                |
+| 任务名称   | 标识此监控的名称，名称需要保证唯一性。                                                 |
+| 端口     | Linux SSH对外提供的端口，默认为22。                                             |
+| 超时时间   | 设置连接的超时时间，单位ms毫秒，默认6000毫秒。                                          |
+| 复用连接   | 设置SSH连接是否复用，默认为:false。为false每次获取信息都会创建一个连接                          |
+| 使用代理   | 设置是否通过代理连接，默认为false。                                                |
+| 用户名    | SSH连接用户名，可选                                                         |
+| 密码     | SSH连接密码，可选                                                          |
+| 采集器    | 配置此监控使用哪台采集器调度采集                                                    |
+| 监控周期   | 监控周期性采集数据间隔时间，单位秒，可设置的最小间隔为30秒                                      |
+| 绑定标签   | 用于对监控资源进行分类管理                                                       |
+| 描述备注   | 更多标识和描述此监控的备注信息，用户可以在这里备注信息                                         |
+| 私钥     | 连接服务器所需的私钥                                                          |
+| 密钥短语   | 用于加密 SSH 私钥的密码短语（Passphrase）。如果私钥在生成时设置了密码短语，则必须填写此字段才能解密并使用私钥进行认证。 |
+| 代理主机   | 代理服务器的地址，支持 IPV4、IPV6或域名。若使用 SSH 代理跳转访问目标主机，需填写代理服务器的地址。            |
+| 代理端口   | 代理服务器的端口号。                                                          |
+| 代理用户名  | 连接代理服务器时所需的认证用户名。                                                   |
+| 代理密码   | 连接代理服务器时所需的认证密码。                                                    |
+| 代理主机私钥 | 连接代理服务器时所需的私钥。                                                      |
 
 ### 采集指标
 
-#### 指标集合：basic
+#### 指标集合：系统基本信息
 
-|   指标名称   | 指标单位 | 指标帮助描述 |
+| 指标名称     | 指标单位 | 指标帮助描述 |
 |----------|------|--------|
 | hostname | 无    | 主机名称   |
 | version  | 无    | 操作系统版本 |
-| uptime   | 无    | 系统运行时间 |
+| uptime   | 无    | 启动时间   |
 
-#### 指标集合：cpu
+#### 指标集合：CPU 信息
 
-|      指标名称      | 指标单位 |       指标帮助描述       |
+| 指标名称           | 指标单位 | 指标帮助描述             |
 |----------------|------|--------------------|
 | info           | 无    | CPU型号              |
-| cores          | 核数   | CPU内核数量            |
-| interrupt      | 个数   | CPU中断数量            |
+| cores          | 无    | CPU内核数量            |
+| interrupt      | 无    | CPU中断数量            |
 | load           | 无    | CPU最近1/5/15分钟的平均负载 |
-| context_switch | 个数   | 当前上下文切换数量          |
+| context_switch | 无    | 当前上下文切换数量          |
 | usage          | %    | CPU使用率             |
 
-#### 指标集合：memory
+#### 指标集合：内存信息
 
 |    指标名称    | 指标单位 |  指标帮助描述  |
 |------------|------|----------|
@@ -52,25 +63,25 @@ keywords: [开源监控系统, 开源操作系统监控, Ubuntu监控]
 | available  | Mb   | 剩余可用内存容量 |
 | usage      | %    | 内存使用率    |
 
-#### 指标集合：disk
+#### 指标集合：磁盘信息
 
 |     指标名称      | 指标单位 |  指标帮助描述   |
 |---------------|------|-----------|
-| disk_num      | 块数   | 磁盘总数      |
-| partition_num | 分区数  | 分区总数      |
-| block_write   | 块数   | 写入磁盘的总块数  |
-| block_read    | 块数   | 从磁盘读出的块数  |
+| disk_num      | 无    | 磁盘总数      |
+| partition_num | 无    | 分区总数      |
+| block_write   | 无    | 写入磁盘的总块数  |
+| block_read    | 无    | 从磁盘读出的块数  |
 | write_rate    | iops | 每秒写磁盘块的速率 |
 
-#### 指标集合：interface
+#### 指标集合：网卡信息
 
 |      指标名称      | 指标单位 |    指标帮助描述     |
 |----------------|------|---------------|
 | interface_name | 无    | 网卡名称          |
-| receive_bytes  | byte | 入站数据流量(bytes) |
-| transmit_bytes | byte | 出站数据流量(bytes) |
+| receive_bytes  | Byte | 入站数据流量(bytes) |
+| transmit_bytes | Byte | 出站数据流量(bytes) |
 
-#### 指标集合：disk_free
+#### 指标集合：文件系统
 
 |    指标名称    | 指标单位 | 指标帮助描述  |
 |------------|------|---------|
@@ -79,3 +90,31 @@ keywords: [开源监控系统, 开源操作系统监控, Ubuntu监控]
 | available  | Mb   | 可用磁盘大小  |
 | usage      | %    | 使用率     |
 | mounted    | 无    | 挂载点目录   |
+
+#### 指标集合：Top10 CPU进程
+
+统计进程使用CPU的Top10进程。统计信息包括：进程ID、CPU占用率、内存占用率、执行命令。
+
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| cpu_usage | %    | CPU占用率 |
+| mem_usage | %    | 内存占用率  |
+| command   | 无    | 执行命令   |
+
+#### 指标集合：Top10 内存进程
+
+统计进程使用内存的Top10进程。统计信息包括：进程ID、内存占用率、CPU占用率、执行命令。
+
+|   指标名称    | 指标单位 | 指标帮助描述 |
+|-----------|------|--------|
+| pid       | 无    | 进程ID   |
+| mem_usage | %    | 内存占用率  |
+| cpu_usage | %    | CPU占用率 |
+| command   | 无    | 执行命令   |
+
+#### 指标集合：所有核心的平均CPU温度
+
+| 指标名称         | 指标单位 | 指标帮助描述    |
+|--------------|------|-----------|
+| avg_cpu_temp | C    | 所有核心的平均温度 |

home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/greptime-init.md

@@ -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参数控制其是否使用，也可都不安装配置，只影响历史图表数据。

home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.6.x/community/contact.md

@@ -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)
 

home/i18n/zh-cn/docusaurus-plugin-content-docs/version-v1.6.x/introduce.md

@@ -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>

home/sidebars.json

@@ -41,6 +41,7 @@
           "type": "category",
           "label": "change-db",
           "items": [
+            "start/greptime-init",
             "start/victoria-metrics-init",
             "start/iotdb-init",
             "start/influxdb-init",
@@ -180,6 +181,7 @@
             "help/redhat",
             "help/rockylinux",
             "help/euleros",
+            "help/fedora",
             "help/linux_script",
             "help/windows_script"
           ]

home/src/pages/team/member.json

@@ -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",

home/versioned_docs/version-v1.6.x/community/contact.md

@@ -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)
 

home/versioned_docs/version-v1.6.x/introduce.md

@@ -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)**

web-app/src/assets/doc/alert-integration/tencent.en-US.md

@@ -9,7 +9,7 @@
 4. On the new notification template page, fill in the basic information
 5. In the **API Callback** module, enter the HertzBeat Webhook API URL:
    ```
-   http://{your_system_host}/api/alerts/tencent
+   http://{your_system_host}/api/alerts/report/tencent
    ```
 6. Save the notification template
 

web-app/src/assets/doc/alert-integration/tencent.ja-JP.md

@@ -9,7 +9,7 @@
 4. 新しい通知テンプレートページで、基本情報を入力します。
 5. **インターフェースコールバック** モジュールで、HertzBeat が提供する Webhook インターフェースアドレス URL を入力します。
    ```
-   http://{your_system_host}/api/alerts/tencent
+   http://{your_system_host}/api/alerts/report/tencent
    ```
 6. 通知テンプレートを保存します。
 

web-app/src/assets/doc/alert-integration/tencent.zh-CN.md

@@ -9,7 +9,7 @@
 4. 在新建通知模板页面，填写基础信息
 5. 在 **接口回调** 模块中，填写 HertzBeat 提供的 Webhook 接口地址 URL：
    ```
-   http://{your_system_host}/api/alerts/tencent
+   http://{your_system_host}/api/alerts/report/tencent
    ```
 6. 保存通知模板
 

web-app/src/assets/doc/alert-integration/tencent.zh-TW.md

@@ -9,7 +9,7 @@
 4. 在新建通知模板頁面，填寫基礎信息
 5. 在 **接口回調** 模塊中，填寫 HertzBeat 提供的 Webhook 接口地址 URL：
    ```
-   http://{your_system_host}/api/alerts/tencent
+   http://{your_system_host}/api/alerts/report/tencent
    ```
 6. 保存通知模板
 

web-app/src/assets/doc/alert-integration/uptime-kuma.en-US.md

@@ -3,12 +3,13 @@
 ### Configure the Uptime Kuma alarm callback
 
 #### Go to the notification configuration
+
 1. Log in to the Uptime Kuma web management interface
 2. Go to **Settings** > **Notifications** > **Set Notifications**
 3. Select the Webhook notification type
 4. In the Post URL, fill in the Webhook Interface URL provided by HertzBeat:
    ```
-   http://{your_system_host}/api/report/uptime-kuma
+   http://{your_system_host}/api/alerts/report/uptime-kuma
    ```
 5. In the request body, select Preset-application/json, and configure the rest as needed
 6. Save the settings notification
@@ -16,10 +17,12 @@
 ### Frequently Asked Questions
 
 #### No alerts received
+
 - Make sure that the webhook URL can be accessed by the uptime kuma service
 - Check whether the server logs contain request records
 
 #### The alarm is not triggered
+
 - Make sure that the conditions of the alert policy are correct and that notifications are bound
 
 For more information, please refer to [Uptime Kuma Wiki](https://github.com/louislam/uptime-kuma/wiki)

web-app/src/assets/doc/alert-integration/uptime-kuma.zh-CN.md

@@ -8,7 +8,7 @@
 3. 选择 **Webhook** 通知类型
 4. 在 **Post URL** 中，填写 HertzBeat 提供的 Webhook 接口地址 URL：
    ```
-   http://{your_system_host}/api/report/uptime-kuma
+   http://{your_system_host}/api/alerts/report/uptime-kuma
    ```
 5. 在 **请求体** 选择 **预设-application/json**,其他请按需配置
 6. 保存设置通知

web-app/src/assets/doc/alert-integration/uptime-kuma.zh-TW.md

@@ -8,7 +8,7 @@
 3. 選擇 **Webhook** 通知類型
 4. 在 **Post URL** 中，填寫 HertzBeat 提供的 Webhook 接口地址 URL：
    ```
-   http://{your_system_host}/api/report/uptime-kuma
+   http://{your_system_host}/api/alerts/report/uptime-kuma
    ```
 5. 在 **請求體** 選擇 **預設-application/json**，其他請按需配置
 6. 保存設置通知

web-app/src/assets/doc/alert-integration/zabbix.en-US.md

@@ -10,7 +10,7 @@ Send Zabbix alerts to the HertzBeat alert platform via Webhook.
 
    | Name | Value |
       |-----|-----|
-   | URL | http://your-hertzbeat-server:1157/api/report/zabbix |
+   | URL | http://your-hertzbeat-server:1157/api/alerts/report/zabbix |
    | AlertName | {TRIGGER.NAME} |
    | AlertId | {EVENT.ID} |
    | HostName | {HOST.NAME} |

web-app/src/assets/doc/alert-integration/zabbix.zh-CN.md

@@ -10,7 +10,7 @@
 
    | 名称 | 值 |
    |-----|-----|
-   | URL | http://your-hertzbeat-server:1157/api/report/zabbix |
+   | URL | http://your-hertzbeat-server:1157/api/alerts/report/zabbix |
    | AlertName | {TRIGGER.NAME} |
    | AlertId | {EVENT.ID} |
    | HostName | {HOST.NAME} |

web-app/src/assets/doc/alert-integration/zabbix.zh-TW.md

@@ -10,7 +10,7 @@
 
    | 名稱 | 值 |
       |-----|-----|
-   | URL | http://your-hertzbeat-server:1157/api/report/zabbix |
+   | URL | http://your-hertzbeat-server:1157/api/alerts/report/zabbix |
    | AlertName | {TRIGGER.NAME} |
    | AlertId | {EVENT.ID} |
    | HostName | {HOST.NAME} |