style(web-app): format monitor list component HTML

- Reformat HTML code for better readability
- Improve indentation and line breaks

.all-contributorsrc

@@ -6,7 +6,6 @@
   "files": [
     "README.md",
     "README_CN.md",
-    "README_JP.md"
     "home/src/pages/team/index.jsx"
   ],
   "imageSize": 100,
@@ -2505,24 +2504,6 @@
         "code",
         "test"
       ]
-    },
-    {
-      "login": "RainBondsongyg",
-      "name": "songyg",
-      "avatar_url": "https://avatars.githubusercontent.com/u/94501396?v=4",
-      "profile": "https://github.com/RainBondsongyg",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "lx1229",
-      "name": "Liuxin",
-      "avatar_url": "https://avatars.githubusercontent.com/u/44620005?v=4",
-      "profile": "https://github.com/lx1229",
-      "contributions": [
-        "code"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.asf.yaml

@@ -52,9 +52,6 @@ github:
       required_pull_request_reviews:
         dismiss_stale_reviews: true
         required_approving_review_count: 1
-  # enable GitHub Dependabot to create PRs for security alerts but not for every dependency update
-  dependabot_alerts:  true
-  dependabot_updates: false
 notifications:
   commits: notifications@hertzbeat.apache.org
   issues: notifications@hertzbeat.apache.org

.github/workflows/doc-build-test.yml

@@ -49,9 +49,11 @@ jobs:
       - name: Dead Link Check
         run: |
           sudo npm install -g markdown-link-check@3.8.7
-          find ./home -name "*.md" > all_md_files.txt
-          grep -vFf ./script/ci/exclude_files.txt all_md_files.txt > to_check.txt
-          xargs -P 8 -a to_check.txt -I{} markdown-link-check -c ./script/ci/link_check.json -q "{}"
+          for file in $(find ./home -name "*.md"); do
+            if ! grep -Fxq "$file" ./script/ci/exclude_files.txt; then
+              markdown-link-check -c ./script/ci/link_check.json -q "$file"
+            fi
+          done
 
       - name: NPM INSTALL
         working-directory: home

README.md

@@ -527,8 +527,6 @@ Thanks to these wonderful people, welcome to join us:
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaomizhou2"><img src="https://avatars.githubusercontent.com/u/47807926?v=4?s=100" width="100px;" alt="zhangyaxi"/><br /><sub><b>zhangyaxi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RainBondsongyg"><img src="https://avatars.githubusercontent.com/u/94501396?v=4?s=100" width="100px;" alt="songyg"/><br /><sub><b>songyg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=RainBondsongyg" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README_CN.md

@@ -33,11 +33,11 @@
 ### 特点
 
 - 集 **监控+告警+通知** 为一体，支持对应用服务，应用程序，数据库，缓存，操作系统，大数据，中间件，Web 服务器，云原生，网络，自定义等监控阈值告警通知一步到位。
-- 易用友好，无需 `Agent`，全 `WEB` 页面操作，鼠标点一点就能监控告警，无需学习成本。    
-- 将 `Http, Jmx, Ssh, Snmp, Jdbc, Prometheus` 等协议规范可配置化，只需在浏览器配置监控模板 `YML` 就能使用这些协议去自定义采集想要的指标。您相信只需简单配置即可快速适配一款 `K8s` 或 `Docker` 等新的监控类型吗？  
+- 易用友好，无需 `Agent`，全 `WEB` 页面操作，鼠标点一点就能监控告警，零上手学习成本。    
+- 将 `Http, Jmx, Ssh, Snmp, Jdbc, Prometheus` 等协议规范可配置化，只需在浏览器配置监控模板 `YML` 就能使用这些协议去自定义采集想要的指标。您相信只需配置下就能立刻适配一款 `K8s` 或 `Docker` 等新的监控类型吗？  
 - 兼容 `Prometheus` 的系统生态并且更多，只需页面操作就可以监控 `Prometheus` 所能监控的。
 - 高性能，支持多采集器集群横向扩展，支持多隔离网络监控，云边协同。
-- 灵活的告警阈值规则，`邮件` `Discord` `Slack` `Telegram` `钉钉` `微信` `飞书` `短信` `Webhook` `Server酱` 等方式消息及时送达。
+- 自由的告警阈值规则，`邮件` `Discord` `Slack` `Telegram` `钉钉` `微信` `飞书` `短信` `Webhook` `Server酱` 等方式消息及时送达。
 - 提供强大的状态页构建能力，轻松向用户传达您产品服务的实时状态。
 
 
@@ -126,7 +126,7 @@
 
    - `-e IDENTITY=custom-collector-name` : 配置此采集器的唯一性标识符名称，多个采集器名称不能相同，建议自定义英文名称。
     - `-e MODE=public` : 配置运行模式(public or private), 公共集群模式或私有云边模式。
-    - `-e MANAGER_HOST=127.0.0.1` : 配置连接主 HertzBeat 服务的对外 IP。
+    - `-e MANAGER_HOST=127.0.0.1` : 配置连接主 HertaBeat 服务的对外 IP。
     - `-e MANAGER_PORT=1158` : 配置连接主 HertzBeat 服务的对外端口，默认1158。
 
 
@@ -525,8 +525,6 @@ Thanks these wonderful people, welcome to join us:
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaomizhou2"><img src="https://avatars.githubusercontent.com/u/47807926?v=4?s=100" width="100px;" alt="zhangyaxi"/><br /><sub><b>zhangyaxi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RainBondsongyg"><img src="https://avatars.githubusercontent.com/u/94501396?v=4?s=100" width="100px;" alt="songyg"/><br /><sub><b>songyg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=RainBondsongyg" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

README_JP.md

@@ -525,12 +525,6 @@ Thanks these wonderful people, welcome to join us:
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/boyucjz"><img src="https://avatars.githubusercontent.com/u/18730041?v=4?s=100" width="100px;" alt="boyucjz"/><br /><sub><b>boyucjz</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=boyucjz" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Cyanty"><img src="https://avatars.githubusercontent.com/u/153884653?v=4?s=100" width="100px;" alt="Cyanty"/><br /><sub><b>Cyanty</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=Cyanty" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/KevinLLF"><img src="https://avatars.githubusercontent.com/u/85452733?v=4?s=100" width="100px;" alt="Jay丿167"/><br /><sub><b>Jay丿167</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=KevinLLF" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Duansg"><img src="https://avatars.githubusercontent.com/u/112607719?v=4?s=100" width="100px;" alt="Duansg"/><br /><sub><b>Duansg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=Duansg" title="Documentation">📖</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/xiaomizhou2"><img src="https://avatars.githubusercontent.com/u/47807926?v=4?s=100" width="100px;" alt="zhangyaxi"/><br /><sub><b>zhangyaxi</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Code">💻</a> <a href="https://github.com/apache/hertzbeat/commits?author=xiaomizhou2" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/RainBondsongyg"><img src="https://avatars.githubusercontent.com/u/94501396?v=4?s=100" width="100px;" alt="songyg"/><br /><sub><b>songyg</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=RainBondsongyg" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/lx1229"><img src="https://avatars.githubusercontent.com/u/44620005?v=4?s=100" width="100px;" alt="Liuxin"/><br /><sub><b>Liuxin</b></sub></a><br /><a href="https://github.com/apache/hertzbeat/commits?author=lx1229" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/AlarmCacheManager.java

@@ -17,9 +17,6 @@
 
 package org.apache.hertzbeat.alert.calculate;
 
-import com.google.common.collect.Table;
-import com.google.common.collect.Tables;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.alert.dao.SingleAlertDao;
 import org.apache.hertzbeat.alert.util.AlertUtil;
 import org.apache.hertzbeat.common.constants.CommonConstants;
@@ -27,6 +24,7 @@ import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -35,83 +33,49 @@ import java.util.concurrent.ConcurrentHashMap;
 @Component
 public class AlarmCacheManager {
 
-    private static final String CUSTOM_FIRING_ROW_KEY = "CUSTOM_FIRING_";
-
     /**
      * The alarm in the process is triggered
-     * rowKey - define id
-     * columnKey - labels fingerprint
+     * key - labels fingerprint
      */
-    private final Table<String, String, SingleAlert> pendingAlertMap;
-
+    private final Map<String, SingleAlert> pendingAlertMap;
     /**
      * The not recover alert
-     * rowKey - define id
-     * columnKey - labels fingerprint
+     * key - labels fingerprint
      */
-    private final Table<String, String, SingleAlert> firingAlertMap;
+    private final Map<String, SingleAlert> firingAlertMap;
 
     public AlarmCacheManager(SingleAlertDao singleAlertDao) {
-        this.pendingAlertMap = Tables.newCustomTable(new ConcurrentHashMap<>(8), ConcurrentHashMap::new);
-        this.firingAlertMap = Tables.newCustomTable(new ConcurrentHashMap<>(8), ConcurrentHashMap::new);
+        this.pendingAlertMap = new ConcurrentHashMap<>(8);
+        this.firingAlertMap = new ConcurrentHashMap<>(8);
         List<SingleAlert> singleAlerts = singleAlertDao.querySingleAlertsByStatus(CommonConstants.ALERT_STATUS_FIRING);
         for (SingleAlert singleAlert : singleAlerts) {
             String fingerprint = AlertUtil.calculateFingerprint(singleAlert.getLabels());
-            String defineId = singleAlert.getLabels().get(CommonConstants.LABEL_DEFINE_ID);
-            if (StringUtils.isBlank(defineId)) {
-                defineId = getCustomKey(fingerprint);
-            }
             singleAlert.setId(null);
-            this.firingAlertMap.put(defineId, fingerprint, singleAlert);
+            this.firingAlertMap.put(fingerprint, singleAlert);
         }
     }
 
-    public void putPending(Long defineId, String fingerPrint, SingleAlert alert) {
-        this.pendingAlertMap.put(String.valueOf(defineId), fingerPrint, alert);
+    public void putPending(String fingerPrint, SingleAlert alert) {
+        this.pendingAlertMap.put(fingerPrint, alert);
     }
 
-    public SingleAlert getPending(Long defineId, String fingerPrint) {
-        return this.pendingAlertMap.get(String.valueOf(defineId), fingerPrint);
+    public SingleAlert getPending(String fingerPrint) {
+        return this.pendingAlertMap.get(fingerPrint);
     }
 
-    public void removePending(Long defineId, String fingerPrint) {
-        this.pendingAlertMap.remove(String.valueOf(defineId), fingerPrint);
-    }
-
-    public void putFiring(Long defineId, String fingerPrint, SingleAlert alert) {
-        this.firingAlertMap.put(String.valueOf(defineId), fingerPrint, alert);
+    public SingleAlert removePending(String fingerPrint) {
+        return this.pendingAlertMap.remove(fingerPrint);
     }
 
     public void putFiring(String fingerPrint, SingleAlert alert) {
-        this.firingAlertMap.put(getCustomKey(fingerPrint), fingerPrint, alert);
-    }
-
-    public SingleAlert getFiring(Long defineId, String fingerPrint) {
-        SingleAlert singleAlert = this.firingAlertMap.get(String.valueOf(defineId), fingerPrint);
-        if (null != singleAlert) {
-            return singleAlert;
-        }
-        return getFiring(fingerPrint);
-    }
-
-    public SingleAlert removeFiring(Long defineId, String fingerPrint) {
-        SingleAlert singleAlert = this.firingAlertMap.remove(String.valueOf(defineId), fingerPrint);
-        if (null == singleAlert) {
-            return this.firingAlertMap.remove(getCustomKey(fingerPrint), fingerPrint);
-        }
-        return singleAlert;
+        this.firingAlertMap.put(fingerPrint, alert);
     }
 
     public SingleAlert getFiring(String fingerPrint) {
-        return this.firingAlertMap.get(getCustomKey(fingerPrint), fingerPrint);
+        return this.firingAlertMap.get(fingerPrint);
     }
 
-    private String getCustomKey(String fingerPrint) {
-        return CUSTOM_FIRING_ROW_KEY + fingerPrint;
-    }
-
-
     public SingleAlert removeFiring(String fingerPrint) {
-        return this.firingAlertMap.remove(getCustomKey(fingerPrint), fingerPrint);
+        return this.firingAlertMap.remove(fingerPrint);
     }
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/CollectorAlertHandler.java

@@ -76,12 +76,11 @@ public class CollectorAlertHandler {
         fingerPrints.put(KEY_COLLECTOR_VERSION, collector.getVersion());
         fingerPrints.put(KEY_COLLECTOR_HOST, collector.getIp());
         String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-        SingleAlert firingAlert = alarmCacheManager.removeFiring(fingerprint);
+        SingleAlert firingAlert = alarmCacheManager.getFiring(fingerprint);
         if (firingAlert != null) {
             firingAlert.setTriggerTimes(1);
             firingAlert.setEndAt(System.currentTimeMillis());
             firingAlert.setStatus(CommonConstants.ALERT_STATUS_RESOLVED);
-            firingAlert.setContent(this.bundle.getString("alerter.availability.collector.recover"));
             alarmCommonReduce.reduceAndSendAlarm(firingAlert.clone());
         }
     }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/PeriodicAlertCalculator.java

@@ -17,9 +17,8 @@
 
 package org.apache.hertzbeat.alert.calculate;
 
+import java.util.HashMap;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
 import org.apache.hertzbeat.alert.service.DataSourceService;
 import org.apache.hertzbeat.alert.util.AlertTemplateUtil;
@@ -27,11 +26,11 @@ import org.apache.hertzbeat.alert.util.AlertUtil;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Component;
 
 /**
  * Periodic Alert Calculator
@@ -55,9 +54,9 @@ public class PeriodicAlertCalculator {
         this.alarmCacheManager = alarmCacheManager;
     }
     
-    public void calculate(AlertDefine define) {
-        if (!define.isEnable() || StringUtils.isEmpty(define.getExpr())) {
-            log.error("Periodic define {} is disabled or expression is empty", define.getName());
+    public void calculate(AlertDefine rule) {
+        if (!rule.isEnable() || StringUtils.isEmpty(rule.getExpr())) {
+            log.error("Periodic rule {} is disabled or expression is empty", rule.getName());
             return;
         }
         long currentTimeMilli = System.currentTimeMillis();
@@ -67,8 +66,8 @@ public class PeriodicAlertCalculator {
             // the return result should be matched with threshold
             try {
                 List<Map<String, Object>> results = dataSourceService.calculate(
-                        define.getDatasource(),
-                        define.getExpr()
+                        rule.getDatasource(),
+                        rule.getExpr()
                 );
                 // if no match the expr threshold, the results item map {'value': null} should be null and others field keep
                 // if results has multi list, should trigger multi alert
@@ -78,9 +77,8 @@ public class PeriodicAlertCalculator {
                 for (Map<String, Object> result : results) {
                     Map<String, String> fingerPrints = new HashMap<>(8);
                     // here use the alert name as finger, not care the alert name may be changed
-                    fingerPrints.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(define.getId()));
-                    fingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
-                    fingerPrints.putAll(define.getLabels());
+                    fingerPrints.put(CommonConstants.LABEL_ALERT_NAME, rule.getName());
+                    fingerPrints.putAll(rule.getLabels());
                     for (Map.Entry<String, Object> entry : result.entrySet()) {
                         if (entry.getValue() != null && !VALUE.equals(entry.getKey())
                                 && !TIMESTAMP.equals(entry.getKey())) {
@@ -89,33 +87,32 @@ public class PeriodicAlertCalculator {
                     }
                     if (result.get(VALUE) == null) {
                         // recovery the alert
-                        handleRecoveredAlert(define.getId(), fingerPrints);
+                        handleRecoveredAlert(fingerPrints);
                         continue;
                     }
                     Map<String, Object> fieldValueMap = new HashMap<>(8);
-                    fieldValueMap.putAll(define.getLabels());
-                    fieldValueMap.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
+                    fieldValueMap.putAll(rule.getLabels());
+                    fieldValueMap.put(CommonConstants.LABEL_ALERT_NAME, rule.getName());
                     for (Map.Entry<String, Object> entry : result.entrySet()) {
                         if (entry.getValue() != null) {
                             fieldValueMap.put(entry.getKey(), entry.getValue());
                         }
                     }
-                    afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define);
+                    afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, rule);
                 }
             } catch (Exception ignored) {
                 // ignore the query exception eg: no result, timeout, etc
                 return;
             }
         } catch (Exception e) {
-            log.error("Calculate periodic define {} failed: {}", define.getName(), e.getMessage());
+            log.error("Calculate periodic rule {} failed: {}", rule.getName(), e.getMessage());
         }
     }
 
     private void afterThresholdRuleMatch(long currentTimeMilli, Map<String, String> fingerPrints,
                                          Map<String, Object> fieldValueMap, AlertDefine define) {
-        Long defineId = define.getId();
         String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-        SingleAlert existingAlert = alarmCacheManager.getPending(defineId, fingerprint);
+        SingleAlert existingAlert = alarmCacheManager.getPending(fingerprint);
         Map<String, String> labels = new HashMap<>(8);
         fieldValueMap.putAll(define.getLabels());
         labels.putAll(fingerPrints);
@@ -136,11 +133,11 @@ public class PeriodicAlertCalculator {
             // If required trigger times is 1, set to firing status directly
             if (requiredTimes <= 1) {
                 newAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(defineId, fingerprint, newAlert);
+                alarmCacheManager.putFiring(fingerprint, newAlert);
                 alarmCommonReduce.reduceAndSendAlarm(newAlert.clone());
             } else {
                 // Otherwise put into pending queue first
-                alarmCacheManager.putPending(defineId, fingerprint, newAlert);
+                alarmCacheManager.putPending(fingerprint, newAlert);
             }
         } else {
             // Update existing alert
@@ -150,17 +147,17 @@ public class PeriodicAlertCalculator {
             // Check if required trigger times reached
             if (existingAlert.getStatus().equals(CommonConstants.ALERT_STATUS_PENDING) && existingAlert.getTriggerTimes() >= requiredTimes) {
                 // Reached trigger times threshold, change to firing status
-                alarmCacheManager.removePending(defineId, fingerprint);
+                alarmCacheManager.removePending(fingerprint);
                 existingAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(defineId, fingerprint, existingAlert);
+                alarmCacheManager.putFiring(fingerprint, existingAlert);
                 alarmCommonReduce.reduceAndSendAlarm(existingAlert.clone());
             }
         }
     }
 
-    private void handleRecoveredAlert(Long defineId, Map<String, String> fingerprints) {
+    private void handleRecoveredAlert(Map<String, String> fingerprints) {
         String fingerprint = AlertUtil.calculateFingerprint(fingerprints);
-        SingleAlert firingAlert = alarmCacheManager.removeFiring(defineId, fingerprint);
+        SingleAlert firingAlert = alarmCacheManager.removeFiring(fingerprint);
         if (firingAlert != null) {
             // todo consider multi times to tig for resolved alert
             firingAlert.setTriggerTimes(1);
@@ -168,7 +165,7 @@ public class PeriodicAlertCalculator {
             firingAlert.setStatus(CommonConstants.ALERT_STATUS_RESOLVED);
             alarmCommonReduce.reduceAndSendAlarm(firingAlert.clone());
         }
-        alarmCacheManager.removePending(defineId, fingerprint);
+        alarmCacheManager.removePending(fingerprint);
     }
 
 } 

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/RealTimeAlertCalculator.java

@@ -183,11 +183,9 @@ public class RealTimeAlertCalculator {
             if (StringUtils.isBlank(expr)) {
                 continue;
             }
-            Long defineId = define.getId();
             Map<String, String> commonFingerPrints = new HashMap<>(8);
             commonFingerPrints.put(CommonConstants.LABEL_INSTANCE, instance);
             // here use the alert name as finger, not care the alert name may be changed
-            commonFingerPrints.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(define.getId()));
             commonFingerPrints.put(CommonConstants.LABEL_ALERT_NAME, define.getName());
             commonFingerPrints.put(CommonConstants.LABEL_INSTANCE_NAME, instanceName);
             commonFingerPrints.put(CommonConstants.LABEL_INSTANCE_HOST, instanceHost);
@@ -202,9 +200,9 @@ public class RealTimeAlertCalculator {
                     try {
                         if (match) {
                             // If the threshold rule matches, the number of times the threshold has been triggered is determined and an alarm is triggered
-                            afterThresholdRuleMatch(defineId, currentTimeMilli, commonFingerPrints, fieldValueMap, define, annotations);
+                            afterThresholdRuleMatch(currentTimeMilli, commonFingerPrints, fieldValueMap, define, annotations);
                         } else {
-                            handleRecoveredAlert(defineId, commonFingerPrints);
+                            handleRecoveredAlert(commonFingerPrints);
                         }
                         // if this threshold pre compile success, ignore blew
                         continue;
@@ -256,9 +254,9 @@ public class RealTimeAlertCalculator {
                     boolean match = execAlertExpression(fieldValueMap, expr, false);
                     try {
                         if (match) {
-                            afterThresholdRuleMatch(defineId, currentTimeMilli, fingerPrints, fieldValueMap, define, annotations);
+                            afterThresholdRuleMatch(currentTimeMilli, fingerPrints, fieldValueMap, define, annotations);
                         } else {
-                            handleRecoveredAlert(defineId, fingerPrints);
+                            handleRecoveredAlert(fingerPrints);
                         }
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);
@@ -336,9 +334,9 @@ public class RealTimeAlertCalculator {
                 .collect(Collectors.toList());
     }
 
-    private void handleRecoveredAlert(Long defineId, Map<String, String> fingerprints) {
+    private void handleRecoveredAlert(Map<String, String> fingerprints) {
         String fingerprint = AlertUtil.calculateFingerprint(fingerprints);
-        SingleAlert firingAlert = alarmCacheManager.removeFiring(defineId, fingerprint);
+        SingleAlert firingAlert = alarmCacheManager.removeFiring(fingerprint);
         if (firingAlert != null) {
             // todo consider multi times to tig for resolved alert
             firingAlert.setTriggerTimes(1);
@@ -346,14 +344,13 @@ public class RealTimeAlertCalculator {
             firingAlert.setStatus(CommonConstants.ALERT_STATUS_RESOLVED);
             alarmCommonReduce.reduceAndSendAlarm(firingAlert.clone());
         }
-        alarmCacheManager.removePending(defineId, fingerprint);
+        alarmCacheManager.removePending(fingerprint);
     }
 
-    private void afterThresholdRuleMatch(long defineId, long currentTimeMilli, Map<String, String> fingerPrints,
-                                         Map<String, Object> fieldValueMap, AlertDefine define,
-                                         Map<String, String> annotations) {
+    private void afterThresholdRuleMatch(long currentTimeMilli, Map<String, String> fingerPrints,
+                                         Map<String, Object> fieldValueMap, AlertDefine define, Map<String, String> annotations) {
         String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-        SingleAlert existingAlert = alarmCacheManager.getPending(defineId, fingerprint);
+        SingleAlert existingAlert = alarmCacheManager.getPending(fingerprint);
         fieldValueMap.putAll(define.getLabels());
         int requiredTimes = define.getTimes() == null ? 1 : define.getTimes();
         if (existingAlert == null) {
@@ -385,11 +382,11 @@ public class RealTimeAlertCalculator {
             // If required trigger times is 1, set to firing status directly
             if (requiredTimes <= 1) {
                 newAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(defineId, fingerprint, newAlert);
+                alarmCacheManager.putFiring(fingerprint, newAlert);
                 alarmCommonReduce.reduceAndSendAlarm(newAlert.clone());
             } else {
                 // Otherwise put into pending queue first
-                alarmCacheManager.putPending(define.getId(), fingerprint, newAlert);
+                alarmCacheManager.putPending(fingerprint, newAlert);
             }
         } else {
             // Update existing alert
@@ -399,9 +396,9 @@ public class RealTimeAlertCalculator {
             // Check if required trigger times reached
             if (existingAlert.getStatus().equals(CommonConstants.ALERT_STATUS_PENDING) && existingAlert.getTriggerTimes() >= requiredTimes) {
                 // Reached trigger times threshold, change to firing status
-                alarmCacheManager.removePending(defineId, fingerprint);
+                alarmCacheManager.removePending(fingerprint);
                 existingAlert.setStatus(CommonConstants.ALERT_STATUS_FIRING);
-                alarmCacheManager.putFiring(defineId, fingerprint, existingAlert);
+                alarmCacheManager.putFiring(fingerprint, existingAlert);
                 alarmCommonReduce.reduceAndSendAlarm(existingAlert.clone());
             }
         }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/controller/AlertDefineController.java

@@ -17,16 +17,17 @@
 
 package org.apache.hertzbeat.alert.controller;
 
+import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_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;
 import jakarta.validation.Valid;
+import java.util.Objects;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.dto.Message;
-import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,17 +36,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE;
-import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_NOT_EXIST_CODE;
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
 /**
  * Alarm definition management API
  */
@@ -98,18 +90,4 @@ public class AlertDefineController {
         return ResponseEntity.ok(Message.success("Delete success"));
     }
 
-    @GetMapping(path = "/preview/{datasource}")
-    @Operation(summary = "Alarm definition expression preview",
-            description = "If the expression is formal, then the result of the query will be returned, otherwise it will respond with an error")
-    public ResponseEntity<Message<List<Map<String, Object>>>> getDefinePreview(
-            @Parameter(description = "Data Source Type", example = "promql") @PathVariable("datasource") String datasource,
-            @Parameter(description = "alert threshold type:realtime,periodic") @RequestParam String type,
-            @Parameter(description = "alert threshold expression") @RequestParam String expr) {
-        try {
-            return ResponseEntity.ok(Message.successWithData(alertDefineService.getDefinePreview(datasource, type, expr)));
-        } catch (AlertExpressionException ae) {
-            return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Message.fail(FAIL_CODE, ae.getMessage()));
-        }
-    }
-
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionBaseVisitor.java

@@ -27,7 +27,7 @@ import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
  * of the available methods.
  *
  * @param <T> The return type of the visit operation. Use {@link Void} for
- *            operations with no return type.
+ * operations with no return type.
  */
 @SuppressWarnings("CheckReturnValue")
 public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements AlertExpressionVisitor<T> {
@@ -37,10 +37,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitExpression(AlertExpressionParser.ExpressionContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitExpression(AlertExpressionParser.ExpressionContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -48,10 +45,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitAndExpr(AlertExpressionParser.AndExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitAndExpr(AlertExpressionParser.AndExprContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -59,10 +53,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -70,10 +61,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitUnlessExpr(AlertExpressionParser.UnlessExprContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -81,10 +69,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitSqlExpr(AlertExpressionParser.SqlExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitSqlExpr(AlertExpressionParser.SqlExprContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -92,10 +77,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitSqlCallExpr(AlertExpressionParser.SqlCallExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitSqlCallExpr(AlertExpressionParser.SqlCallExprContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -103,10 +85,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitLiteralExpr(AlertExpressionParser.LiteralExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitLiteralExpr(AlertExpressionParser.LiteralExprContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -114,10 +93,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitParenExpr(AlertExpressionParser.ParenExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitParenExpr(AlertExpressionParser.ParenExprContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -125,10 +101,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitPromqlCallExpr(AlertExpressionParser.PromqlCallExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitPromqlCallExpr(AlertExpressionParser.PromqlCallExprContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -136,10 +109,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitPromqlExpr(AlertExpressionParser.PromqlExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitPromqlExpr(AlertExpressionParser.PromqlExprContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -147,10 +117,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitOrExpr(AlertExpressionParser.OrExprContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitOrExpr(AlertExpressionParser.OrExprContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -158,10 +125,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitFunctionCall(AlertExpressionParser.FunctionCallContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitFunctionCall(AlertExpressionParser.FunctionCallContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -169,10 +133,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitParameterList(AlertExpressionParser.ParameterListContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitParameterList(AlertExpressionParser.ParameterListContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -180,10 +141,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitParameter(AlertExpressionParser.ParameterContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitParameter(AlertExpressionParser.ParameterContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -191,10 +149,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitNumber(AlertExpressionParser.NumberContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitNumber(AlertExpressionParser.NumberContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -202,10 +157,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitString(AlertExpressionParser.StringContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitString(AlertExpressionParser.StringContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -213,10 +165,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitDuration(AlertExpressionParser.DurationContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitDuration(AlertExpressionParser.DurationContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -224,10 +173,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitFunctionName(AlertExpressionParser.FunctionNameContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitFunctionName(AlertExpressionParser.FunctionNameContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -235,10 +181,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitSelectSql(AlertExpressionParser.SelectSqlContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitSelectSql(AlertExpressionParser.SelectSqlContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -246,10 +189,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitSelectFieldList(AlertExpressionParser.SelectFieldListContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitSelectFieldList(AlertExpressionParser.SelectFieldListContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -257,10 +197,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitSelectField(AlertExpressionParser.SelectFieldContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitSelectField(AlertExpressionParser.SelectFieldContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -268,10 +205,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitGroupByList(AlertExpressionParser.GroupByListContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitGroupByList(AlertExpressionParser.GroupByListContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -279,10 +213,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitOrderByList(AlertExpressionParser.OrderByListContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitOrderByList(AlertExpressionParser.OrderByListContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -290,10 +221,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitOrderByField(AlertExpressionParser.OrderByFieldContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitOrderByField(AlertExpressionParser.OrderByFieldContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -301,10 +229,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitLimitClause(AlertExpressionParser.LimitClauseContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitLimitClause(AlertExpressionParser.LimitClauseContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -312,10 +237,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitRelList(AlertExpressionParser.RelListContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitRelList(AlertExpressionParser.RelListContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -323,10 +245,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitRelation(AlertExpressionParser.RelationContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitRelation(AlertExpressionParser.RelationContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -334,10 +253,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitConditionList(AlertExpressionParser.ConditionListContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitConditionList(AlertExpressionParser.ConditionListContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -345,10 +261,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitCompOp(AlertExpressionParser.CompOpContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitCompOp(AlertExpressionParser.CompOpContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -356,10 +269,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitCondition(AlertExpressionParser.ConditionContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitCondition(AlertExpressionParser.ConditionContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -367,10 +277,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitConditionUnit(AlertExpressionParser.ConditionUnitContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitConditionUnit(AlertExpressionParser.ConditionUnitContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -378,10 +285,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitPromql(AlertExpressionParser.PromqlContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitPromql(AlertExpressionParser.PromqlContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -389,10 +293,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitMetricSelector(AlertExpressionParser.MetricSelectorContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitMetricSelector(AlertExpressionParser.MetricSelectorContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -400,10 +301,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitLabelMatcherList(AlertExpressionParser.LabelMatcherListContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitLabelMatcherList(AlertExpressionParser.LabelMatcherListContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -411,10 +309,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitLabelMatcherItem(AlertExpressionParser.LabelMatcherItemContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitLabelMatcherItem(AlertExpressionParser.LabelMatcherItemContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -422,10 +317,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitLabelMatcherOp(AlertExpressionParser.LabelMatcherOpContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitLabelMatcherOp(AlertExpressionParser.LabelMatcherOpContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -433,10 +325,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitLabelList(AlertExpressionParser.LabelListContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitLabelList(AlertExpressionParser.LabelListContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -444,10 +333,7 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitInstantVectorOp(AlertExpressionParser.InstantVectorOpContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitInstantVectorOp(AlertExpressionParser.InstantVectorOpContext ctx) { return visitChildren(ctx); }
 
     /**
      * {@inheritDoc}
@@ -455,8 +341,13 @@ public class AlertExpressionBaseVisitor<T> extends AbstractParseTreeVisitor<T> i
      * <p>The default implementation returns the result of calling
      * {@link #visitChildren} on {@code ctx}.</p>
      */
-    @Override
-    public T visitAggregationOperator(AlertExpressionParser.AggregationOperatorContext ctx) {
-        return visitChildren(ctx);
-    }
+    @Override public T visitAggregationOperator(AlertExpressionParser.AggregationOperatorContext ctx) { return visitChildren(ctx); }
+
+    /**
+     * {@inheritDoc}
+     *
+     * <p>The default implementation returns the result of calling
+     * {@link #visitChildren} on {@code ctx}.</p>
+     */
+    @Override public T visitBinaryOperator(AlertExpressionParser.BinaryOperatorContext ctx) { return visitChildren(ctx); }
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionEvalVisitor.java

@@ -18,12 +18,11 @@
 package org.apache.hertzbeat.alert.expr;
 
 import org.antlr.v4.runtime.CommonTokenStream;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.hertzbeat.common.support.exception.ExpressionVisitorException;
 import org.apache.hertzbeat.warehouse.db.QueryExecutor;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -34,7 +33,7 @@ import java.util.stream.Collectors;
  */
 public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<Map<String, Object>>> {
 
-    private static final String SCALAR = "__scalar__";
+    private static final String THRESHOLD = "__threshold__";
     private static final String NAME = "__name__";
     private static final String VALUE = "__value__";
     private static final String TIMESTAMP = "__timestamp__";
@@ -61,100 +60,28 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
     public List<Map<String, Object>> visitComparisonExpr(AlertExpressionParser.ComparisonExprContext ctx) {
         List<Map<String, Object>> leftResult = visit(ctx.left);
         List<Map<String, Object>> rightResult = visit(ctx.right);
-        int type = ctx.op.getType();
-        boolean boolModifier = ctx.BOOL() != null;
-        boolean leftIsScalar = isScalar(leftResult);
-        boolean rightIsScalar = isScalar(rightResult);
-        List<Map<String, Object>> results = new ArrayList<>();
+        if (rightResult.size() == 1 && rightResult.get(0).containsKey(THRESHOLD)) {
+            double threshold = (double) rightResult.get(0).get(THRESHOLD);
+            String operator = ctx.op.getText();
 
-        // scalar and scalar
-        if (leftIsScalar && rightIsScalar) {
-            if (!boolModifier) {
-                // Between two scalars,
-                // the bool modifier must be provided and these operators result in another scalar that is either 0 (false) or 1 (true), depending on the comparison result.
-                return results;
-            }
-            Object leftVal = leftResult.get(0).get(SCALAR);
-            Object rightVal = rightResult.get(0).get(SCALAR);
-            Boolean match = compareOp(leftVal, type, rightVal);
-            // returns a result only if the comparison condition is met.
-            Map<String, Object> result = new HashMap<>();
-            result.put(VALUE, match ? 1 : 0);
-            results.add(result);
-            return results;
-        }
-
-        // scalar and vector
-        if (leftIsScalar) {
-            Object leftVal = leftResult.get(0).get(SCALAR);
-            for (Map<String, Object> rightItem : rightResult) {
-                Object rightVal = rightItem.getOrDefault(VALUE, null);
-                if (isValidValue(rightVal)) {
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (Map<String, Object> item : leftResult) {
+                Object queryValues = item.get(VALUE);
+                if (queryValues == null) {
+                    // ignore the query result data is empty
                     continue;
                 }
-                Boolean match = compareOp(leftVal, type, rightVal);
-                Map<String, Object> result = new HashMap<>(rightItem);
-                if (boolModifier) {
-                    result.put(VALUE, match ? 1 : 0);
-                    results.add(result);
-                } else {
-                    result.put(VALUE, match ? rightVal : null);
-                    results.add(result);
-                }
+                // queryValues may be a list of values, or a single value
+                Object matchValue = evaluateCondition(queryValues, operator, threshold);
+                Map<String, Object> resultMap = new HashMap(item);
+                resultMap.put(VALUE, matchValue);
+                // if matchValue is null, mean not match the threshold
+                // if not null, mean match the threshold
+                result.add(resultMap);
             }
-            return results;
+            return result;
         }
-
-        // vector and scalar
-        if (rightIsScalar) {
-            Object rightVal = rightResult.get(0).get(SCALAR);
-            for (Map<String, Object> leftItem : leftResult) {
-                Object leftVal = leftItem.getOrDefault(VALUE, null);
-                if (isValidValue(leftVal)) {
-                    continue;
-                }
-                Boolean match = compareOp(leftVal, type, rightVal);
-                Map<String, Object> result = new HashMap<>(leftItem);
-                if (boolModifier) {
-                    result.put(VALUE, match ? 1 : 0);
-                    results.add(result);
-                } else {
-                    result.put(VALUE, match ? leftVal : null);
-                    results.add(result);
-                }
-            }
-            return results;
-        }
-
-        // vector and vector
-        Map<String, Map<String, Object>> rightMap = rightResult.stream()
-                .filter(item -> item.get(VALUE) != null)
-                .collect(Collectors.toMap(this::labelKey, item -> item, (existing, replacement) -> existing));
-
-        for (Map<String, Object> leftItem : leftResult) {
-            Object leftVal = leftItem.getOrDefault(VALUE, null);
-            if (isValidValue(leftVal)) {
-                continue;
-            }
-            Map<String, Object> rightItem = rightMap.get(labelKey(leftItem));
-            if (rightItem == null) {
-                continue;
-            }
-            Object rightVal = rightItem.get(VALUE);
-            if (isValidValue(rightVal)) {
-                continue;
-            }
-            Boolean match = compareOp(leftVal, type, rightVal);
-            Map<String, Object> result = new HashMap<>(leftItem);
-            if (boolModifier) {
-                result.put(VALUE, match ? 1 : 0);
-                results.add(result);
-            } else {
-                result.put(VALUE, match ? leftVal : null);
-                results.add(result);
-            }
-        }
-        return results;
+        return new LinkedList<>();
     }
 
     @Override
@@ -240,7 +167,7 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
         double value = Double.parseDouble(ctx.number().getText());
         List<Map<String, Object>> numAsList = new ArrayList<>();
         Map<String, Object> valueMap = new HashMap<>();
-        valueMap.put(SCALAR, value);
+        valueMap.put(THRESHOLD, value);
         numAsList.add(valueMap);
         return numAsList;
     }
@@ -267,7 +194,83 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
         return callSqlOrPromql(tokens.getText(ctx.string()));
     }
 
-    private List<Map<String, Object>> callSqlOrPromql(String text) {
+    private Object evaluateCondition(Object value, String operator, Double threshold) {
+        // value may be a list of values, or a single value
+        switch (operator) {
+            case ">":
+                // if value is list, return the max value
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).max(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue > threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) > threshold ? value : null;
+                }
+            case ">=":
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).max(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue >= threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) >= threshold ? value : null;
+                }
+            case "<":
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).min(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue < threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) < threshold ? value : null;
+                }
+            case "<=":
+                if (value instanceof List<?> values) {
+                    Double doubleValue = values.stream().map(v -> Double.valueOf(v.toString())).min(Double::compareTo).orElse(null);
+                    if (doubleValue != null) {
+                        return doubleValue <= threshold ? doubleValue : null;
+                    } else {
+                        return null;
+                    }
+                } else {
+                    return Double.parseDouble(value.toString()) <= threshold ? value : null;
+                }
+            case "==":
+                if (value instanceof List<?> values) {
+                    for (Object v : values) {
+                        if (v.equals(threshold)) {
+                            return v;
+                        }
+                    }
+                    return null;
+                } else {
+                    return value.equals(threshold) ? value : null;
+                }
+            case "!=":
+                if (value instanceof List<?> values) {
+                    for (Object v : values) {
+                        if (v.equals(threshold)) {
+                            return null;
+                        }
+                    }
+                    return value;
+                } else {
+                    return value.equals(threshold) ? null : value;
+                }
+            default:
+                // unsupported operator todo add more operator
+                return null;
+        }
+    }
+
+    private List<Map<String, Object>> callSqlOrPromql(String text){
         String script = text.substring(1, text.length() - 1);
         return executor.execute(script);
     }
@@ -287,36 +290,4 @@ public class AlertExpressionEvalVisitor extends AlertExpressionBaseVisitor<List<
         return key.isEmpty() ? "-" : key;
     }
 
-    private boolean isScalar(List<Map<String, Object>> context) {
-        return CollectionUtils.isNotEmpty(context)
-                && context.size() == 1
-                && context.get(0).containsKey(SCALAR)
-                && null != context.get(0).get(SCALAR);
-    }
-
-    private double parseStrToDouble(String text) {
-        try {
-            return Double.parseDouble(text);
-        } catch (NumberFormatException e) {
-            throw new ExpressionVisitorException("number format exception", e);
-        }
-    }
-
-    private boolean isValidValue(Object val) {
-        return val == null || val instanceof List<?>;
-    }
-
-    private Boolean compareOp(Object leftVal, int opType, Object rightVal) {
-        double left = parseStrToDouble(leftVal.toString());
-        double right = parseStrToDouble(rightVal.toString());
-        return switch (opType) {
-            case AlertExpressionParser.GT -> left > right;
-            case AlertExpressionParser.GE -> left >= right;
-            case AlertExpressionParser.LT -> left < right;
-            case AlertExpressionParser.LE -> left <= right;
-            case AlertExpressionParser.EQ -> left == right;
-            case AlertExpressionParser.NE -> left != right;
-            default -> false;
-        };
-    }
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/expr/AlertExpressionVisitor.java

@@ -26,13 +26,12 @@ import org.antlr.v4.runtime.tree.ParseTreeVisitor;
  * by {@link AlertExpressionParser}.
  *
  * @param <T> The return type of the visit operation. Use {@link Void} for
- *            operations with no return type.
+ * operations with no return type.
  */
 public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#expression}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -41,7 +40,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code AndExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -50,7 +48,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code ComparisonExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -59,7 +56,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code UnlessExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -68,7 +64,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code SqlExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -77,7 +72,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code SqlCallExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -86,7 +80,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code LiteralExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -95,7 +88,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code ParenExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -104,7 +96,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code PromqlCallExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -113,7 +104,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code PromqlExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -122,7 +112,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
     /**
      * Visit a parse tree produced by the {@code OrExpr}
      * labeled alternative in {@link AlertExpressionParser#expr}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -130,7 +119,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#functionCall}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -138,7 +126,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#parameterList}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -146,7 +133,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#parameter}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -154,7 +140,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#number}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -162,7 +147,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#string}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -170,7 +154,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#duration}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -178,7 +161,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#functionName}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -186,7 +168,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#selectSql}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -194,7 +175,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#selectFieldList}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -202,7 +182,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#selectField}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -210,7 +189,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#groupByList}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -218,7 +196,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#orderByList}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -226,7 +203,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#orderByField}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -234,7 +210,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#limitClause}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -242,7 +217,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#relList}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -250,7 +224,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#relation}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -258,7 +231,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#conditionList}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -266,7 +238,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#compOp}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -274,7 +245,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#condition}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -282,7 +252,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#conditionUnit}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -290,7 +259,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#promql}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -298,7 +266,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#metricSelector}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -306,7 +273,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherList}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -314,7 +280,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherItem}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -322,7 +287,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#labelMatcherOp}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -330,7 +294,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#labelList}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -338,7 +301,6 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#instantVectorOp}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
@@ -346,9 +308,15 @@ public interface AlertExpressionVisitor<T> extends ParseTreeVisitor<T> {
 
     /**
      * Visit a parse tree produced by {@link AlertExpressionParser#aggregationOperator}.
-     *
      * @param ctx the parse tree
      * @return the visitor result
      */
     T visitAggregationOperator(AlertExpressionParser.AggregationOperatorContext ctx);
+
+    /**
+     * Visit a parse tree produced by {@link AlertExpressionParser#binaryOperator}.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    T visitBinaryOperator(AlertExpressionParser.BinaryOperatorContext ctx);
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/AlertDefineService.java

@@ -18,15 +18,12 @@
 package org.apache.hertzbeat.alert.service;
 
 import jakarta.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Set;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
-import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
 import org.springframework.data.domain.Page;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * Alarm define manager service
  */
@@ -110,11 +107,5 @@ public interface AlertDefineService {
      * @return Real-time alarm definition list
      */
     List<AlertDefine> getRealTimeAlertDefines();
-
-    /**
-     * Get define preview
-     * @return Data queried based on expressions
-     * @throws AlertExpressionException expression error
-     */
-    List<Map<String, Object>> getDefinePreview(String datasource, String type, String expr);
+    
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineAbstractImExportServiceImpl.java

@@ -28,9 +28,6 @@ import org.apache.hertzbeat.alert.dto.ExportAlertDefineDTO;
 import org.apache.hertzbeat.alert.service.AlertDefineImExportService;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
-import org.apache.hertzbeat.common.util.LogUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.util.CollectionUtils;
@@ -44,15 +41,12 @@ public abstract class AlertDefineAbstractImExportServiceImpl implements AlertDef
     @Lazy
     private AlertDefineService alertDefineService;
 
-    private static final Logger logger = LoggerFactory.getLogger(AlertDefineAbstractImExportServiceImpl.class);
-
     @Override
     public void importConfig(InputStream is) {
         var formList = parseImport(is)
                 .stream()
                 .map(this::convert)
                 .toList();
-        LogUtil.info(logger, "Importing alert defines from {0}", formList);
         if (!CollectionUtils.isEmpty(formList)) {
             formList.forEach(alertDefine -> {
                 alertDefineService.validate(alertDefine, false);

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java

@@ -17,6 +17,7 @@
 
 package org.apache.hertzbeat.alert.service.impl;
 
+import static org.apache.hertzbeat.common.constants.CommonConstants.ALERT_THRESHOLD_TYPE_REALTIME;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -28,9 +29,7 @@ import org.apache.hertzbeat.alert.calculate.PeriodicAlertRuleScheduler;
 import org.apache.hertzbeat.alert.dao.AlertDefineDao;
 import org.apache.hertzbeat.alert.service.AlertDefineImExportService;
 import org.apache.hertzbeat.alert.service.AlertDefineService;
-import org.apache.hertzbeat.alert.service.DataSourceService;
 import org.apache.hertzbeat.common.cache.CacheFactory;
-import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.constants.ExportFileConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
@@ -73,21 +72,18 @@ public class AlertDefineServiceImpl implements AlertDefineService {
     @Autowired
     private PeriodicAlertRuleScheduler periodicAlertRuleScheduler;
 
-    private final DataSourceService dataSourceService;
-
     private final Map<String, AlertDefineImExportService> alertDefineImExportServiceMap = new HashMap<>();
 
     private static final String CONTENT_TYPE = MediaType.APPLICATION_OCTET_STREAM_VALUE + SignConstants.SINGLE_MARK + "charset=" + StandardCharsets.UTF_8;
 
-    public AlertDefineServiceImpl(List<AlertDefineImExportService> alertDefineImExportServiceList, DataSourceService dataSourceService) {
+    public AlertDefineServiceImpl(List<AlertDefineImExportService> alertDefineImExportServiceList) {
         alertDefineImExportServiceList.forEach(it -> alertDefineImExportServiceMap.put(it.type(), it));
-        this.dataSourceService = dataSourceService;
     }
 
     @Override
     public void validate(AlertDefine alertDefine, boolean isModify) throws IllegalArgumentException {
         if (StringUtils.hasText(alertDefine.getExpr())) {
-            if (CommonConstants.ALERT_THRESHOLD_TYPE_REALTIME.equals(alertDefine.getType())) {
+            if (ALERT_THRESHOLD_TYPE_REALTIME.equals(alertDefine.getType())) {
                 try {
                     JexlExpressionRunner.compile(alertDefine.getExpr());
                 } catch (Exception e) {
@@ -217,23 +213,9 @@ public class AlertDefineServiceImpl implements AlertDefineService {
     public List<AlertDefine> getRealTimeAlertDefines() {
         List<AlertDefine> alertDefines = CacheFactory.getAlertDefineCache();
         if (alertDefines == null) {
-            alertDefines = alertDefineDao.findAlertDefinesByTypeAndEnableTrue(CommonConstants.ALERT_THRESHOLD_TYPE_REALTIME);
+            alertDefines = alertDefineDao.findAlertDefinesByTypeAndEnableTrue(ALERT_THRESHOLD_TYPE_REALTIME);
             CacheFactory.setAlertDefineCache(alertDefines);
         }
         return alertDefines;
     }
-
-    @Override
-    public List<Map<String, Object>> getDefinePreview(String datasource, String type, String expr) {
-        if (!StringUtils.hasText(expr) || !StringUtils.hasText(datasource) || !StringUtils.hasText(type)) {
-            return Collections.emptyList();
-        }
-        switch (type) {
-            case CommonConstants.ALERT_THRESHOLD_TYPE_PERIODIC:
-                return dataSourceService.calculate(datasource, expr);
-            default:
-                log.error("Get define preview unsupported type: {}", type);
-                return Collections.emptyList();
-        }
-    }
 }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlibabaSmsClientImpl.java

@@ -27,14 +27,11 @@ import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver;
 import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate;
 import org.apache.hertzbeat.common.support.exception.SendMessageException;
 import org.apache.hertzbeat.common.util.JsonUtil;
-import org.apache.hertzbeat.common.util.LogUtil;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
@@ -65,7 +62,6 @@ public class AlibabaSmsClientImpl implements SmsClient {
     private final String accessKeySecret;
     private final String signName;
     private final String templateCode;
-    private static final Logger logger = LoggerFactory.getLogger(AlibabaSmsClientImpl.class);
 
     public AlibabaSmsClientImpl(AlibabaSmsProperties config) {
         if (config != null) {
@@ -177,7 +173,7 @@ public class AlibabaSmsClientImpl implements SmsClient {
                 log.info("Successfully sent SMS to phone: {}", phoneNumber);
             }
         } catch (Exception e) {
-            LogUtil.warn(logger, "Failed to send SMS: {0}", e.getMessage());
+            log.warn("Failed to send SMS: {}", e.getMessage());
             throw new SendMessageException(e.getMessage());
         }
     }
@@ -196,7 +192,6 @@ public class AlibabaSmsClientImpl implements SmsClient {
             // Step 4: Build authorization header
             return ALGORITHM + " Credential=" + accessKeyId + ",SignedHeaders=host;x-acs-action;x-acs-content-sha256;x-acs-date;" + "x-acs-signature-nonce;x-acs-version,Signature=" + signature;
         } catch (Exception e) {
-            LogUtil.warn(logger, "Failed to calculate authorization {0}", e.getMessage());
             throw new RuntimeException("Failed to calculate authorization", e);
         }
     }

hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/DataSourceServiceImpl.java

@@ -24,14 +24,11 @@ import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import org.antlr.v4.runtime.CharStreams;
 import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.apache.hertzbeat.alert.expr.AlertExpressionEvalVisitor;
 import org.apache.hertzbeat.alert.expr.AlertExpressionLexer;
 import org.apache.hertzbeat.alert.expr.AlertExpressionParser;
 import org.apache.hertzbeat.alert.service.DataSourceService;
-import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
-import org.apache.hertzbeat.common.util.ResourceBundleUtil;
 import org.apache.hertzbeat.warehouse.db.QueryExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,7 +36,6 @@ import org.springframework.util.StringUtils;
 
 import java.util.List;
 import java.util.Map;
-import java.util.ResourceBundle;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -49,8 +45,6 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 public class DataSourceServiceImpl implements DataSourceService {
 
-    protected ResourceBundle bundle = ResourceBundleUtil.getBundle("alerter");
-
     @Setter
     @Autowired(required = false)
     private List<QueryExecutor> executors;
@@ -75,7 +69,7 @@ public class DataSourceServiceImpl implements DataSourceService {
             throw new IllegalArgumentException("Empty expression");
         }
         if (executors == null || executors.isEmpty()) {
-            throw new IllegalArgumentException(bundle.getString("alerter.datasource.executor.not.found"));
+            throw new IllegalArgumentException("No query executor found");
         }
         QueryExecutor executor = executors.stream().filter(e -> e.support(datasource)).findFirst().orElse(null);
 
@@ -86,9 +80,6 @@ public class DataSourceServiceImpl implements DataSourceService {
         expr = expr.replaceAll("\\s+", " ");
         try {
             return evaluate(expr, executor);
-        } catch (AlertExpressionException ae) {
-            log.error("Calculate query parse error {}: {}", datasource, ae.getMessage());
-            throw ae;
         } catch (Exception e) {
             log.error("Error executing query on datasource {}: {}", datasource, e.getMessage());
             throw new RuntimeException("Query execution failed", e);
@@ -99,11 +90,9 @@ public class DataSourceServiceImpl implements DataSourceService {
         CommonTokenStream tokens = tokenStreamCache.get(expr, this::createTokenStream);
         AlertExpressionParser parser = new AlertExpressionParser(tokens);
         ParseTree tree = expressionCache.get(expr, e -> parser.expr());
-        if (null != tokens && tokens.LA(1) != Token.EOF) {
-            throw new AlertExpressionException(bundle.getString("alerter.calculate.parse.error"));
-        }
         AlertExpressionEvalVisitor visitor = new AlertExpressionEvalVisitor(executor, tokens);
         return visitor.visit(tree);
+
     }
 
     private CommonTokenStream createTokenStream(String expr) {

hertzbeat-alerter/src/main/resources/alerter_en_US.properties

@@ -32,5 +32,3 @@ alerter.notify.console = Console Login
 alerter.priority.0 = Emergency Alert
 alerter.priority.1 = Critical Alert
 alerter.priority.2 = Warning Alert
-alerter.calculate.parse.error = Expression is not fully parsed, may have syntax errors or incomplete inputs
-alerter.datasource.executor.not.found = No query executor found

hertzbeat-alerter/src/main/resources/alerter_zh_CN.properties

@@ -32,5 +32,3 @@ alerter.notify.console = 登入控制台
 alerter.priority.0 = 紧急告警
 alerter.priority.1 = 严重告警
 alerter.priority.2 = 警告告警
-alerter.calculate.parse.error = 表达式未完全解析，可能存在语法错误或输入不完整
-alerter.datasource.executor.not.found = 未找到查询执行器

hertzbeat-alerter/src/main/resources/alerter_zh_TW.properties

@@ -32,5 +32,3 @@ alerter.notify.console = 控制台登錄
 alerter.priority.0 = 緊急警報
 alerter.priority.1 = 嚴重警報
 alerter.priority.2 = 警告警報
-alerter.calculate.parse.error = 表達式未完全解析，可能存在語法錯誤或輸入不完整
-alerter.datasource.executor.not.found = 未找到查詢執行器

hertzbeat-alerter/src/main/resources/expr/AlertExpression.g4

@@ -23,7 +23,7 @@ expression
 
 expr
     : LPAREN expr RPAREN                                          # ParenExpr
-    | left=expr op=(GE|LE|GT|LT|EQ|NE) BOOL? right=expr          # ComparisonExpr
+    | left=expr op=(GE|LE|GT|LT|EQ|NE) right=expr                 # ComparisonExpr
     | left=expr AND right=expr                                    # AndExpr
     | left=expr UNLESS right=expr                                 # UnlessExpr
     | left=expr OR right=expr                                     # OrExpr
@@ -191,6 +191,11 @@ aggregationOperator
     : SUM | AVG | COUNT | MIN | MAX | STDDEV | STDVAR | TOPK | BOTTOMK | QUANTILE
     ;
 
+binaryOperator
+    : EQ | NE | GT | LT | GE | LE
+    | AND | OR | UNLESS
+    ;
+
 // Lexer rules
 
 // Boolean operators
@@ -254,7 +259,6 @@ LT      : '<' ;
 LE      : '<=' ;
 EQ      : '==' | '=' ;
 NE      : '!=' ;
-BOOL    : 'bool';
 
 // Delimiters
 LPAREN  : '(' ;

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/calculate/AlarmCacheManagerTest.java

@@ -1,135 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.calculate;
-
-import org.apache.hertzbeat.alert.dao.SingleAlertDao;
-import org.apache.hertzbeat.alert.util.AlertUtil;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.when;
-
-/**
- * alert cache manager test
- */
-@ExtendWith(MockitoExtension.class)
-public class AlarmCacheManagerTest {
-
-    @Mock
-    private SingleAlertDao singleAlertDao;
-
-    private AlarmCacheManager alarmCacheManager;
-
-    @BeforeEach
-    public void setUp() {
-        Map<String, String> labels = new HashMap<>();
-        labels.put(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL);
-        labels.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(1L));
-        SingleAlert alert = new SingleAlert();
-        alert.setContent("Alert cache manager test");
-        alert.setLabels(labels);
-        when(singleAlertDao.querySingleAlertsByStatus(CommonConstants.ALERT_STATUS_FIRING)).thenReturn(Collections.singletonList(alert));
-        alarmCacheManager = new AlarmCacheManager(singleAlertDao);
-    }
-
-    @Test
-    void testInit() {
-        Map<String, String> labels = new HashMap<>();
-        labels.put(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL);
-        labels.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(1L));
-
-        String fingerprint = AlertUtil.calculateFingerprint(labels);
-        SingleAlert firingSingleAlert = alarmCacheManager.getFiring(1L, fingerprint);
-        assertNotNull(firingSingleAlert);
-        assertEquals("Alert cache manager test", firingSingleAlert.getContent());
-        alarmCacheManager.removeFiring(1L, fingerprint);
-        firingSingleAlert = alarmCacheManager.getFiring(1L, fingerprint);
-        assertNull(firingSingleAlert);
-    }
-
-    @Test
-    void testPending() {
-        Map<String, String> labels = new HashMap<>();
-        labels.put(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL);
-        labels.put(CommonConstants.ALERT_SEVERITY_INFO, CommonConstants.ALERT_STATUS_PENDING);
-        labels.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(2L));
-
-        SingleAlert alert = new SingleAlert();
-        alert.setContent("Alert cache manager test");
-        alert.setLabels(labels);
-
-        String fingerprint = AlertUtil.calculateFingerprint(alert.getLabels());
-        alarmCacheManager.putPending(2L, fingerprint, alert);
-
-        SingleAlert pendingSingleAlert = alarmCacheManager.getPending(2L, fingerprint);
-        assertNotNull(pendingSingleAlert);
-        alarmCacheManager.removePending(2L, fingerprint);
-        pendingSingleAlert = alarmCacheManager.getPending(2L, fingerprint);
-        assertNull(pendingSingleAlert);
-    }
-
-    @Test
-    void testFiring() {
-        Map<String, String> labels = new HashMap<>();
-        labels.put(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL);
-        labels.put(CommonConstants.ALERT_SEVERITY_INFO, CommonConstants.ALERT_STATUS_PENDING);
-        labels.put(CommonConstants.LABEL_DEFINE_ID, String.valueOf(3L));
-
-        SingleAlert alert = new SingleAlert();
-        alert.setContent("Alert cache manager test");
-        alert.setLabels(labels);
-
-        String fingerprint = AlertUtil.calculateFingerprint(alert.getLabels());
-        alarmCacheManager.putFiring(3L, fingerprint, alert);
-
-        SingleAlert firingSingleAlert = alarmCacheManager.getFiring(3L, fingerprint);
-        assertNotNull(firingSingleAlert);
-        alarmCacheManager.removeFiring(3L, fingerprint);
-        firingSingleAlert = alarmCacheManager.getFiring(3L, fingerprint);
-        assertNull(firingSingleAlert);
-    }
-
-    @Test
-    void testHistorical() {
-        SingleAlert alert = new SingleAlert();
-        alert.setContent("Alert cache manager test");
-        alert.setLabels(Collections.singletonMap(CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_SEVERITY_CRITICAL));
-        when(singleAlertDao.querySingleAlertsByStatus(CommonConstants.ALERT_STATUS_FIRING)).thenReturn(Collections.singletonList(alert));
-        alarmCacheManager = new AlarmCacheManager(singleAlertDao);
-
-        String fingerprint = AlertUtil.calculateFingerprint(alert.getLabels());
-        SingleAlert historicalSingleAlert = alarmCacheManager.getFiring(4L, fingerprint);
-        assertNotNull(historicalSingleAlert);
-        SingleAlert singleAlert = alarmCacheManager.removeFiring(4L, fingerprint);
-        assertNotNull(singleAlert);
-        historicalSingleAlert = alarmCacheManager.getFiring(4L, fingerprint);
-        assertNull(historicalSingleAlert);
-    }
-}

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/calculate/CollectorAlertHandlerTest.java

@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.alert.calculate;
-
-import org.apache.hertzbeat.alert.dao.AlertCollectorDao;
-import org.apache.hertzbeat.alert.dao.SingleAlertDao;
-import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce;
-import org.apache.hertzbeat.alert.util.AlertUtil;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.alerter.SingleAlert;
-import org.apache.hertzbeat.common.entity.manager.Collector;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-/**
- * Collector alert handler test
- */
-@ExtendWith(MockitoExtension.class)
-public class CollectorAlertHandlerTest {
-
-    @Mock
-    private AlertCollectorDao alertCollectorDao;
-
-    @Mock
-    private SingleAlertDao singleAlertDao;
-
-    @Mock
-    private AlarmCommonReduce alarmCommonReduce;
-
-    private AlarmCacheManager alarmCacheManager;
-
-    private CollectorAlertHandler collectorAlertHandler;
-
-    @BeforeEach
-    void setUp() {
-        alarmCacheManager = Mockito.spy(new AlarmCacheManager(singleAlertDao));
-        collectorAlertHandler = new CollectorAlertHandler(alarmCommonReduce, alertCollectorDao, alarmCacheManager);
-    }
-
-    @Test
-    public void testOnline() {
-        String identity = "localhost-collector";
-        Collector collector = Collector.builder()
-                .name(identity)
-                .ip("127.0.0.1")
-                .version("1.0")
-                .build();
-        SingleAlert singleAlert = SingleAlert.builder().build();
-
-        when(alertCollectorDao.findCollectorByName(any(String.class))).thenReturn(collector);
-        when(alarmCacheManager.removeFiring(any(String.class))).thenReturn(singleAlert);
-
-        collectorAlertHandler.online(identity);
-
-        assertEquals(CommonConstants.ALERT_STATUS_RESOLVED, singleAlert.getStatus());
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    public void testOffline() {
-        String identity = "localhost-collector";
-        Collector collector = Collector.builder()
-                .name(identity)
-                .ip("127.0.0.1")
-                .version("1.0")
-                .build();
-
-        when(alertCollectorDao.findCollectorByName(any(String.class))).thenReturn(collector);
-        when(alarmCacheManager.getFiring(any(String.class))).thenReturn(null);
-
-        collectorAlertHandler.offline(identity);
-
-        verify(alarmCacheManager, times(1)).putFiring(any(String.class), any(SingleAlert.class));
-        verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any(SingleAlert.class));
-    }
-
-    @Test
-    void testOfflineAndOnlineLifecycle() {
-        String identity = "localhost-collector";
-        Collector collector = Collector.builder()
-                .name(identity)
-                .ip("127.0.0.1")
-                .version("1.0")
-                .build();
-
-        Map<String, String> fingerPrints = new HashMap<>(8);
-        fingerPrints.put("collectorName", collector.getName());
-        fingerPrints.put("collectorVersion", collector.getVersion());
-        fingerPrints.put("collectorHost", collector.getIp());
-        String fingerprint = AlertUtil.calculateFingerprint(fingerPrints);
-
-        when(alertCollectorDao.findCollectorByName(identity)).thenReturn(collector);
-
-        // step1. first time offline
-        collectorAlertHandler.offline(identity);
-        assertNotNull(alarmCacheManager.getFiring(fingerprint));
-
-        // step2. online
-        collectorAlertHandler.online(identity);
-        assertNull(alarmCacheManager.getFiring(fingerprint));
-
-        // step3. second time offline
-        collectorAlertHandler.offline(identity);
-        assertNotNull(alarmCacheManager.getFiring(fingerprint));
-
-        // Verify that the push status is correct.
-        ArgumentCaptor<SingleAlert> captor = ArgumentCaptor.forClass(SingleAlert.class);
-        verify(alarmCommonReduce, atLeast(3)).reduceAndSendAlarm(captor.capture());
-        List<SingleAlert> alerts = captor.getAllValues();
-        assertEquals(CommonConstants.ALERT_STATUS_FIRING, alerts.get(0).getStatus());
-        assertEquals(CommonConstants.ALERT_STATUS_RESOLVED, alerts.get(1).getStatus());
-        assertEquals(CommonConstants.ALERT_STATUS_FIRING, alerts.get(2).getStatus());
-    }
-}

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/calculate/PeriodicAlertCalculatorTest.java

@@ -42,7 +42,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -93,12 +92,12 @@ class PeriodicAlertCalculatorTest {
         result.put("__value__", 95.0); // Non-null, matched with threshold
         result.put("__timestamp__", System.currentTimeMillis());
         when(dataSourceService.calculate(anyString(), anyString())).thenReturn(List.of(result));
-        when(alarmCacheManager.getPending(eq(rule.getId()), anyString())).thenReturn(null);
+        when(alarmCacheManager.getPending(anyString())).thenReturn(null);
         periodicAlertCalculator.calculate(rule);
         // Verify that putFiring is called
         ArgumentCaptor<String> idCaptor = ArgumentCaptor.forClass(String.class);
         ArgumentCaptor<SingleAlert> alertCaptor = ArgumentCaptor.forClass(SingleAlert.class);
-        verify(alarmCacheManager).putFiring(eq(rule.getId()), idCaptor.capture(), alertCaptor.capture());
+        verify(alarmCacheManager).putFiring(idCaptor.capture(), alertCaptor.capture());
         // Assertion alarm status and content
         SingleAlert alert = alertCaptor.getValue();
         assertAll(() -> assertEquals(CommonConstants.ALERT_STATUS_FIRING, alert.getStatus()),
@@ -113,7 +112,7 @@ class PeriodicAlertCalculatorTest {
         result.put("__timestamp__", System.currentTimeMillis());
         when(dataSourceService.calculate(anyString(), anyString())).thenReturn(List.of(result));
         periodicAlertCalculator.calculate(rule);
-        verify(alarmCacheManager, times(0)).putFiring(any(), any(), any());
+        verify(alarmCacheManager, times(0)).putFiring(any(), any());
     }
 
     @Test
@@ -127,7 +126,7 @@ class PeriodicAlertCalculatorTest {
                 .triggerTimes(2).startAt(System.currentTimeMillis() - 60000)
                 .activeAt(System.currentTimeMillis() - 30000)
                 .build();
-        when(alarmCacheManager.removeFiring(eq(rule.getId()), anyString())).thenReturn(pendingAlert);
+        when(alarmCacheManager.removeFiring(anyString())).thenReturn(pendingAlert);
         when(dataSourceService.calculate(anyString(), anyString())).thenReturn(List.of(result));
         periodicAlertCalculator.calculate(rule);
         ArgumentCaptor<SingleAlert> resolvedCaptor = ArgumentCaptor.forClass(SingleAlert.class);

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/calculate/RealTimeAlertCalculatorMatchTest.java

@@ -132,7 +132,6 @@ public class RealTimeAlertCalculatorMatchTest {
 
 
         AlertDefine matchDefine = new AlertDefine();
-        matchDefine.setId(1L);
         matchDefine.setName("test");
         matchDefine.setExpr(
             "equals(__app__,\"prometheus\") && "
@@ -152,8 +151,8 @@ public class RealTimeAlertCalculatorMatchTest {
 
         Thread.sleep(3000);
 
-        verify(alarmCacheManager, times(1)).getPending(any(), any());
-        verify(alarmCacheManager, times(1)).putFiring(any(), any(), any());
+        verify(alarmCacheManager, times(1)).getPending(any());
+        verify(alarmCacheManager, times(1)).putFiring(any(), any());
         verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any());
     }
 
@@ -181,7 +180,6 @@ public class RealTimeAlertCalculatorMatchTest {
         CollectRep.MetricsData metricsData = builder.build();
 
         AlertDefine matchDefine = new AlertDefine();
-        matchDefine.setId(1L);
         matchDefine.setName("test");
         matchDefine.setExpr("equals(__app__,\"prometheus\") && equals(__metrics__,\"canal_instance\") && metric_value > 0");
         matchDefine.setTemplate("Canal instance val: ${value}%");
@@ -196,8 +194,8 @@ public class RealTimeAlertCalculatorMatchTest {
 
         Thread.sleep(3000);
 
-        verify(alarmCacheManager, times(1)).getPending(any(), any());
-        verify(alarmCacheManager, times(1)).putFiring(any(), any(), any());
+        verify(alarmCacheManager, times(1)).getPending(any());
+        verify(alarmCacheManager, times(1)).putFiring(any(), any());
         verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any());
     }
 
@@ -231,7 +229,6 @@ public class RealTimeAlertCalculatorMatchTest {
         CollectRep.MetricsData metricsData = builder.build();
 
         AlertDefine matchDefine = new AlertDefine();
-        matchDefine.setId(1L);
         matchDefine.setName("test");
         matchDefine.setExpr("equals(__app__,\"springboot3\") && equals(__metrics__,\"available\") && equals(__instance__, \"518679137103104\") && responseTime > 0");
         matchDefine.setTemplate("Canal instance val: ${value}%");
@@ -246,8 +243,8 @@ public class RealTimeAlertCalculatorMatchTest {
 
         Thread.sleep(3000);
 
-        verify(alarmCacheManager, times(1)).getPending(any(), any());
-        verify(alarmCacheManager, times(1)).putFiring(any(), any(), any());
+        verify(alarmCacheManager, times(1)).getPending(any());
+        verify(alarmCacheManager, times(1)).putFiring(any(), any());
         verify(alarmCommonReduce, times(1)).reduceAndSendAlarm(any());
     }
 

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/controller/AlertDefineControllerTest.java

@@ -17,22 +17,15 @@
 
 package org.apache.hertzbeat.alert.controller;
 
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
 import org.apache.hertzbeat.alert.service.impl.AlertDefineServiceImpl;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefine;
 import org.apache.hertzbeat.common.entity.alerter.AlertDefineMonitorBind;
 import org.apache.hertzbeat.common.entity.manager.Monitor;
-import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -107,37 +100,6 @@ class AlertDefineControllerTest {
                 .andReturn();
     }
 
-    @Test
-    void testGetDefinePreview() throws Exception {
-        List<Map<String, Object>> previewData = new ArrayList<>();
-        Map<String, Object> row = new HashMap<>();
-        row.put("__value__", 123);
-        row.put("job", "spring-boot");
-        previewData.add(row);
-
-        Mockito.when(alertDefineService.getDefinePreview(anyString(), anyString(), anyString()))
-                .thenReturn(previewData);
-
-        mockMvc.perform(MockMvcRequestBuilders.get("/api/alert/define/preview/{datasource}", "promql")
-                        .param("type", "periodic")
-                        .param("expr", "up == 1"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.code").value(0))
-                .andExpect(jsonPath("$.data[0].__value__").value(123))
-                .andExpect(jsonPath("$.data[0].job").value("spring-boot"));
-
-        Mockito.when(alertDefineService.getDefinePreview(anyString(), anyString(), anyString()))
-                .thenThrow(new AlertExpressionException("Expression error"));
-
-        mockMvc.perform(MockMvcRequestBuilders.get("/api/alert/define/preview/{datasource}", "promql")
-                        .param("type", "periodic")
-                        .param("expr", "http_server_requests_seconds_count{!@~!!#$%^&}"))
-                .andExpect(status().isBadRequest())
-                .andExpect(jsonPath("$.code").exists())
-                .andExpect(jsonPath("$.msg").value("Expression error"));
-
-    }
-
     @Test
     void modifyAlertDefine() throws Exception {
         mockMvc.perform(MockMvcRequestBuilders.put("/api/alert/define")

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/expr/AlertExpressionEvalVisitorTest.java

@@ -181,10 +181,12 @@ class AlertExpressionEvalVisitorTest {
                 List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
         // promql
         List<Map<String, Object>> result = evaluate("multi_val > 25");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertEquals(30.0, result.get(0).get("__value__"));
         // sql
         result = evaluate("(select values from multi_metrics where group_id = 'test_group') > 25");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertEquals(30.0, result.get(0).get("__value__"));
     }
 
     @Test
@@ -194,10 +196,12 @@ class AlertExpressionEvalVisitorTest {
                 List.of(new HashMap<>(Map.of("__value__", List.of(10.0, 20.0, 30.0)))));
         // promql
         List<Map<String, Object>> result = evaluate("multi_val < 15");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertEquals(10.0, result.get(0).get("__value__"));
         // sql
         result = evaluate("(select response_times from performance_data where service = 'api') < 15");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertEquals(10.0, result.get(0).get("__value__"));
     }
 
     @Test
@@ -207,10 +211,12 @@ class AlertExpressionEvalVisitorTest {
                 List.of(new HashMap<>(Map.of("__value__", List.of()))));
         // promql
         List<Map<String, Object>> result = evaluate("empty_list > 50");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertNull(result.get(0).get("__value__"));
         // sql
         result = evaluate("(select error_codes from error_log where date = '2024-01-01') > 50");
-        assertEquals(0, result.size());
+        assertEquals(1, result.size());
+        assertNull(result.get(0).get("__value__"));
     }
 
     @Test
@@ -751,118 +757,6 @@ class AlertExpressionEvalVisitorTest {
         assertEquals(16, result.get(1).get("__value__"));
     }
 
-    @Test
-    void testComparisonExpr() {
-        String promql = "3 > bool 2";
-
-        // scalar and scalar
-        List<Map<String, Object>> result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1, result.get(0).get("__value__"));
-
-        // scalar and vector
-        promql = "0 < http_server_requests_seconds_count";
-        Map<String, Object> vector = new HashMap<>() {
-            {
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 1307);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("uri", "/actuator/prometheus");
-                put("status", "200");
-            }
-        };
-        when(mockExecutor.execute("http_server_requests_seconds_count")).thenReturn(List.of(vector));
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1307, result.get(0).get("__value__"));
-
-        // scalar and vector bool
-        promql = "0 < bool http_server_requests_seconds_count";
-        // true
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1, result.get(0).get("__value__"));
-
-        // false
-        vector.put("__value__", -1);
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(0, result.get(0).get("__value__"));
-
-        // vector and scalar
-        promql = "http_server_requests_seconds_sum > 0";
-        vector = new HashMap<>() {
-            {
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 13);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("uri", "/actuator/prometheus");
-                put("status", "200");
-            }
-        };
-        when(mockExecutor.execute("http_server_requests_seconds_sum")).thenReturn(List.of(vector));
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(13, result.get(0).get("__value__"));
-
-        // vector and scalar bool
-        promql = "http_server_requests_seconds_sum > bool 0";
-        // true
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1, result.get(0).get("__value__"));
-        // false
-        vector.put("__value__", -1);
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(0, result.get(0).get("__value__"));
-
-        // vector and vector
-        promql = "http_server_requests_seconds_count > http_server_requests_seconds_sum";
-        Map<String, Object> vectorCount = new HashMap<>() {
-            {
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 13);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("uri", "/actuator/prometheus");
-                put("status", "200");
-            }
-        };
-        Map<String, Object> vectorSum = new HashMap<>() {
-            {
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 10);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("uri", "/actuator/prometheus");
-                put("status", "200");
-            }
-        };
-        when(mockExecutor.execute("http_server_requests_seconds_count")).thenReturn(List.of(vectorCount));
-        when(mockExecutor.execute("http_server_requests_seconds_sum")).thenReturn(List.of(vectorSum));
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(13, result.get(0).get("__value__"));
-
-        // vector and vector bool
-        promql = "http_server_requests_seconds_count > bool http_server_requests_seconds_sum";
-        // true
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(1, result.get(0).get("__value__"));
-        // false
-        vectorCount.put("__value__", 1);
-        result = evaluate(promql);
-        assertEquals(1, result.size());
-        assertEquals(0, result.get(0).get("__value__"));
-    }
 
     private List<Map<String, Object>> evaluate(String expression) {
         AlertExpressionLexer lexer = new AlertExpressionLexer(CharStreams.fromString(expression));

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineServiceTest.java

@@ -17,7 +17,19 @@
 
 package org.apache.hertzbeat.alert.service;
 
-import com.google.common.collect.Lists;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anySet;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
 import org.apache.hertzbeat.alert.calculate.PeriodicAlertRuleScheduler;
 import org.apache.hertzbeat.alert.dao.AlertDefineDao;
 import org.apache.hertzbeat.alert.service.impl.AlertDefineServiceImpl;
@@ -33,27 +45,6 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import static org.apache.hertzbeat.common.constants.CommonConstants.ALERT_THRESHOLD_TYPE_PERIODIC;
-import static org.apache.hertzbeat.common.constants.CommonConstants.ALERT_THRESHOLD_TYPE_REALTIME;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anySet;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.reset;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 /**
  * Test case for {@link AlertDefineService}
  */
@@ -71,9 +62,6 @@ class AlertDefineServiceTest {
     @Mock
     private List<AlertDefineImExportService> alertDefineImExportServiceList;
 
-    @Mock
-    private DataSourceService dataSourceService;
-
     @InjectMocks
     private AlertDefineServiceImpl alertDefineService;
 
@@ -143,36 +131,4 @@ class AlertDefineServiceTest {
         assertNotNull(alertDefineService.getAlertDefines(null, null, "id", "desc", 1, 10));
         verify(alertDefineDao, times(1)).findAll(any(Specification.class), any(PageRequest.class));
     }
-
-    @Test
-    void getDefinePreview() {
-        String expr = "http_server_requests_seconds_count > 10";
-
-        Map<String, Object> countValue1 = new HashMap<>() {
-            {
-                put("exception", "none");
-                put("instance", "host.docker.internal:8989");
-                put("__value__", 1307);
-                put("method", "GET");
-                put("__name__", "http_server_requests_seconds_count");
-                put("__timestamp__", "1.750320922467E9");
-                put("error", "none");
-                put("job", "spring-boot-app");
-                put("uri", "/actuator/prometheus");
-                put("outcome", "SUCCESS");
-                put("status", "200");
-            }
-        };
-        when(dataSourceService.calculate(eq("promql"), eq(expr))).thenReturn(Lists.newArrayList(countValue1));
-        List<Map<String, Object>> result = alertDefineService.getDefinePreview("promql", ALERT_THRESHOLD_TYPE_PERIODIC, expr);
-        assertNotNull(result);
-        assertEquals(1307, result.get(0).get("__value__"));
-
-        result = alertDefineService.getDefinePreview("promql", ALERT_THRESHOLD_TYPE_PERIODIC, null);
-        assertEquals(0, result.size());
-
-        result = alertDefineService.getDefinePreview("promql", ALERT_THRESHOLD_TYPE_REALTIME, null);
-        assertEquals(0, result.size());
-    }
-
 }

hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/DataSourceServiceTest.java

@@ -21,7 +21,6 @@ import com.github.benmanes.caffeine.cache.Cache;
 import org.antlr.v4.runtime.CommonTokenStream;
 import org.antlr.v4.runtime.tree.ParseTree;
 import org.apache.hertzbeat.alert.service.impl.DataSourceServiceImpl;
-import org.apache.hertzbeat.common.support.exception.AlertExpressionException;
 import org.apache.hertzbeat.warehouse.db.QueryExecutor;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -35,9 +34,6 @@ import java.util.Map;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.when;
 
 /**
  * test case for {@link DataSourceService}
@@ -559,6 +555,7 @@ class DataSourceServiceTest {
         tokenStreamCache.invalidateAll();
         long beforeHits = tokenStreamCache.stats().hitCount();
         dataSourceService.calculate("promql", expr);
+        expressionCache.invalidateAll();
         dataSourceService.calculate("promql", expr);
         long actualHits = tokenStreamCache.stats().hitCount() - beforeHits;
         assertEquals(1, actualHits, "expression cache should hit but miss");
@@ -609,34 +606,4 @@ class DataSourceServiceTest {
         long actualHits = tokenStreamCache.stats().hitCount() - beforeHits;
         assertEquals(0, actualHits, "expression cache should miss but hit");
     }
-
-    @Test
-    void testAlertExpressionException() {
-        List<Map<String, Object>> prometheusData = List.of(
-                new HashMap<>() {
-                    {
-                        put("exception", "none");
-                        put("instance", "host.docker.internal:8989");
-                        put("__value__", 1307);
-                        put("method", "GET");
-                        put("__name__", "http_server_requests_seconds_count");
-                        put("__timestamp__", "1.750320922467E9");
-                        put("error", "none");
-                        put("job", "spring-boot-app");
-                        put("uri", "/actuator/prometheus");
-                        put("outcome", "SUCCESS");
-                        put("status", "200");
-                    }
-                });
-        QueryExecutor mockExecutor = Mockito.mock(QueryExecutor.class);
-        when(mockExecutor.support(eq("promql"))).thenReturn(true);
-        when(mockExecutor.execute(eq("http_server_requests_seconds_count"))).thenReturn(prometheusData);
-
-        dataSourceService.setExecutors(List.of(mockExecutor));
-        List<Map<String, Object>> result = dataSourceService.calculate("promql", "http_server_requests_seconds_count > 10");
-        assertNotNull(result);
-        assertEquals(1307, result.get(0).get("__value__"));
-
-        assertThrows(AlertExpressionException.class, () -> dataSourceService.calculate("promql", "http_server_requests_seconds_count{!@~!!#$%^&}"));
-    }
 }

hertzbeat-collector/hertzbeat-collector-basic/pom.xml

@@ -33,7 +33,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <mqtt.version>1.2.5</mqtt.version>
+        <mqtt.version>1.3.3</mqtt.version>
     </properties>
 
     <dependencies>
@@ -140,19 +140,10 @@
         </dependency>
         <!-- mqtt -->
         <dependency>
-            <groupId>org.eclipse.paho</groupId>
-            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
+            <groupId>com.hivemq</groupId>
+            <artifactId>hivemq-mqtt-client</artifactId>
             <version>${mqtt.version}</version>
         </dependency>
-        <!--Bouncy Castle-->
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcpkix-jdk15on</artifactId>
-            <version>1.68</version>
-        </dependency>
-
-
-
         <!--plc-->
         <dependency>
             <groupId>org.apache.plc4x</groupId>

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollect.java

@@ -471,19 +471,19 @@ public class JdbcCommonCollect extends AbstractCollect {
             // remove special characters
             String cleanedUrl = jdbcProtocol.getUrl().replaceAll("[\\x00-\\x1F\\x7F\\xA0]", "");
             String url = recursiveDecode(cleanedUrl);
-            String urlLowerCase = url.toLowerCase();
+            url = url.toLowerCase();
             // url format check
-            if (!urlLowerCase.matches("^jdbc:[a-zA-Z0-9]+:([^\\s;]+)(;[^\\s;]+)*$")) {
+            if (!url.matches("^jdbc:[a-zA-Z0-9]+:([^\\s;]+)(;[^\\s;]+)*$")) {
                 throw new IllegalArgumentException("Invalid JDBC URL format");
             }
             // backlist check
             for (String keyword : BLACK_LIST) {
-                if (urlLowerCase.contains(keyword.toLowerCase())) {
+                if (url.contains(keyword.toLowerCase())) {
                     throw new IllegalArgumentException("Invalid JDBC URL: contains potentially malicious parameter: " + keyword);
                 }
             }
             // universal detection
-            String normalizedUrl = urlLowerCase.replaceAll("[\\x00-\\x1F\\x7F\\xA0]", " ");
+            String normalizedUrl = url.replaceAll("[\\x00-\\x1F\\x7F\\xA0]", " ").toLowerCase();
             // universal detection of JDBC injection and deserialization attacks
             if (normalizedUrl.matches(".*jndi\\s*[:=].*")
                     || normalizedUrl.matches(".*ldap\\s*[:=].*")
@@ -514,7 +514,7 @@ public class JdbcCommonCollect extends AbstractCollect {
                     }
                 }
             }
-            return url;
+            return normalizedUrl;
         }
         assert jdbcProtocol.getPlatform() != null;
         return switch (jdbcProtocol.getPlatform()) {

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImpl.java

@@ -68,7 +68,6 @@ import org.apache.hertzbeat.common.util.Base64Util;
 import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.IpDomainUtil;
 import org.apache.http.Header;
-import org.apache.http.HttpEntity;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpStatus;
 import org.apache.http.auth.AuthScope;
@@ -145,46 +144,37 @@ public class HttpCollectImpl extends AbstractCollect {
                 builder.setMsg(NetworkConstants.STATUS_CODE + SignConstants.BLANK + statusCode);
                 return;
             }
-
-            long responseTime = System.currentTimeMillis() - startTime;
+            /*
+             this could create large objects, potentially impacting JVM memory space significantly.
+             Option 1: Parse using InputStream, but this requires significant code changes;
+             Option 2: Manually trigger garbage collection, similar to how it's done in Dubbo for large inputs.
+             */
+            String resp = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+            if (!StringUtils.hasText(resp)) {
+                log.info("http response entity is empty, status: {}.", statusCode);
+            }
+            Long responseTime = System.currentTimeMillis() - startTime;
             String parseType = metrics.getHttp().getParseType();
-            HttpEntity entity = response.getEntity();
-
             try {
-                if (DispatchConstants.PARSE_PROMETHEUS.equals(parseType)) {
-                    if (entity != null) {
-                        parseResponseByPrometheusExporter(entity.getContent(), metrics.getAliasFields(), builder);
-                    }
-                } else if (DispatchConstants.PARSE_HEADER.equals(parseType)) {
-                    parseResponseByHeader(builder, metrics.getAliasFields(), response);
-                    // Consume entity to release connection
-                    EntityUtils.consumeQuietly(entity);
-                } else {
-                    /*
-                     this could create large objects, potentially impacting JVM memory space significantly.
-                     Option 1: Parse using InputStream, but this requires significant code changes;
-                     Option 2: Manually trigger garbage collection, similar to how it's done in Dubbo for large inputs.
-                     */
-                    String resp = entity == null ? "" : EntityUtils.toString(entity, StandardCharsets.UTF_8);
-                    if (!StringUtils.hasText(resp)) {
-                        log.info("http response entity is empty, status: {}.", statusCode);
-                    }
-                    switch (parseType) {
-                        case DispatchConstants.PARSE_JSON_PATH ->
-                                parseResponseByJsonPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
-                        case DispatchConstants.PARSE_PROM_QL ->
-                                parseResponseByPromQl(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
-                        case DispatchConstants.PARSE_XML_PATH ->
-                                parseResponseByXmlPath(resp, metrics, builder, responseTime);
-                        case DispatchConstants.PARSE_WEBSITE ->
-                                parseResponseByWebsite(resp, metrics, metrics.getHttp(), builder, responseTime, statusCode);
-                        case DispatchConstants.PARSE_SITE_MAP ->
-                                parseResponseBySiteMap(resp, metrics.getAliasFields(), builder);
-                        case DispatchConstants.PARSE_CONFIG ->
-                                parseResponseByConfig(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
-                        default ->
-                                parseResponseByDefault(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
-                    }
+                switch (parseType) {
+                    case DispatchConstants.PARSE_JSON_PATH ->
+                            parseResponseByJsonPath(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
+                    case DispatchConstants.PARSE_PROM_QL ->
+                            parseResponseByPromQl(resp, metrics.getAliasFields(), metrics.getHttp(), builder);
+                    case DispatchConstants.PARSE_PROMETHEUS ->
+                            parseResponseByPrometheusExporter(response.getEntity().getContent(), metrics.getAliasFields(), builder);
+                    case DispatchConstants.PARSE_XML_PATH ->
+                            parseResponseByXmlPath(resp, metrics, builder, responseTime);
+                    case DispatchConstants.PARSE_WEBSITE ->
+                            parseResponseByWebsite(resp, metrics, metrics.getHttp(), builder, responseTime, statusCode);
+                    case DispatchConstants.PARSE_SITE_MAP ->
+                            parseResponseBySiteMap(resp, metrics.getAliasFields(), builder);
+                    case DispatchConstants.PARSE_HEADER ->
+                            parseResponseByHeader(builder, metrics.getAliasFields(), response);
+                    case DispatchConstants.PARSE_CONFIG ->
+                            parseResponseByConfig(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
+                    default ->
+                            parseResponseByDefault(resp, metrics.getAliasFields(), metrics.getHttp(), builder, responseTime);
                 }
             } catch (Exception e) {
                 log.info("parse error: {}.", e.getMessage(), e);
@@ -604,18 +594,6 @@ public class HttpCollectImpl extends AbstractCollect {
                     }
                 }
                 builder.addValueRow(valueRowBuilder.build());
-            } else if (objectValue instanceof Number numberValue) {
-                CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
-                for (String alias : aliasFields) {
-                    if (NetworkConstants.RESPONSE_TIME.equalsIgnoreCase(alias)) {
-                        valueRowBuilder.addColumn(responseTime.toString());
-                    } else if (CollectorConstants.KEYWORD.equalsIgnoreCase(alias)) {
-                        valueRowBuilder.addColumn(Integer.toString(keywordNum));
-                    } else {
-                        valueRowBuilder.addColumn(numberValue.toString());
-                    }
-                }
-                builder.addValueRow(valueRowBuilder.build());
             }
         }
     }
@@ -878,4 +856,4 @@ public class HttpCollectImpl extends AbstractCollect {
         }
         return successCodeSet.contains(statusCode);
     }
-}
+}

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/jmx/JmxCollectImpl.java

@@ -42,6 +42,7 @@ import javax.management.remote.JMXServiceURL;
 import javax.management.remote.rmi.RMIConnectorServer;
 import javax.naming.Context;
 import javax.rmi.ssl.SslRMIClientSocketFactory;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.collect.AbstractCollect;
 import org.apache.hertzbeat.collector.collect.common.cache.AbstractConnection;
 import org.apache.hertzbeat.collector.collect.common.cache.CacheIdentifier;
@@ -53,15 +54,13 @@ import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.JmxProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.util.CommonUtil;
-import org.apache.hertzbeat.common.util.LogUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 /**
  * jmx protocol acquisition implementation
  */
+@Slf4j
 public class JmxCollectImpl extends AbstractCollect {
 
     private static final String JMX_URL_PREFIX = "service:jmx:rmi:///jndi/rmi://";
@@ -76,8 +75,6 @@ public class JmxCollectImpl extends AbstractCollect {
 
     private final ClassLoader jmxClassLoader;
 
-    private static final Logger logger = LoggerFactory.getLogger(JmxCollectImpl.class);
-
     public JmxCollectImpl() {
         jmxClassLoader = new JmxClassLoader(ClassLoader.getSystemClassLoader());
     }
@@ -198,12 +195,12 @@ public class JmxCollectImpl extends AbstractCollect {
             }
         } catch (IOException exception) {
             String errorMsg = CommonUtil.getMessageFromThrowable(exception);
-            LogUtil.error(logger, "JMX IOException: {0}", errorMsg);
+            log.error("JMX IOException :{}", errorMsg);
             builder.setCode(CollectRep.Code.UN_CONNECTABLE);
             builder.setMsg(errorMsg);
         } catch (Exception e) {
             String errorMsg = CommonUtil.getMessageFromThrowable(e);
-            LogUtil.error(logger, "JMX Error: {0}", errorMsg);
+            log.error("JMX Error :{}", errorMsg);
             builder.setCode(CollectRep.Code.FAIL);
             builder.setMsg(errorMsg);
         } finally {
@@ -224,7 +221,7 @@ public class JmxCollectImpl extends AbstractCollect {
         for (Attribute attribute : attributeList.asList()) {
             Object value = attribute.getValue();
             if (value == null) {
-                LogUtil.info(logger, "attribute {0} value is null.", attribute.getName());
+                log.info("attribute {} value is null.", attribute.getName());
                 continue;
             }
             if (value instanceof Number || value instanceof String || value instanceof ObjectName
@@ -248,7 +245,7 @@ public class JmxCollectImpl extends AbstractCollect {
                 }
                 attributeValueMap.put(attribute.getName(), builder.toString());
             } else {
-                LogUtil.warn(logger, "attribute value type {0} not support.", value.getClass().getName());
+                log.warn("attribute value type {} not support.", value.getClass().getName());
             }
         }
         return attributeValueMap;
@@ -322,7 +319,7 @@ public class JmxCollectImpl extends AbstractCollect {
             connectionCommonCache.addCache(identifier, new JmxConnect(conn));
             return conn;
         } catch (Exception e) {
-            LogUtil.error(logger, "Failed to connect to JMX connection: {0}", e.getMessage());
+            log.error("Failed to connect to JMX server: {}", e.getMessage());
             throw new IOException("Failed to connect to JMX server: " + e.getMessage(), e);
         }
     }

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/mqtt/CertificateFormatter.java

@@ -1,195 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.collector.collect.mqtt;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Formats the private key and certificate, supporting concatenation of multiple certificates in PEM format.
- */
-public class CertificateFormatter {
-
-    public static String formatCertificateChain(String input) {
-        if (input == null || input.trim().isEmpty()) {
-            return input;
-        }
-
-        String normalized = normalizeInput(input);
-
-        List<String> certificates = extractCertificates(normalized);
-
-        if (certificates.isEmpty()) {
-            return formatAsSingleCertificate(normalized);
-        }
-
-        StringBuilder formattedChain = new StringBuilder();
-        for (String cert : certificates) {
-            if (cert.trim().isEmpty()) continue;
-
-            String formatted = formatPemBlock(cert);
-            formattedChain.append(formatted).append("\n");
-        }
-
-        return formattedChain.toString().trim();
-    }
-
-    private static String normalizeInput(String input) {
-        return input
-                .replace("\r\n", "\n")
-                .replace("\r", "\n")
-                .replaceAll("\\s*\\\\n\\s*", "\n")
-                .replaceAll("(?m)^\\s+|\\s+$", "")
-                .trim();
-    }
-
-    private static List<String> extractCertificates(String input) {
-        List<String> certificates = new ArrayList<>();
-        String regex = "(-----BEGIN\\s+[\\w\\s]+?-----)[\\s\\S]*?(-----END\\s+[\\w\\s]+?-----)";
-
-
-        Pattern pattern = Pattern.compile(regex, Pattern.CASE_INSENSITIVE);
-        Matcher matcher = pattern.matcher(input);
-
-        int lastEnd = 0;
-        while (matcher.find()) {
-
-            if (matcher.start() > lastEnd) {
-                String gap = input.substring(lastEnd, matcher.start());
-                if (!gap.trim().isEmpty()) {
-                    certificates.add(gap);
-                }
-            }
-
-            certificates.add(matcher.group());
-            lastEnd = matcher.end();
-        }
-
-
-        if (lastEnd < input.length()) {
-            certificates.add(input.substring(lastEnd));
-        }
-
-        return certificates;
-    }
-
-    private static String formatPemBlock(String block) {
-        try {
-            Pattern pattern = Pattern.compile(
-                    "(-----BEGIN\\s+[\\w\\s]+?-----)(.*?)(-----END\\s+[\\w\\s]+?-----)",
-                    Pattern.DOTALL | Pattern.CASE_INSENSITIVE
-            );
-
-            Matcher matcher = pattern.matcher(block);
-            if (matcher.find()) {
-                String header = matcher.group(1).trim();
-                String body = matcher.group(2);
-                String footer = matcher.group(3).trim();
-
-
-                if (body == null) body = "";
-
-                String cleanBody = body
-                        .replaceAll("\\s", "")
-                        .replaceAll("\"", "")
-                        .trim();
-
-
-                if (cleanBody.isEmpty() && body != null && !body.trim().isEmpty()) {
-
-                    cleanBody = body.replaceAll("[^a-zA-Z0-9+/=]", "").trim();
-                }
-
-                String formattedBody = formatBase64Body(cleanBody);
-
-                return header + "\n" + formattedBody + "\n" + footer;
-            } else {
-
-                return formatAsCertificate(block);
-            }
-        } catch (Exception e) {
-
-            return block;
-        }
-    }
-
-    private static String formatAsCertificate(String content) {
-
-        String cleanContent = content.replaceAll("[^a-zA-Z0-9+/=]", "").trim();
-
-        if (cleanContent.isEmpty()) {
-            return content;
-        }
-
-
-        String formattedBody = formatBase64Body(cleanContent);
-
-
-        if (cleanContent.toLowerCase().contains("private")) {
-            if (cleanContent.startsWith("MII") || cleanContent.length() > 1000) {
-                return "-----BEGIN PRIVATE KEY-----\n" + formattedBody + "\n-----END PRIVATE KEY-----";
-            } else {
-                return "-----BEGIN RSA PRIVATE KEY-----\n" + formattedBody + "\n-----END RSA PRIVATE KEY-----";
-            }
-        } else {
-            return "-----BEGIN CERTIFICATE-----\n" + formattedBody + "\n-----END CERTIFICATE-----";
-        }
-    }
-
-    private static String formatAsSingleCertificate(String input) {
-        String cleanContent = input.replaceAll("[^a-zA-Z0-9+/=]", "").trim();
-        return formatAsCertificate(cleanContent);
-    }
-
-    private static String formatBase64Body(String body) {
-
-        StringBuilder formatted = new StringBuilder();
-        int index = 0;
-        while (index < body.length()) {
-            int end = Math.min(index + 64, body.length());
-            formatted.append(body.substring(index, end));
-            if (end < body.length()) {
-                formatted.append("\n");
-            }
-            index = end;
-        }
-        return formatted.toString().trim();
-    }
-
-    public static String formatPrivateKey(String input) {
-        if (input == null || input.trim().isEmpty()) {
-            return input;
-        }
-
-
-        String normalized = normalizeInput(input);
-
-
-        if (isPemEncapsulated(normalized)) {
-            return formatPemBlock(normalized);
-        }
-
-        return formatAsCertificate(normalized);
-    }
-
-    private static boolean isPemEncapsulated(String block) {
-        return block.contains("-----BEGIN") && block.contains("-----END");
-    }
-}

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/mqtt/MqttCollectImpl.java

@@ -17,7 +17,26 @@
 
 package org.apache.hertzbeat.collector.collect.mqtt;
 
-
+import com.hivemq.client.mqtt.MqttVersion;
+import com.hivemq.client.mqtt.datatypes.MqttQos;
+import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient;
+import com.hivemq.client.mqtt.mqtt3.Mqtt3Client;
+import com.hivemq.client.mqtt.mqtt3.Mqtt3ClientBuilder;
+import com.hivemq.client.mqtt.mqtt3.message.connect.connack.Mqtt3ConnAck;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5AsyncClient;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5Client;
+import com.hivemq.client.mqtt.mqtt5.Mqtt5ClientBuilder;
+import com.hivemq.client.mqtt.mqtt5.message.connect.connack.Mqtt5ConnAck;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.collector.collect.AbstractCollect;
 import org.apache.hertzbeat.collector.constants.CollectorConstants;
@@ -27,27 +46,13 @@ import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.MqttProtocol;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.entity.message.CollectRep.MetricsData.Builder;
-import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
-import org.eclipse.paho.client.mqttv3.MqttClientPersistence;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.IMqttToken;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.StopWatch;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
 /**
- * collect mqtt metrics using Eclipse Paho
+ * collect mqtt metrics
  */
 public class MqttCollectImpl extends AbstractCollect {
 
@@ -56,224 +61,138 @@ public class MqttCollectImpl extends AbstractCollect {
 
     private static final Logger logger = LoggerFactory.getLogger(MqttCollectImpl.class);
 
-    @Override
-    public String supportProtocol() {
-        return DispatchConstants.PROTOCOL_MQTT;
-    }
-
     @Override
     public void preCheck(Metrics metrics) throws IllegalArgumentException {
         MqttProtocol mqttProtocol = metrics.getMqtt();
         Assert.hasText(mqttProtocol.getHost(), "MQTT protocol host is required");
         Assert.hasText(mqttProtocol.getPort(), "MQTT protocol port is required");
-
-        if ("mqtts".equalsIgnoreCase(mqttProtocol.getProtocol())) {
-            if (Boolean.parseBoolean(mqttProtocol.getEnableMutualAuth())) {
-                Assert.hasText(mqttProtocol.getCaCert(), "CA certificate is required for mutual auth");
-                Assert.hasText(mqttProtocol.getClientCert(), "Client certificate is required for mutual auth");
-                Assert.hasText(mqttProtocol.getClientKey(), "Client private key is required for mutual auth");
-            }
-        }
+        Assert.hasText(mqttProtocol.getProtocolVersion(), "MQTT protocol version is required");
     }
 
     @Override
     public void collect(Builder builder, Metrics metrics) {
+        MqttProtocol mqtt = metrics.getMqtt();
+        String protocolVersion = mqtt.getProtocolVersion();
+        MqttVersion mqttVersion = MqttVersion.valueOf(protocolVersion);
+        if (mqttVersion == MqttVersion.MQTT_3_1_1) {
+            collectWithVersion3(metrics, builder);
+        } else if (mqttVersion == MqttVersion.MQTT_5_0) {
+            collectWithVersion5(metrics, builder);
+        }
+    }
+
+    @Override
+    public String supportProtocol() {
+        return DispatchConstants.PROTOCOL_MQTT;
+    }
+
+    /**
+     * collecting data of MQTT 5
+     */
+    private void collectWithVersion5(Metrics metrics, Builder builder) {
         MqttProtocol mqttProtocol = metrics.getMqtt();
         Map<Object, String> data = new HashMap<>();
-
-        try {
-            MqttAsyncClient client = buildMqttClient(mqttProtocol);
-            long responseTime = connectClient(client, mqttProtocol);
-            testSubscribeAndPublish(client, mqttProtocol, data);
-            convertToMetricsData(builder, metrics, responseTime, data);
-            client.disconnect();
-        } catch (Exception e) {
-            logger.error("MQTT collection error: {}", e.getMessage(), e);
-            builder.setCode(CollectRep.Code.FAIL);
-            builder.setMsg("Collection failed: " + e.getMessage());
-        }
-    }
-
-    private MqttAsyncClient buildMqttClient(MqttProtocol protocol) throws Exception {
-        String clientId = protocol.getClientId();
-
-        String serverUri = String.format("%s://%s:%s",
-                StringUtils.equals(protocol.getProtocol(), "MQTT") ? "tcp" : "ssl",
-                protocol.getHost(),
-                protocol.getPort());
-
-        MqttClientPersistence persistence = new MemoryPersistence();
-
-        return new MqttAsyncClient(serverUri, clientId, persistence);
-    }
-
-    private long connectClient(MqttAsyncClient client, MqttProtocol protocol) throws Exception {
-        MqttConnectOptions connOpts = new MqttConnectOptions();
-
-        if (protocol.hasAuth()) {
-            connOpts.setUserName(protocol.getUsername());
-            connOpts.setPassword(protocol.getPassword().toCharArray());
-        }
-
-        connOpts.setKeepAliveInterval(Integer.parseInt(protocol.getKeepalive()));
-        connOpts.setConnectionTimeout(Integer.parseInt(protocol.getTimeout()) / 1000);
-        connOpts.setCleanSession(true);
-        connOpts.setAutomaticReconnect(false);
-        if ("mqtts".equalsIgnoreCase(protocol.getProtocol())) {
-            boolean insecureSkipVerify = Boolean.parseBoolean(protocol.getInsecureSkipVerify());
-            if (insecureSkipVerify) {
-                connOpts.setHttpsHostnameVerificationEnabled(false);
-            }
-            if (Boolean.parseBoolean(protocol.getEnableMutualAuth())) {
-                connOpts.setSocketFactory(MqttSslFactory.getMslSocketFactory(protocol, insecureSkipVerify));
-            } else {
-                connOpts.setSocketFactory(MqttSslFactory.getSslSocketFactory(protocol, insecureSkipVerify));
-            }
-        }
-
-
-        StopWatch connectWatch = new StopWatch();
-        connectWatch.start();
-
-        client.connect(connOpts).waitForCompletion(Long.parseLong(protocol.getTimeout()));
-        connectWatch.stop();
-        return connectWatch.getTotalTimeMillis();
-    }
-
-
-    /**
-     * Test MQTT subscribe and publish capabilities
-     */
-    private void testSubscribeAndPublish(MqttAsyncClient client, MqttProtocol protocol, Map<Object, String> data) {
-
-        // 1 test subscribe
-        if (StringUtils.isNotBlank(protocol.getTopic())) {
-            String subscribe = testSubscribe(client, protocol.getTopic());
-            if (StringUtils.isBlank(subscribe)) {
-                data.put("canSubscribe", "Subscription successful");
-            } else {
-                data.put("canSubscribe", String.format("Subscription failed: %s", subscribe));
-            }
-
-        } else {
-            data.put("canSubscribe", "No topic, subscription test skipped");
-        }
-
-
-        // 2 test publish
-        if (StringUtils.isNotBlank(protocol.getTestMessage())) {
-            String publish = testPublish(client, protocol.getTopic(), protocol.getTestMessage());
-            if (StringUtils.isBlank(publish)) {
-                data.put("canPublish", "Message published successfully");
-
-                // 3 test receive message
-                String receivedData = getReceivedData(client, protocol.getTopic());
-                data.put("canReceive", receivedData);
-            } else {
-                data.put("canPublish", String.format("Message publishing failed: %s", publish));
-                data.put("canReceive", "Message reception skipped due to failed publish");
-            }
-        } else {
-            data.put("canPublish", "No test message, publish test skipped");
-            data.put("canReceive", "No test message, receive test skipped");
-        }
-
-
-        // 4 test unsubscribe
-        if (StringUtils.isNotBlank(protocol.getTopic())) {
-            String subscribe = testUnSubscribe(client, protocol.getTopic());
-            if (StringUtils.isBlank(subscribe)) {
-                data.put("canUnSubscribe", "Unsubscription successful");
-            } else {
-                data.put("canUnSubscribe", String.format("Unsubscription failed: %s", subscribe));
-            }
-        } else {
-            data.put("canUnSubscribe", "No topic, unsubscription test skipped");
-        }
-    }
-
-    private String getReceivedData(MqttAsyncClient client, String topic) {
-        final CountDownLatch latch = new CountDownLatch(1);
-        final StringBuilder messageHolder = new StringBuilder();
-
-
-        client.setCallback(new MqttCallback() {
-            @Override
-            public void connectionLost(Throwable cause) {
-                latch.countDown();
-            }
-
-            @Override
-            public void messageArrived(String arrivedTopic, MqttMessage message) {
-
-                if (topic.equals(arrivedTopic)) {
-                    messageHolder.append(new String(message.getPayload()));
-                    latch.countDown();
-                }
-            }
-
-            @Override
-            public void deliveryComplete(IMqttDeliveryToken token) {
+        Mqtt5AsyncClient client = buildMqtt5Client(mqttProtocol);
+        long responseTime = connectClient(client, mqtt5AsyncClient -> {
+            CompletableFuture<Mqtt5ConnAck> connectFuture = mqtt5AsyncClient.connect();
+            try {
+                connectFuture.get(Long.parseLong(mqttProtocol.getTimeout()), TimeUnit.MILLISECONDS);
+            } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                builder.setCode(CollectRep.Code.FAIL);
+                builder.setMsg(getErrorMessage(e.getMessage()));
             }
         });
-
-        try {
-            boolean received = latch.await(5, TimeUnit.SECONDS);
-            if (messageHolder.length() > 0) {
-                return messageHolder.toString();
-            } else if (!received) {
-                return "Message reception timed out after 5 seconds";
-            } else {
-                return "No valid message received";
-            }
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            return e.getMessage();
-        } finally {
-            client.setCallback(null);
-        }
-    }
-
-    private String testSubscribe(MqttAsyncClient client, String topic) {
-        try {
-            IMqttToken subToken = client.subscribe(topic, 1);
-            subToken.waitForCompletion(5000);
-            return "";
-        } catch (MqttException e) {
-            logger.warn("MQTT subscribe test failed: {}", e.getMessage());
-            return e.getMessage();
-        }
-    }
-
-    private String testPublish(MqttAsyncClient client, String topic, String message) {
-        try {
-            MqttMessage mqttMessage = new MqttMessage(message.getBytes());
-            mqttMessage.setQos(1);
-
-            IMqttToken pubToken = client.publish(topic, mqttMessage);
-            pubToken.waitForCompletion(5000);
-
-            return "";
-        } catch (MqttException e) {
-            logger.warn("MQTT publish test failed: {}", e.getMessage());
-            return e.getMessage();
-        }
-    }
-
-    private String testUnSubscribe(MqttAsyncClient client, String topic) {
-        try {
-            IMqttToken unsubToken = client.unsubscribe(topic);
-            unsubToken.waitForCompletion(5000);
-            return "";
-        } catch (MqttException e) {
-            logger.warn("MQTT unsubscribe test failed: {}", e.getMessage());
-            return e.getMessage();
-        }
+        testDescribeAndPublish5(client, mqttProtocol, data);
+        convertToMetricsData(builder, metrics, responseTime, data);
+        client.disconnect();
     }
 
     /**
-     * Convert collected data to MetricsData
+     * collecting data of MQTT 3.1.1
      */
+    private void collectWithVersion3(Metrics metrics, Builder builder) {
+        MqttProtocol mqttProtocol = metrics.getMqtt();
+        Map<Object, String> data = new HashMap<>();
+        Mqtt3AsyncClient client = buildMqtt3Client(mqttProtocol);
+        long responseTime = connectClient(client, mqtt3AsyncClient -> {
+            CompletableFuture<Mqtt3ConnAck> connectFuture = mqtt3AsyncClient.connect();
+            try {
+                connectFuture.get(Long.parseLong(mqttProtocol.getTimeout()), TimeUnit.MILLISECONDS);
+            } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                builder.setCode(CollectRep.Code.FAIL);
+                builder.setMsg(getErrorMessage(e.getMessage()));
+            }
+        });
+        testDescribeAndPublish3(client, mqttProtocol, data);
+        convertToMetricsData(builder, metrics, responseTime, data);
+        client.disconnect();
+    }
+
+    private void testDescribeAndPublish3(Mqtt3AsyncClient client, MqttProtocol mqttProtocol, Map<Object, String> data) {
+        data.put("canDescribe", test(() -> {
+            client.subscribeWith().topicFilter(mqttProtocol.getTopic()).qos(MqttQos.AT_LEAST_ONCE).send();
+            client.unsubscribeWith().topicFilter(mqttProtocol.getTopic()).send();
+        }, "subscribe").toString());
+
+        data.put("canPublish", !mqttProtocol.testPublish() ? Boolean.FALSE.toString() : test(() -> {
+            client.publishWith().topic(mqttProtocol.getTopic())
+                .payload(mqttProtocol.getTestMessage().getBytes(StandardCharsets.UTF_8))
+                .qos(MqttQos.AT_LEAST_ONCE).send();
+            data.put("canPublish", Boolean.TRUE.toString());
+        }, "publish").toString());
+    }
+
+    private void testDescribeAndPublish5(Mqtt5AsyncClient client, MqttProtocol mqttProtocol, Map<Object, String> data) {
+        data.put("canDescribe", test(() -> {
+            client.subscribeWith().topicFilter(mqttProtocol.getTopic()).qos(MqttQos.AT_LEAST_ONCE).send();
+            client.unsubscribeWith().topicFilter(mqttProtocol.getTopic()).send();
+        }, "subscribe").toString());
+
+        data.put("canPublish", !mqttProtocol.testPublish() ? Boolean.FALSE.toString() : test(() -> {
+            client.publishWith().topic(mqttProtocol.getTopic())
+                .payload(mqttProtocol.getTestMessage().getBytes(StandardCharsets.UTF_8))
+                .qos(MqttQos.AT_LEAST_ONCE).send();
+            data.put("canPublish", Boolean.TRUE.toString());
+        }, "publish").toString());
+    }
+
+    private Mqtt5AsyncClient buildMqtt5Client(MqttProtocol mqttProtocol) {
+        Mqtt5ClientBuilder mqtt5ClientBuilder = Mqtt5Client.builder()
+            .serverHost(mqttProtocol.getHost())
+            .identifier(mqttProtocol.getClientId())
+            .serverPort(Integer.parseInt(mqttProtocol.getPort()));
+
+        if (mqttProtocol.hasAuth()) {
+            mqtt5ClientBuilder.simpleAuth().username(mqttProtocol.getUsername())
+                .password(mqttProtocol.getPassword().getBytes(StandardCharsets.UTF_8))
+                .applySimpleAuth();
+        }
+        return mqtt5ClientBuilder.buildAsync();
+    }
+
+    private Mqtt3AsyncClient buildMqtt3Client(MqttProtocol mqttProtocol) {
+
+        Mqtt3ClientBuilder mqtt3ClientBuilder = Mqtt3Client.builder()
+            .serverHost(mqttProtocol.getHost())
+            .identifier(mqttProtocol.getClientId())
+            .serverPort(Integer.parseInt(mqttProtocol.getPort()));
+
+        if (mqttProtocol.hasAuth()) {
+            mqtt3ClientBuilder.simpleAuth().username(mqttProtocol.getUsername())
+                .password(mqttProtocol.getPassword().getBytes(StandardCharsets.UTF_8))
+                .applySimpleAuth();
+        }
+        return mqtt3ClientBuilder.buildAsync();
+    }
+
+    public <T> long connectClient(T client, Consumer<T> connect) {
+        StopWatch stopWatch = new StopWatch();
+        stopWatch.start();
+        connect.accept(client);
+        stopWatch.stop();
+        return stopWatch.getTotalTimeMillis();
+    }
+
     private void convertToMetricsData(Builder builder, Metrics metrics, long responseTime, Map<Object, String> data) {
         CollectRep.ValueRow.Builder valueRowBuilder = CollectRep.ValueRow.newBuilder();
         for (String column : metrics.getAliasFields()) {
@@ -288,4 +207,25 @@ public class MqttCollectImpl extends AbstractCollect {
         builder.addValueRow(valueRowBuilder.build());
     }
 
+    private Boolean test(Runnable runnable, String operationName) {
+        try {
+            runnable.run();
+            return true;
+        } catch (Exception e) {
+            logger.error("{} fail", operationName, e);
+        }
+        return false;
+    }
+
+    private String getErrorMessage(String errorMessage) {
+        if (StringUtils.isBlank(errorMessage)) {
+            return "connect failed";
+        }
+        String[] split = errorMessage.split(":");
+        if (split.length > 1) {
+            return Arrays.stream(split).skip(1).collect(Collectors.joining(":"));
+        }
+        return errorMessage;
+    }
+
 }

hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/mqtt/MqttSslFactory.java

@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.collector.collect.mqtt;
-
-import org.apache.hertzbeat.common.entity.job.protocol.MqttProtocol;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMKeyPair;
-import org.bouncycastle.openssl.PEMParser;
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
-
-import javax.net.ssl.SSLSocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.TrustManagerFactory;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.Security;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-
-/**
- * Support MQTT SSL Factory
- */
-public class MqttSslFactory {
-
-    /**
-     * Get MSL Socket Factory
-     */
-    public static SSLSocketFactory getMslSocketFactory(MqttProtocol mqttProtocol, boolean insecureSkipVerify) {
-        try {
-            Security.addProvider(new BouncyCastleProvider());
-
-            KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
-            ks.load(null, null);
-
-            Certificate[] chain = null;
-            if (mqttProtocol.getClientCert() != null && !mqttProtocol.getClientCert().isEmpty()) {
-                String formatClientCert = CertificateFormatter.formatCertificateChain(mqttProtocol.getClientCert());
-                try (InputStream certIn = new ByteArrayInputStream(formatClientCert.getBytes())) {
-                    CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                    Collection<? extends Certificate> certs = cf.generateCertificates(certIn);
-                    chain = certs.toArray(new Certificate[0]);
-                }
-            }
-
-            PrivateKey privateKey;
-            if (mqttProtocol.getClientKey() != null && !mqttProtocol.getClientKey().isEmpty()) {
-                String formatClientKey = CertificateFormatter.formatPrivateKey(mqttProtocol.getClientKey());
-                try (PEMParser pemParser = new PEMParser(new StringReader(formatClientKey))) {
-                    JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC");
-                    Object object = pemParser.readObject();
-
-                    if (object instanceof PEMKeyPair) {
-                        privateKey = converter.getPrivateKey(((PEMKeyPair) object).getPrivateKeyInfo());
-                    } else if (object instanceof PrivateKeyInfo) {
-                        privateKey = converter.getPrivateKey((PrivateKeyInfo) object);
-                    } else {
-                        throw new IllegalArgumentException("Unsupported private key type");
-                    }
-
-                    ks.setKeyEntry("private-key", privateKey, "".toCharArray(), chain);
-                }
-            }
-
-            TrustManager[] trustManagers;
-            if (insecureSkipVerify) {
-                trustManagers = createInsecureTrustManager();
-            } else {
-                String formatCaCert = CertificateFormatter.formatCertificateChain(mqttProtocol.getCaCert());
-                KeyStore trustStore = createMergedTrustStore(formatCaCert);
-                TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                tmf.init(trustStore);
-                trustManagers = tmf.getTrustManagers();
-            }
-
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
-            kmf.init(ks, "".toCharArray());
-
-
-            SSLContext context = SSLContext.getInstance(mqttProtocol.getTlsVersion());
-            context.init(kmf.getKeyManagers(), trustManagers, null);
-
-            return context.getSocketFactory();
-        } catch (Exception e) {
-            throw new RuntimeException("Fails to SSL initialize: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Get SSL Socket Factory
-     */
-    public static SSLSocketFactory getSslSocketFactory(MqttProtocol mqttProtocol, boolean insecureSkipVerify) {
-        try {
-            Security.addProvider(new BouncyCastleProvider());
-
-
-            TrustManager[] trustManagers;
-            if (insecureSkipVerify) {
-                trustManagers = createInsecureTrustManager();
-            } else {
-
-                String formatCaCert = CertificateFormatter.formatCertificateChain(mqttProtocol.getCaCert());
-                KeyStore trustStore = createMergedTrustStore(formatCaCert);
-                TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                tmf.init(trustStore);
-                trustManagers = tmf.getTrustManagers();
-            }
-
-            SSLContext sslContext = SSLContext.getInstance(mqttProtocol.getTlsVersion());
-            sslContext.init(null, trustManagers, null);
-
-            return sslContext.getSocketFactory();
-        } catch (Exception e) {
-            throw new RuntimeException("Fails to SSL initialize: " + e.getMessage(), e);
-        }
-    }
-
-    private static TrustManager[] createInsecureTrustManager() {
-        return new TrustManager[]{
-                new X509TrustManager() {
-                    public void checkClientTrusted(X509Certificate[] chain, String authType) {
-                    }
-
-                    public void checkServerTrusted(X509Certificate[] chain, String authType) {
-                    }
-
-                    public X509Certificate[] getAcceptedIssuers() {
-                        return new X509Certificate[0];
-                    }
-                }
-        };
-    }
-
-    private static KeyStore createMergedTrustStore(String caCertPem) throws Exception {
-        KeyStore mergedKs = KeyStore.getInstance(KeyStore.getDefaultType());
-        mergedKs.load(null, null);
-
-
-        TrustManagerFactory systemTmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        systemTmf.init((KeyStore) null);
-        X509TrustManager systemTm = (X509TrustManager) systemTmf.getTrustManagers()[0];
-
-        int systemIndex = 1;
-        for (X509Certificate cert : systemTm.getAcceptedIssuers()) {
-            mergedKs.setCertificateEntry("system-ca-" + systemIndex++, cert);
-        }
-
-
-        if (caCertPem != null && !caCertPem.isEmpty()) {
-            try (InputStream caIn = new ByteArrayInputStream(caCertPem.getBytes())) {
-                CertificateFactory cf = CertificateFactory.getInstance("X.509");
-                Collection<? extends Certificate> customCerts = cf.generateCertificates(caIn);
-
-                int customIndex = 1;
-                for (Certificate cert : customCerts) {
-                    mergedKs.setCertificateEntry("custom-ca-" + customIndex++, cert);
-                }
-            }
-        }
-
-        return mergedKs;
-    }
-}

hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/database/JdbcCommonCollectTest.java

@@ -17,6 +17,11 @@
 
 package org.apache.hertzbeat.collector.collect.database;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.JdbcProtocol;
@@ -24,14 +29,6 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 /**
  * Test case for {@link JdbcCommonCollect}
  */
@@ -131,81 +128,4 @@ class JdbcCommonCollectTest {
         String protocol = jdbcCommonCollect.supportProtocol();
         assertEquals(DispatchConstants.PROTOCOL_JDBC, protocol);
     }
-
-    @Test
-    void testUrlPassThrough() {
-        String[] testUrls = {
-                "jdbc:mysql://localhost:3306/test?allowPublicKeyRetrieval=true&useSSL=false",
-                "jdbc:mysql://localhost:3306/test?usessl=false&verifyServerCertificate=true",
-                "jdbc:mysql://localhost:3306/test?serverTimezone=UTC&autoReconnect=false"
-        };
-        JdbcCommonCollect jdbcCollect = new JdbcCommonCollect();
-        for (String originalUrl : testUrls) {
-            try {
-                JdbcProtocol jdbcProtocol = JdbcProtocol.builder()
-                        .host("localhost")
-                        .port("3306")
-                        .platform("mysql")
-                        .username("root")
-                        .password("root")
-                        .database("test")
-                        .url(originalUrl)
-                        .build();
-                
-                // Use reflection to call constructDatabaseUrl method
-                Method constructMethod = JdbcCommonCollect.class.getDeclaredMethod("constructDatabaseUrl", JdbcProtocol.class, String.class, String.class);
-                constructMethod.setAccessible(true);
-                String processedUrl = (String) constructMethod.invoke(jdbcCollect, jdbcProtocol, "localhost", "3306");
-                // Verify that the processed URL is the same as the original URL
-                assertEquals(originalUrl, processedUrl, 
-                    "URL should be passed through without modification: " + originalUrl);
-            } catch (Exception e) {
-                System.out.println("URL rejected by security validation: " + originalUrl + ", reason: " + e.getMessage());
-            }
-        }
-    }
-
-    @Test
-    void testConstructDatabaseUrlSecurityInterception() {
-        JdbcCommonCollect jdbcCollect = new JdbcCommonCollect();
-        String[] maliciousUrls = {
-                // URL length limit test
-                "jdbc:mysql://localhost:3306/test?" + "a".repeat(2050) + "=value",
-                // url format check
-                "jdbca:mysql://localhost:3306/test?allowLoadLocalInfile=true",
-                // backlist check
-                "jdbc:mysql://localhost:3306/test?allowLoadLocalInfile=true",
-                // universal detection of JDBC injection and deserialization attacks
-                "jdbc:mysql://localhost:3306/test?jndi:ldap://duansg.com/exploit",
-                // universal detection of bypass
-                "jdbc:mysql://localhost:3306/test?param=create\\trigger",
-                // database platform specific bypass detection
-                "jdbc:mysql://localhost:3306/test?allow\\nload\\nlocal\\ninfile=true"
-
-        };
-
-        // Test malicious URLs - should throw exceptions
-        for (String maliciousUrl : maliciousUrls) {
-            JdbcProtocol jdbcProtocol = JdbcProtocol.builder()
-                    .host("localhost")
-                    .port("3306")
-                    .platform("mysql")
-                    .username("root")
-                    .password("root")
-                    .database("test")
-                    .url(maliciousUrl)
-                    .build();
-
-            assertThrows(Exception.class, () -> {
-                try {
-                    Method constructMethod = JdbcCommonCollect.class.getDeclaredMethod("constructDatabaseUrl", JdbcProtocol.class, String.class, String.class);
-                    constructMethod.setAccessible(true);
-                    constructMethod.invoke(jdbcCollect, jdbcProtocol, "localhost", "3306");
-                } catch (InvocationTargetException e) {
-                    throw e.getCause();
-                }
-            }, "Malicious URL should be blocked: " + maliciousUrl);
-        }
-    }
-
 }

hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/http/HttpCollectImplTest.java

@@ -17,6 +17,15 @@
 
 package org.apache.hertzbeat.collector.collect.http;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+
 import com.google.common.collect.Lists;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
@@ -25,15 +34,6 @@ import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 /**
  * Test case for {@link HttpCollectImpl}
  */
@@ -186,107 +186,4 @@ class HttpCollectImplTest {
         assertEquals("0.0", secondRow.getColumns(2), "Second server CPU should be 0.0");
         assertEquals("0", secondRow.getColumns(3), "Second server memory should be 0");
     }
-
-    @Test
-    void parseResponseByJsonPath() throws Exception {
-        String jsonResponse = "{"
-                + "  \"name\": \"jvm.memory.used\","
-                + "  \"description\": \"The amount of used memory\","
-                + "  \"baseUnit\": \"bytes\","
-                + "  \"measurements\": ["
-                + "    {"
-                + "      \"statistic\": \"VALUE\","
-                + "      \"value\": 90282296"
-                + "    }"
-                + "  ],"
-                + "  \"availableTags\": ["
-                + "    {"
-                + "      \"tag\": \"area\","
-                + "      \"values\": ["
-                + "        \"heap\","
-                + "        \"nonheap\""
-                + "      ]"
-                + "    },"
-                + "    {"
-                + "      \"tag\": \"id\","
-                + "      \"values\": ["
-                + "        \"G1 Survivor Space\","
-                + "        \"G1 Eden Space\""
-                + "      ]"
-                + "    }"
-                + "  ]"
-                + "}";
-
-        HttpProtocol http = HttpProtocol.builder()
-                .parseType(DispatchConstants.PARSE_JSON_PATH)
-                .parseScript("$.availableTags[?(@.tag == \"id\")].values[*]")
-                .build();
-        List<CollectRep.ValueRow> capturedRows = new ArrayList<>();
-        CollectRep.MetricsData.Builder builder = new CollectRep.MetricsData.Builder() {
-            @Override
-            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
-                capturedRows.add(valueRow);
-                return super.addValueRow(valueRow);
-            }
-        };
-        Method parseMethod = HttpCollectImpl.class.getDeclaredMethod(
-                "parseResponseByJsonPath",
-                String.class,
-                List.class,
-                HttpProtocol.class,
-                CollectRep.MetricsData.Builder.class,
-                Long.class);
-        parseMethod.setAccessible(true);
-
-        // Call the method
-        parseMethod.invoke(httpCollectImpl, jsonResponse, Lists.newArrayList("id"), http, builder, 100L);
-
-        // Verify the results
-        assertEquals(2, capturedRows.size());
-        CollectRep.ValueRow firstRow = capturedRows.get(0);
-        assertEquals("G1 Survivor Space", firstRow.getColumns(0));
-        CollectRep.ValueRow secondRow = capturedRows.get(1);
-        assertEquals("G1 Eden Space", secondRow.getColumns(0));
-
-        // number
-        String numberJson = "{"
-                + "  \"name\": \"system.cpu.usage\","
-                + "  \"description\": \"The \\\"recent cpu usage\\\" of the system the application is running in\","
-                + "  \"measurements\": ["
-                + "    {"
-                + "      \"statistic\": \"VALUE\","
-                + "      \"value\": 0.268751364291017"
-                + "    }"
-                + "  ],"
-                + "  \"availableTags\": []"
-                + "}";
-        http = HttpProtocol.builder()
-                .parseType(DispatchConstants.PARSE_JSON_PATH)
-                .parseScript("$.measurements[?(@.statistic == \"VALUE\")].value")
-                .build();
-        capturedRows.clear();
-        builder = new CollectRep.MetricsData.Builder() {
-            @Override
-            public CollectRep.MetricsData.Builder addValueRow(CollectRep.ValueRow valueRow) {
-                capturedRows.add(valueRow);
-                return super.addValueRow(valueRow);
-            }
-        };
-        parseMethod = HttpCollectImpl.class.getDeclaredMethod(
-                "parseResponseByJsonPath",
-                String.class,
-                List.class,
-                HttpProtocol.class,
-                CollectRep.MetricsData.Builder.class,
-                Long.class);
-        parseMethod.setAccessible(true);
-
-        // Call the method
-        parseMethod.invoke(httpCollectImpl, numberJson, Lists.newArrayList("usage"), http, builder, 100L);
-
-        // Verify the results
-        assertEquals(1, capturedRows.size());
-        firstRow = capturedRows.get(0);
-        assertEquals("0.268751364291017", firstRow.getColumns(0));
-    }
 }

hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/collect/mqtt/MqttCollectTest.java

@@ -17,91 +17,108 @@
 
 package org.apache.hertzbeat.collector.collect.mqtt;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
+import com.hivemq.client.mqtt.MqttVersion;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.job.protocol.MqttProtocol;
+import org.apache.hertzbeat.common.entity.message.CollectRep;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 /**
  * Test case for {@link MqttCollectImpl}
  */
-class MqttCollectTest {
+public class MqttCollectTest {
     private MqttCollectImpl mqttCollect;
     private Metrics metrics;
-    private MqttProtocol.MqttProtocolBuilder mqttBuilder;
+    private CollectRep.MetricsData.Builder builder;
 
     @BeforeEach
-    void setup() {
+    public void setup() {
         mqttCollect = new MqttCollectImpl();
-        metrics = new Metrics();
-
-        // Initialize base MQTT parameters for test cases
-        mqttBuilder = MqttProtocol.builder()
-                .host("example.com")
-                .port("1883")
-                .protocol("mqtt")
-                .timeout("5000")
-                .keepalive("60");
-    }
-
-    // Region: preCheck validation tests
-
-    @Test
-    // Verify preCheck throws exception when host is missing
-    void preCheckShouldThrowWhenHostMissing() {
-        metrics.setMqtt(mqttBuilder.host("").build());
-        assertThrows(IllegalArgumentException.class, () -> mqttCollect.preCheck(metrics));
+        MqttProtocol mqtt = MqttProtocol.builder().build();
+        metrics = Metrics.builder()
+                .mqtt(mqtt)
+                .build();
+        builder = CollectRep.MetricsData.newBuilder();
     }
 
     @Test
-    // Verify preCheck throws exception when port is missing
-    void preCheckShouldThrowWhenPortMissing() {
-        metrics.setMqtt(mqttBuilder.port("").build());
-        assertThrows(IllegalArgumentException.class, () -> mqttCollect.preCheck(metrics));
+    void preCheck() {
+        // host is empty
+        assertThrows(IllegalArgumentException.class, () -> {
+            mqttCollect.preCheck(metrics);
+        });
+
+        // port is empty
+        assertThrows(IllegalArgumentException.class, () -> {
+            MqttProtocol mqtt = MqttProtocol.builder().build();
+            mqtt.setHost("example.com");
+            metrics.setMqtt(mqtt);
+            mqttCollect.preCheck(metrics);
+        });
+
+        // protocol version is empty
+        assertThrows(IllegalArgumentException.class, () -> {
+            MqttProtocol mqtt = MqttProtocol.builder().build();
+            mqtt.setHost("example.com");
+            mqtt.setPort("1883");
+            metrics.setMqtt(mqtt);
+            mqttCollect.preCheck(metrics);
+        });
+
+        // everything is ok
+        assertDoesNotThrow(() -> {
+            MqttProtocol mqtt = MqttProtocol.builder().build();
+            mqtt.setHost("example.com");
+            mqtt.setPort("1883");
+            metrics.setMqtt(mqtt);
+            mqtt.setProtocolVersion("3.1.1");
+            mqttCollect.preCheck(metrics);
+        });
     }
 
     @Test
-    // Verify preCheck throws exception when MQTTS mutual auth is enabled but CA cert is missing
-    void preCheckShouldThrowWhenMqttsMutualAuthMissingCerts() {
-        metrics.setMqtt(mqttBuilder
-                .protocol("mqtts")
-                .enableMutualAuth("true")
-                .caCert("")
-                .clientCert("client.crt")
-                .clientKey("client.key")
-                .build());
-        assertThrows(IllegalArgumentException.class, () -> mqttCollect.preCheck(metrics));
+    void supportProtocol() {
+        Assertions.assertEquals(DispatchConstants.PROTOCOL_MQTT, mqttCollect.supportProtocol());
     }
 
     @Test
-    // Verify preCheck succeeds with valid standard MQTT parameters
-    void preCheckShouldSucceedWithValidMqttParams() {
-        metrics.setMqtt(mqttBuilder.build());
-        assertDoesNotThrow(() -> mqttCollect.preCheck(metrics));
-    }
+    void collect() {
+        // with version 3.1.1
+        assertDoesNotThrow(() -> {
+            MqttProtocol mqtt = MqttProtocol.builder().build();
+            mqtt.setHost("example.com");
+            mqtt.setPort("1883");
+            mqtt.setClientId("clientid");
+            mqtt.setTimeout("1");
+            mqtt.setProtocolVersion(MqttVersion.MQTT_3_1_1.name());
 
-    @Test
-    // Verify preCheck succeeds with valid MQTTS parameters including mutual authentication
-    void preCheckShouldSucceedWithValidMqttsMutualAuth() {
-        metrics.setMqtt(mqttBuilder
-                .protocol("mqtts")
-                .enableMutualAuth("true")
-                .caCert("ca.pem")
-                .clientCert("client.crt")
-                .clientKey("client.key")
-                .build());
-        assertDoesNotThrow(() -> mqttCollect.preCheck(metrics));
-    }
-    // End region
+            metrics.setMqtt(mqtt);
+            metrics.setAliasFields(new ArrayList<>());
 
-    @Test
-    // Verify supportProtocol method returns correct MQTT constant
-    void supportProtocolShouldReturnMqttConstant() {
-        assertEquals(DispatchConstants.PROTOCOL_MQTT, mqttCollect.supportProtocol());
+            mqttCollect.collect(builder, metrics);
+        });
+
+        
+        assertDoesNotThrow(() -> {
+            MqttProtocol mqtt = MqttProtocol.builder().build();
+            mqtt.setHost("example.com");
+            mqtt.setPort("1883");
+            mqtt.setClientId("clientid");
+            mqtt.setTimeout("1");
+            mqtt.setProtocolVersion(MqttVersion.MQTT_5_0.name());
+
+            metrics.setMqtt(mqtt);
+            metrics.setAliasFields(new ArrayList<>());
+
+            mqttCollect.collect(builder, metrics);
+        });
     }
 }

hertzbeat-collector/hertzbeat-collector-collector/pom.xml

@@ -70,11 +70,14 @@
             <version>${hertzbeat.version}</version>
         </dependency>
 
+
+
         <!-- spring -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
@@ -84,15 +87,7 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
-        <!-- metrics -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-        </dependency>
+
     </dependencies>
 
     <build>

hertzbeat-collector/hertzbeat-collector-collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcher.java

@@ -23,7 +23,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobService;
-import org.apache.hertzbeat.collector.metrics.HertzBeatMetricsCollector;
 import org.apache.hertzbeat.common.timer.Timeout;
 import org.apache.hertzbeat.collector.timer.TimerDispatch;
 import org.apache.hertzbeat.collector.timer.WheelTimerTask;
@@ -34,7 +33,6 @@ import org.apache.hertzbeat.common.entity.job.Job;
 import org.apache.hertzbeat.common.entity.job.Metrics;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
 import org.apache.hertzbeat.common.queue.CommonDataQueue;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -92,9 +90,6 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
 
     private final String collectorIdentity;
 
-    @Autowired
-    private HertzBeatMetricsCollector metricsCollector;
-
     public CommonDispatcher(MetricsCollectorQueue jobRequestQueue,
                             TimerDispatch timerDispatch,
                             CommonDataQueue commonDataQueue,
@@ -158,23 +153,12 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
             for (Map.Entry<String, MetricsTime> entry : metricsTimeoutMonitorMap.entrySet()) {
                 MetricsTime metricsTime = entry.getValue();
                 if (metricsTime.getStartTime() < deadline) {
-                    // Metrics collection timeout
-                    MetricsTime removedMetricsTime = metricsTimeoutMonitorMap.remove(entry.getKey());
-                    if (removedMetricsTime == null) {
-                        continue;
-                    }
+                    // Metrics collection timeout  
                     WheelTimerTask timerJob = (WheelTimerTask) metricsTime.getTimeout().task();
-                    Job job = timerJob.getJob();
-                    // timeout metrics
-                    if (metricsCollector != null) {
-                        long duration = System.currentTimeMillis() - removedMetricsTime.getStartTime();
-                        metricsCollector.recordCollectMetrics(job, duration, "timeout");
-                    }
-
                     CollectRep.MetricsData metricsData = CollectRep.MetricsData.newBuilder()
-                            .setId(job.getMonitorId())
-                            .setTenantId(job.getTenantId())
-                            .setApp(job.getApp())
+                            .setId(timerJob.getJob().getMonitorId())
+                            .setTenantId(timerJob.getJob().getTenantId())
+                            .setApp(timerJob.getJob().getApp())
                             .setMetrics(metricsTime.getMetrics().getName())
                             .setPriority(metricsTime.getMetrics().getPriority())
                             .setTime(System.currentTimeMillis())
@@ -183,6 +167,7 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
                     if (metricsData.getPriority() == 0) {
                         dispatchCollectData(metricsTime.timeout, metricsTime.getMetrics(), metricsData);
                     }
+                    metricsTimeoutMonitorMap.remove(entry.getKey());
                 }
             }
         } catch (Exception e) {
@@ -192,7 +177,7 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
 
     @Override
     public void dispatchMetricsTask(Timeout timeout) {
-        // Divide the collection task of a single application into corresponding collection tasks of the metrics under it.
+        // Divide the collection task of a single application into corresponding collection tasks of the metrics according to the metrics under it.
         // Put each collect task into the thread pool for scheduling
         WheelTimerTask timerTask = (WheelTimerTask) timeout.task();
         Job job = timerTask.getJob();
@@ -216,27 +201,16 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
     public void dispatchCollectData(Timeout timeout, Metrics metrics, CollectRep.MetricsData metricsData) {
         WheelTimerTask timerJob = (WheelTimerTask) timeout.task();
         Job job = timerJob.getJob();
-        String monitorKey;
-        if (metrics.isHasSubTask()) {
-            monitorKey = job.getId() + "-" + metrics.getName() + "-sub-" + metrics.getSubTaskId();
-        } else {
-            monitorKey = job.getId() + "-" + metrics.getName();
-        }
-        MetricsTime metricsTime = metricsTimeoutMonitorMap.remove(monitorKey);
-
-        // job completed metrics
-        if (metricsTime != null && metricsCollector != null) {
-            long duration = System.currentTimeMillis() - metricsTime.getStartTime();
-            String status = metricsData.getCode() == CollectRep.Code.SUCCESS ? "success" : "fail";
-            metricsCollector.recordCollectMetrics(job, duration, status);
-        }
         if (metrics.isHasSubTask()) {
+            metricsTimeoutMonitorMap.remove(job.getId() + "-" + metrics.getName() + "-sub-" + metrics.getSubTaskId());
             boolean isLastTask = metrics.consumeSubTaskResponse(metricsData);
             if (isLastTask) {
                 metricsData = metrics.getSubTaskDataRef().get().build();
             } else {
                 return;
             }
+        } else {
+            metricsTimeoutMonitorMap.remove(job.getId() + "-" + metrics.getName());
         }
         Set<Metrics> metricsSet = job.getNextCollectMetrics(metrics, false);
         if (job.isCyclic()) {
@@ -348,13 +322,7 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
     public void dispatchCollectData(Timeout timeout, Metrics metrics, List<CollectRep.MetricsData> metricsDataList) {
         WheelTimerTask timerJob = (WheelTimerTask) timeout.task();
         Job job = timerJob.getJob();
-        MetricsTime metricsTime = metricsTimeoutMonitorMap.remove(String.valueOf(job.getId()));
-        if (metricsTime != null && metricsCollector != null) {
-            long duration = System.currentTimeMillis() - metricsTime.getStartTime();
-            // For a list, we consider it a success if at least one item is successful.
-            boolean isSuccess = metricsDataList.stream().anyMatch(item -> item.getCode() == CollectRep.Code.SUCCESS);
-            metricsCollector.recordCollectMetrics(job, duration, isSuccess ? "success" : "fail");
-        }
+        metricsTimeoutMonitorMap.remove(String.valueOf(job.getId()));
         if (job.isCyclic()) {
             // The collection and execution of all task of this job are completed.
             // The periodic task pushes the task to the time wheel again.
@@ -372,6 +340,7 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
             // and the result listener is notified of the combination of all metrics data
             timerDispatch.responseSyncJobData(job.getId(), metricsDataList);
         }
+
     }
 
 
@@ -385,4 +354,4 @@ public class CommonDispatcher implements MetricsTaskDispatch, CollectDataDispatc
         private Metrics metrics;
         private Timeout timeout;
     }
-}
+}

hertzbeat-collector/hertzbeat-collector-collector/src/main/java/org/apache/hertzbeat/collector/dispatch/MetricsCollect.java

@@ -422,9 +422,6 @@ public class MetricsCollect implements Runnable, Comparable<MetricsCollect> {
      */
     private Object[] transformCal(String cal, Map<String, String> fieldAliasMap) {
         int splitIndex = cal.indexOf("=");
-        if (splitIndex < 0) {
-            return null;
-        }
         String field = cal.substring(0, splitIndex).trim();
         String expressionStr = cal.substring(splitIndex + 1).trim().replace("\\#", "#");
         JexlExpression expression;

hertzbeat-collector/hertzbeat-collector-collector/src/main/java/org/apache/hertzbeat/collector/metrics/HertzBeatMetricsCollector.java

@@ -1,89 +0,0 @@
-/*
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements.  See the NOTICE file distributed with
- *   this work for additional information regarding copyright ownership.
- *   The ASF licenses this file to You under the Apache License, Version 2.0
- *   (the "License"); you may not use this file except in compliance with
- *   the License.  You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.hertzbeat.collector.metrics;
-
-import io.micrometer.core.instrument.Counter;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Timer;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.hertzbeat.common.entity.job.Job;
-import org.springframework.stereotype.Service;
-
-import java.time.Duration;
-import java.util.Map;
-
-/**
- * Service for managing and recording Micrometer metrics.
- * This service uses Micrometer which integrates natively with Spring Boot Actuator.
- */
-@Service
-@Slf4j
-public class HertzBeatMetricsCollector {
-
-    private final MeterRegistry meterRegistry;
-
-    public HertzBeatMetricsCollector(MeterRegistry meterRegistry) {
-        this.meterRegistry = meterRegistry;
-        log.info("MetricsService initialized with MeterRegistry: {}", meterRegistry.getClass().getSimpleName());
-    }
-
-    /**
-     * Records the metrics for a completed collection sub-task.
-     *
-     * @param job            The parent job containing monitor info.
-     * @param durationMillis The duration of the collection task in milliseconds.
-     * @param status         The final status of the collection ("success", "fail", "timeout").
-     */
-    public void recordCollectMetrics(Job job, long durationMillis, String status) {
-        if (job == null) {
-            return;
-        }
-
-        Map<String, String> metadata = job.getMetadata();
-        String monitorName = metadata != null ? metadata.get("instancename") : "unknown";
-        String monitorTarget = metadata != null ? metadata.get("instancehost") : "unknown";
-
-        // Record collection count
-        Counter.builder("hertzbeat.collect.total")
-                .description("The total number of collection tasks executed")
-                .tag("status", status)
-                .tag("monitor_type", job.getApp())
-                .tag("monitor_id", String.valueOf(job.getMonitorId()))
-                .tag("monitor_name", monitorName)
-                .tag("monitor_target", monitorTarget)
-                .register(meterRegistry)
-                .increment();
-
-        // Record collection duration
-        Timer.builder("hertzbeat.collect.duration")
-                .description("The duration of collection task executions")
-                .tag("status", status)
-                .tag("monitor_type", job.getApp())
-                .tag("monitor_id", String.valueOf(job.getMonitorId()))
-                .tag("monitor_name", monitorName)
-                .tag("monitor_target", monitorTarget)
-                .register(meterRegistry)
-                .record(Duration.ofMillis(durationMillis));
-
-        if (log.isDebugEnabled()) {
-            log.debug("Recorded metrics for monitor [{}] ({}): status={}, duration={}ms",
-                    monitorName, job.getMonitorId(), status, durationMillis);
-        }
-    }
-}

hertzbeat-collector/hertzbeat-collector-collector/src/main/resources/application.yml

@@ -30,23 +30,7 @@ spring:
   # need to disable spring boot mongodb auto config, or default mongodb connection tried and failed...
   autoconfigure:
     exclude: org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration, org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration, org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
-management:
-  endpoints:
-    web:
-      exposure:
-        include:
-          - 'prometheus'
-  endpoint:
-    prometheus:
-      access: read_only
-  metrics:
-    tags:
-      application: ${spring.application.name}
-      environment: ${spring.profiles.active}
-  prometheus:
-    metrics:
-      export:
-        enabled: true
+
 ---
 spring:
   config:

hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/GoOnlineProcessor.java

@@ -22,11 +22,8 @@ import io.netty.channel.ChannelHandlerContext;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.collector.timer.TimerDispatch;
 import org.apache.hertzbeat.common.constants.CommonConstants;
-import org.apache.hertzbeat.common.entity.dto.ServerInfo;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.support.SpringContextHolder;
-import org.apache.hertzbeat.common.util.AesUtil;
-import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor;
 
 /**
@@ -43,16 +40,6 @@ public class GoOnlineProcessor implements NettyRemotingProcessor {
         if (this.timerDispatch == null) {
             this.timerDispatch = SpringContextHolder.getBean(TimerDispatch.class);
         }
-        if (message.getMsg().isEmpty()) {
-            log.warn("The message that server response to collector is empty, please upgrade server");
-        } else {
-            ServerInfo serverInfo = JsonUtil.fromJson(message.getMsg().toStringUtf8(), ServerInfo.class);
-            if (serverInfo == null || serverInfo.getAesSecret() == null) {
-                log.warn("The message that server response to collector has not secret empty, please check");
-            } else {
-                AesUtil.setDefaultSecretKey(serverInfo.getAesSecret());
-            }
-        }
         timerDispatch.goOnline();
         log.info("receive online message and handle success");
         return ClusterMsg.Message.newBuilder()

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/config/CommonConfig.java

@@ -19,6 +19,7 @@ package org.apache.hertzbeat.common.config;
 
 import org.apache.hertzbeat.common.constants.ConfigConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;
+import org.apache.hertzbeat.common.util.AesUtil;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
@@ -33,4 +34,10 @@ import org.springframework.context.annotation.ComponentScan;
         + ConfigConstants.FunctionModuleConstants.COMMON)
 @EnableConfigurationProperties(CommonProperties.class)
 public class CommonConfig {
+
+    public CommonConfig(CommonProperties commonProperties) {
+        if (commonProperties != null && commonProperties.getSecret() != null) {
+            AesUtil.setDefaultSecretKey(commonProperties.getSecret());
+        }
+    }
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java

@@ -87,11 +87,6 @@ public interface CommonConstants {
      */
     String LABEL_INSTANCE = "instance";
 
-    /**
-     * label key: defineid
-     */
-    String LABEL_DEFINE_ID = "defineid";
-
     /**
      * label key: alert name
      */
@@ -372,9 +367,4 @@ public interface CommonConstants {
      * status page incident state resolved
      */
     byte MONITOR_TYPE_DISCOVERY_AUTO_CREATE = 2;
-
-    /**
-     * JEXL custom function `json`
-     */
-    String JEXL_CUSTOM_JSON_FUNCTION = "json";
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/JexlKeywordsEnum.java

@@ -1,62 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.constants;
-
-import java.util.Arrays;
-
-/**
- * Jexl keywords enum
- */
-public enum JexlKeywordsEnum {
-
-    SIZE("size"),
-    EMPTY("empty"),
-    NEW("new"),
-    VAR("var"),
-    RETURN("return"),
-    IF("if"),
-    ELSE("else"),
-    ELSEIF("elseif"),
-    WHILE("while"),
-    DO("do"),
-    FOR("for"),
-    CONTINUE("continue"),
-    BREAK("break"),
-    TRUE("true"),
-    FALSE("false"),
-    NULL("null"),
-    UNDEFINED("undefined");
-
-    private final String keyword;
-
-    JexlKeywordsEnum(String keyword) {
-        this.keyword = keyword;
-    }
-
-    public String getKeyword() {
-        return keyword;
-    }
-
-    public static boolean match(String word) {
-        if (word == null || word.trim().isEmpty()) {
-            return false;
-        }
-        return Arrays.stream(values()).anyMatch(t -> t.keyword.equals(word));
-    }
-
-}

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/dto/ServerInfo.java

@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.entity.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * collector info
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@Schema(description = "manager server info")
-public class ServerInfo {
-
-    /**
-     * the aes secret key value for aes encode decode
-     */
-    private String aesSecret;
-}

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/protocol/MqttProtocol.java

@@ -33,73 +33,49 @@ import org.apache.commons.lang3.StringUtils;
 public class MqttProtocol implements CommonRequestProtocol, Protocol {
 
     /**
-     * mqtt client id
-     */
-    private String clientId;
-    /**
-     * mqtt username
-     */
-    private String username;
-    /**
-     * mqtt password
-     */
-    private String password;
-    /**
-     * mqtt host
+     * ip address or domain name of the peer host
      */
     private String host;
+
     /**
-     * mqtt port
+     * peer host port
      */
     private String port;
+
     /**
-     * mqtt protocol version
-     * MQTT,MQTTS
+     * username
      */
-    private String protocol;
+    private String username;
+
     /**
-     * mqtt connect timeout
-     * the maximum time to wait for a connection to be established
+     * password
+     */
+    private String password;
+
+    /**
+     * time out period
      */
     private String timeout;
+
     /**
-     * mqtt keepalive
-     * between ping requests to the broker to keep the connection alive
+     * client id
      */
-    private String keepalive;
+    private String clientId;
+
     /**
-     * mqtt topic name
-     */
-    private String topic;
-    /**
-     * mqtt publish message
+     * message used to test whether the mqtt connection can be pushed normally
      */
     private String testMessage;
+
     /**
-     * mqtt tls version
-     * TLSv1.2, TLSv1.3
+     * protocol version of mqtt
      */
-    private String tlsVersion;
+    private String protocolVersion;
+
     /**
-     * mqtt tls insecure skip verify server certificate
+     * monitor topic
      */
-    private String insecureSkipVerify;
-    /**
-     * mqtt tls ca cert
-     */
-    private String caCert;
-    /**
-     * mqtt tls enable mutual auth
-     */
-    private String enableMutualAuth;
-    /**
-     * mqtt tls client cert
-     */
-    private String clientCert;
-    /**
-     * mqtt tls client key
-     */
-    private String clientKey;
+    private String topic;
 
     /**
      * Determine whether authentication is required
@@ -109,4 +85,11 @@ public class MqttProtocol implements CommonRequestProtocol, Protocol {
         return StringUtils.isNotBlank(this.username) && StringUtils.isNotBlank(this.password);
     }
 
+    /**
+     * Determine whether you need to test whether messages can be pushed normally
+     * @return turn if it has test message
+     */
+    public boolean testPublish(){
+        return StringUtils.isNotBlank(this.testMessage);
+    }
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/AlertExpressionException.java

@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.support.exception;
-
-/**
- * Alert expression exception
- */
-public class AlertExpressionException extends RuntimeException {
-
-    public AlertExpressionException(String message) {
-        super(message);
-    }
-}

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/support/exception/ExpressionVisitorException.java

@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.support.exception;
-
-/**
- * Expression visitor exception
- */
-public class ExpressionVisitorException extends RuntimeException {
-
-
-    public ExpressionVisitorException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/AesUtil.java

@@ -37,7 +37,7 @@ public final class AesUtil {
      *  Default encryption key The AES encryption key is 16 bits by default.
      *  If the AES encryption key is larger than or smaller than 16 bits, an error message is displayed
      */
-    public static final String DEFAULT_ENCODE_RULES = "tomSun28HaHaHaHa";
+    private static final String ENCODE_RULES = "tomSun28HaHaHaHa";
 
     /**
      * Default algorithm
@@ -50,17 +50,13 @@ public final class AesUtil {
      * Encryption key The AES encryption key is 16 bits.
      * If the AES encryption key is larger than 16 bits, an error message is displayed
      */
-    private static String secretKey = DEFAULT_ENCODE_RULES;
+    private static String secretKey = ENCODE_RULES;
 
     private AesUtil() {}
 
     public static void setDefaultSecretKey(String secretKeyNow) {
         secretKey = secretKeyNow;
     }
-    
-    public static String getDefaultSecretKey() {
-        return secretKey;
-    }
 
     public static String aesEncode(String content) {
         return aesEncode(content, secretKey);
@@ -113,9 +109,9 @@ public final class AesUtil {
             byte[] byteDecode = getBytes(content, decryptKey);
             return new String(byteDecode, StandardCharsets.UTF_8);
         } catch (BadPaddingException e) {
-            if (!DEFAULT_ENCODE_RULES.equals(decryptKey)) {
+            if (!ENCODE_RULES.equals(decryptKey)) {
                 log.warn("There has default encode secret encode content, try to decode with default secret key");
-                return aesDecode(content, DEFAULT_ENCODE_RULES);
+                return aesDecode(content, ENCODE_RULES);
             }
             log.error("aes decode content error: {}, please config right common secret key", e.getMessage());
             return content;

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java

@@ -19,19 +19,15 @@
 
 package org.apache.hertzbeat.common.util;
 
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.google.common.collect.Maps;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
 import org.apache.commons.jexl3.JexlBuilder;
 import org.apache.commons.jexl3.JexlContext;
 import org.apache.commons.jexl3.JexlEngine;
 import org.apache.commons.jexl3.JexlExpression;
 import org.apache.commons.jexl3.JexlFeatures;
 import org.apache.commons.jexl3.MapContext;
-import org.apache.hertzbeat.common.constants.CommonConstants;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
-import java.util.function.Function;
 
 /**
  * jexl express runner
@@ -45,7 +41,6 @@ public class JexlExpressionRunner {
         Map<String, Object> functions = Maps.newLinkedHashMap();
         // set the root namespace function
         functions.put(null, new JexlCommonFunction());
-        functions.put(CommonConstants.JEXL_CUSTOM_JSON_FUNCTION, jsonFunction());
         ClassLoader classLoader = new ClassLoader() {
             @Override
             public String getName() {
@@ -83,17 +78,5 @@ public class JexlExpressionRunner {
     public static JexlExpression compile(String expression) {
         return jexlEngine.createExpression(expression);
     }
-
-    /**
-     * custom function `json:apply(xx)`
-     *
-     * @return java.util.function.Function
-     */
-    private static Function<String, Map<String, Object>> jsonFunction() {
-        return json -> {
-            TypeReference<Map<String, Object>> typeReference = new TypeReference<>() {
-            };
-            return JsonUtil.fromJson(json, typeReference);
-        };
-    }
+    
 }

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java

@@ -17,8 +17,6 @@
 
 package org.apache.hertzbeat.common.util;
 
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -46,7 +44,6 @@ public final class JsonUtil {
         OBJECT_MAPPER
                 .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
                 .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false)
-                .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
                 .registerModule(new JavaTimeModule());
     }
 

hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/LogUtil.java

@@ -1,167 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.util;
-
-import org.apache.commons.lang3.ArrayUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.slf4j.Logger;
-
-import java.text.MessageFormat;
-
-/**
- * Log utility class that provides formatted logging methods with location information.
- * This class enhances standard SLF4J logging by automatically adding caller location details.
- */
-public class LogUtil {
-
-    private static final String TEMPLATE_REGEX = "\\{\\d}";
-
-    /**
-     * Print debug level formatted log
-     * Example: LogUtil.debug(logger, "hello,{0},here has a {1} exception", "other information");
-     */
-    @SuppressWarnings("unused")
-    public static void debug(Logger logger, String msg, Object... params) {
-        if (logger.isDebugEnabled()) {
-
-            if (ArrayUtils.isEmpty(params)) {
-                logger.debug(LogUtil.buildLocationInfo() + msg);
-            } else {
-                logger.debug(LogUtil.buildLocationInfo() + format(msg, params));
-            }
-        }
-    }
-
-
-    /**
-     * Print info level formatted log
-     * Example: LogUtil.info(logger, "hello,{0},{1} exception", "dear", "database operation");
-     */
-    public static void info(Logger logger, String msg, Object... params) {
-        if (logger.isInfoEnabled()) {
-            if (ArrayUtils.isEmpty(params)) {
-                logger.info(LogUtil.buildLocationInfo() + msg);
-            } else {
-                logger.info(LogUtil.buildLocationInfo() + format(msg, params));
-            }
-        }
-    }
-
-    /**
-     * Print warn level formatted log
-     */
-    public static void warn(Logger logger, String msg, Object... params) {
-        if (logger.isWarnEnabled()) {
-            if (ArrayUtils.isEmpty(params)) {
-                logger.warn(LogUtil.buildLocationInfo() + msg);
-            } else {
-                logger.warn(LogUtil.buildLocationInfo() + format(msg, params));
-            }
-        }
-    }
-
-    /**
-     * Print error level formatted log, use {0},{1},.. for parameter replacement
-     * Example: LogUtil.error(logger, "hello,{0}, a {1} exception occurred here", "dear", "database operation");
-     */
-    public static void error(Logger logger, String msg, Object... params) {
-        if (logger.isErrorEnabled()) {
-            if (ArrayUtils.isEmpty(params)) {
-                logger.error(LogUtil.buildLocationInfo() + msg);
-            } else {
-                logger.error(LogUtil.buildLocationInfo() + format(msg, params));
-            }
-        }
-
-    }
-
-
-    /**
-     * Print warn level formatted log with exception, use {0},{1},.. for parameter replacement
-     * Example: LogUtil.warn(logger, e, "hello,{0}, a {1} exception occurred here", "dear", "database operation");
-     */
-    public static void warn(Logger logger, Throwable e, String msg, Object... params) {
-        if (logger.isWarnEnabled()) {
-            if (ArrayUtils.isEmpty(params)) {
-                logger.warn(LogUtil.buildLocationInfo() + msg, e);
-            } else {
-                logger.warn(LogUtil.buildLocationInfo() + format(msg, params), e);
-            }
-        }
-    }
-
-
-    /**
-     * Print error level formatted log with exception, use {0},{1},.. for parameter replacement
-     * Example: LogUtil.error(logger, e, "hello,{0}, a {1} exception occurred here", "dear", "database operation");
-     */
-    public static void error(Logger logger, Throwable e, String msg, Object... params) {
-        if (logger.isErrorEnabled()) {
-            if (ArrayUtils.isEmpty(params)) {
-                logger.error(LogUtil.buildLocationInfo() + msg, e);
-            } else {
-                logger.error(LogUtil.buildLocationInfo() + format(msg, params), e);
-            }
-        }
-
-    }
-
-
-    /**
-     * Get the class name, method and line number that calls LogUtil
-     *
-     * @return location information string
-     */
-    private static String buildLocationInfo() {
-        StringBuilder header = new StringBuilder();
-        // LOG4J2-1029 new Throwable().getStackTrace is faster than Thread.currentThread().getStackTrace().
-        final StackTraceElement[] stackTraceElements = new Throwable().getStackTrace();
-
-        for (int i = 0; i < stackTraceElements.length - 1; i++) {
-            StackTraceElement currentStackTrace = stackTraceElements[i];
-            StackTraceElement nextStackTrace = stackTraceElements[i + 1];
-
-            // If current stack trace is in LogUtil
-            // and next stack trace is not in LogUtil
-            // then the next node is the caller of LogUtil
-            if (LogUtil.class.getName().equals(currentStackTrace.getClassName())
-                    && !LogUtil.class.getName().equals(nextStackTrace.getClassName())) {
-                String stackTrace = nextStackTrace.toString();
-                header.append(" ").append(StringUtils.removeStart(stackTrace, nextStackTrace.getClassName() + "."));
-                break;
-            }
-        }
-        return header.append(":").toString();
-    }
-
-    private static String format(String msg, Object... params) {
-        if (StringUtils.isEmpty(msg)) {
-            return StringUtils.EMPTY;
-        }
-        if (params != null && params.length > 0) {
-            msg = MessageFormat.format(msg, params);
-        }
-        return msg.replaceAll(TEMPLATE_REGEX, StringUtils.EMPTY);
-    }
-
-    private static String toString(Object object) {
-        return ToStringBuilder.reflectionToString(object, ToStringStyle.SHORT_PREFIX_STYLE);
-    }
-}

hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/AesUtilTest.java

@@ -90,15 +90,4 @@ class AesUtilTest {
         assertFalse(isCiphertext(encryptedText, invalidKey));
     }
 
-    @Test
-    void testDefaultKeyCompatibility() {
-        // Test with default key
-        String originalText = "This is a secret message";
-        // encode use default secret key
-        String encryptedText = aesEncode(originalText, AesUtil.DEFAULT_ENCODE_RULES);
-        // decode use new secret key
-        String decryptedText = aesDecode(encryptedText, "newkey1234567890");
-        // old data can decode with default secret key
-        assertEquals(originalText, decryptedText);
-    }
 }

hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/JexlExpressionRunnerTest.java

@@ -21,7 +21,6 @@ package org.apache.hertzbeat.common.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.HashMap;
@@ -70,21 +69,4 @@ public class JexlExpressionRunnerTest {
                 contains("Abc", "a")
                 """)); 
     }
-
-    @Test
-    void testJsonFunction() {
-        Map<String, Object> context = new HashMap<String, Object>();
-        context.put("$.info", "{\"current\":537132,\"grantTotal\":63129,\"instanceCode\":\"CSDZMC\",\"timeMillis\":1754579874357}");
-
-        String expression = "json:apply($.info).current";
-
-        JexlExpression expObj = JexlExpressionRunner.compile(expression);
-        assertEquals(537132, JexlExpressionRunner.evaluate(expObj, context));
-
-        context.put("$.info", "{\"grantTotal\":63129,\"instanceCode\":\"CSDZMC\",\"timeMillis\":1754579874357}");
-        assertNull(JexlExpressionRunner.evaluate(expObj, context));
-
-        context.clear();
-        assertNull(JexlExpressionRunner.evaluate(expObj, context));
-    }
 }

hertzbeat-common/src/test/java/org/apache/hertzbeat/common/util/LogUtilTest.java

@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hertzbeat.common.util;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.slf4j.Logger;
-import java.lang.reflect.Method;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.anyString;
-import static org.mockito.Mockito.contains;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-class LogUtilTest {
-
-    @Mock
-    private Logger mockLogger;
-    
-    private AutoCloseable mocks;
-
-    @BeforeEach
-    void setUp() {
-        mocks = MockitoAnnotations.openMocks(this);
-    }
-    
-    @AfterEach
-    void tearDown() throws Exception {
-        if (mocks != null) {
-            mocks.close();
-        }
-    }
-
-    @Test
-    void testFormat_noParams_returnsOriginalMessage() throws Exception {
-        String original = "hello world";
-        Method formatMethod = LogUtil.class.getDeclaredMethod("format", String.class, Object[].class);
-        formatMethod.setAccessible(true);
-        String formatted = (String) formatMethod.invoke(null, original, new Object[0]);
-        assertEquals(original, formatted);
-    }
-
-    @Test
-    void testFormat_withParams_replacesPlaceholders() throws Exception {
-        String template = "hello,{0}, world {1}!";
-        Method formatMethod = LogUtil.class.getDeclaredMethod("format", String.class, Object[].class);
-        formatMethod.setAccessible(true);
-        Object[] params = {"Alice", 123};
-        String result = (String) formatMethod.invoke(null, template, params);
-        assertTrue(result.contains("hello,Alice"));
-        assertTrue(result.contains("world 123!"));
-    }
-
-    @Test
-    void testDebug_noParams_logsRawMessage() {
-        when(mockLogger.isDebugEnabled()).thenReturn(true);
-        String msg = "test-debug";
-        LogUtil.debug(mockLogger, msg);
-        verify(mockLogger).debug(contains(msg));
-    }
-
-    @Test
-    void testDebug_withParams_logsFormattedMessage() {
-        when(mockLogger.isDebugEnabled()).thenReturn(true);
-        LogUtil.debug(mockLogger, "user={0}", "Bob");
-        verify(mockLogger).debug(contains("user=Bob"));
-    }
-
-    @Test
-    void testInfo_levelOff_doesNotLog() {
-        when(mockLogger.isInfoEnabled()).thenReturn(false);
-        LogUtil.info(mockLogger, "should-not-log");
-        verify(mockLogger, never()).info(anyString());
-    }
-
-    @Test
-    void testWarn_withException_logsMessageAndException() {
-        when(mockLogger.isWarnEnabled()).thenReturn(true);
-        RuntimeException ex = new RuntimeException("warn-ex");
-        LogUtil.warn(mockLogger, ex, "warning {0}", "occurred");
-        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
-        verify(mockLogger).warn(captor.capture(), eq(ex));
-        assertTrue(captor.getValue().contains("warning occurred"));
-    }
-
-    @Test
-    void testError_withExceptionAndParams_logsError() {
-        when(mockLogger.isErrorEnabled()).thenReturn(true);
-        RuntimeException ex = new RuntimeException("err");
-        LogUtil.error(mockLogger, ex, "fail code {0}", 500);
-        ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
-        verify(mockLogger).error(captor.capture(), eq(ex));
-        assertTrue(captor.getValue().contains("fail code 500"));
-    }
-}

hertzbeat-e2e/hertzbeat-collector-basic-e2e/pom.xml

@@ -31,6 +31,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <mysql.version>8.0.30</mysql.version>
         <postgresql.version>42.5.5</postgresql.version>
     </properties>
 
@@ -81,8 +82,9 @@
 
         <!-- JDBC Drivers -->
         <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>${mysql.version}</version>
             <scope>test</scope>
             <optional>true</optional>
         </dependency>

hertzbeat-e2e/hertzbeat-collector-kafka-e2e/src/test/java/org/apache/hertzbeat/collector/collect/kafka/KafkaCollectE2eTest.java

@@ -79,7 +79,7 @@ public class KafkaCollectE2eTest {
                 .withNetwork(network)
                 .withNetworkAliases(ZOOKEEPER_NAME)
                 .waitingFor(Wait.forListeningPort())
-                .withStartupTimeout(Duration.ofSeconds(120));
+                .withStartupTimeout(Duration.ofSeconds(30));
         zookeeperContainer.setPortBindings(Collections.singletonList(ZOOKEEPER_PORT + ":" + ZOOKEEPER_PORT));
 
         Startables.deepStart(Stream.of(zookeeperContainer)).join();
@@ -90,8 +90,7 @@ public class KafkaCollectE2eTest {
                 .withNetworkAliases(KAFKA_NAME)
                 .withLogConsumer(
                         new Slf4jLogConsumer(
-                                DockerLoggerFactory.getLogger(KAFKA_IMAGE_NAME)))
-                .withStartupTimeout(Duration.ofSeconds(120));
+                                DockerLoggerFactory.getLogger(KAFKA_IMAGE_NAME)));
         Startables.deepStart(Stream.of(kafkaContainer)).join();
     }
 
@@ -114,12 +113,11 @@ public class KafkaCollectE2eTest {
         // Create Topic
         Properties properties = new Properties();
         properties.put("bootstrap.servers", bootstrapServers);
+        AdminClient adminClient = KafkaAdminClient.create(properties);
         int numPartitions = 1;
         short replicationFactor = 1;
-        try (AdminClient adminClient = KafkaAdminClient.create(properties)) {
-            NewTopic newTopic = new NewTopic(topicName, numPartitions, replicationFactor);
-            adminClient.createTopics(Collections.singletonList(newTopic)).all().get(60, TimeUnit.SECONDS);
-        }
+        NewTopic newTopic = new NewTopic(topicName, numPartitions, replicationFactor);
+        adminClient.createTopics(Collections.singletonList(newTopic)).all().get(60, TimeUnit.SECONDS);
 
         // Verify the information of topic list monitoring
         builder = CollectRep.MetricsData.newBuilder();

hertzbeat-manager/pom.xml

@@ -210,10 +210,6 @@
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-memory-netty</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/ConfigInitializer.java

@@ -20,15 +20,14 @@ package org.apache.hertzbeat.manager.config;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.usthe.sureness.util.JsonWebTokenUtil;
 import jakarta.annotation.Resource;
-import java.security.SecureRandom;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
+import java.util.Random;
 import java.util.TimeZone;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.manager.GeneralConfig;
-import org.apache.hertzbeat.common.util.AesUtil;
 import org.apache.hertzbeat.common.util.TimeZoneUtil;
 import org.apache.hertzbeat.base.dao.GeneralConfigDao;
 import org.apache.hertzbeat.manager.pojo.dto.MuteConfig;
@@ -63,9 +62,6 @@ public class ConfigInitializer implements SmartLifecycle {
     @Value("${sureness.jwt.secret:" + DEFAULT_JWT_SECRET + "}")
     private String currentJwtSecret;
 
-    @Value("${common.secret:" + AesUtil.DEFAULT_ENCODE_RULES + "}")
-    private String currentAesSecret;
-
     @Resource
     private SystemGeneralConfigServiceImpl systemGeneralConfigService;
 
@@ -114,41 +110,30 @@ public class ConfigInitializer implements SmartLifecycle {
         // for template config, flush the template config in db to memory
         TemplateConfig templateConfig = templateConfigService.getConfig();
         appService.updateCustomTemplateConfig(templateConfig);
-        // for system jwt secrets and aes secret
-        boolean needUpdate = false;
-        SystemSecret.SystemSecretBuilder systemSecretBuilder = SystemSecret.builder();
-        SystemSecret systemSecret = systemSecretService.getConfig();
-        if (systemSecret != null) {
-            systemSecretBuilder.jwtSecret(systemSecret.getJwtSecret());
-            systemSecretBuilder.aesSecret(systemSecret.getAesSecret());
-        }
+        // for system secrets
         if (DEFAULT_JWT_SECRET.equals(currentJwtSecret)) {
             // use the random jwt secret
+            SystemSecret systemSecret = systemSecretService.getConfig();
             if (systemSecret == null || StringUtils.isBlank(systemSecret.getJwtSecret())) {
-                currentJwtSecret = randomizeSecret(DEFAULT_JWT_SECRET);
-                systemSecretBuilder.jwtSecret(currentJwtSecret);
-                needUpdate = true;
+                char[] chars = DEFAULT_JWT_SECRET.toCharArray();
+                Random rand = new Random();
+                for (int i = 0; i < chars.length; i++) {
+                    int index = rand.nextInt(chars.length);
+                    char temp = chars[i];
+                    chars[i] = chars[index];
+                    chars[index] = temp;
+                }
+                currentJwtSecret = new String(chars);
+                systemSecret = SystemSecret.builder().jwtSecret(currentJwtSecret).build();
+                systemSecretService.saveConfig(systemSecret);
             } else {
                 currentJwtSecret = systemSecret.getJwtSecret();
             }
         }
-        // else use the user custom jwt secret, set the jwt secret token in util
+        // else use the user custom jwt secret
+        // set the jwt secret token in util
         JsonWebTokenUtil.setDefaultSecretKey(currentJwtSecret);
-        // Aes secret config
-        if (AesUtil.DEFAULT_ENCODE_RULES.equals(currentAesSecret)) {
-            // use the random aes secret
-            if (systemSecret == null || StringUtils.isBlank(systemSecret.getAesSecret())) {
-                currentAesSecret = randomizeSecret(AesUtil.DEFAULT_ENCODE_RULES);
-                systemSecretBuilder.aesSecret(currentAesSecret);
-                needUpdate = true;
-            } else {
-                currentAesSecret = systemSecret.getAesSecret();
-            }
-        }
-        AesUtil.setDefaultSecretKey(currentAesSecret);
-        if (needUpdate) {
-            systemSecretService.saveConfig(systemSecretBuilder.build());
-        }
+
         // init web-app mute config
         MuteConfig muteConfig = muteGeneralConfigService.getConfig();
         if (muteConfig == null) {
@@ -177,18 +162,4 @@ public class ConfigInitializer implements SmartLifecycle {
     public int getPhase() {
         return Ordered.HIGHEST_PRECEDENCE;
     }
-
-    private String randomizeSecret(String secret) {
-        SecureRandom random = new SecureRandom();
-        StringBuilder sb = new StringBuilder(secret.length());
-        for (int i = 0; i < secret.length(); i++) {
-            char ch;
-            do {
-                int codePoint = random.nextInt('z' - '0' + 1) + '0';
-                ch = (char) codePoint;
-            } while (!Character.isLetterOrDigit(ch));
-            sb.append(ch);
-        }
-        return sb.toString();
-    }
 }

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/SwaggerConfig.java

@@ -43,12 +43,12 @@ public class SwaggerConfig {
                 .info(new Info()
                         .title("HertzBeat")
                         .description("An Open-Source Real-time Monitoring Tool.")
-                        .termsOfService("https://hertzbeat.apache.org/")
+                        .termsOfService("https://hertzbeat.com/")
                         .contact(new Contact().name("tom").url("https://github.com/tomsun28").email("tomsun28@outlook.com"))
                         .version("v1.0")
                         .license(new License().name("Apache 2.0").url("https://www.apache.org/licenses/LICENSE-2.0")))
                 .externalDocs(new ExternalDocumentation()
-                        .description("HertzBeat Docs").url("https://hertzbeat.apache.org/docs/"))
+                        .description("HertzBeat Docs").url("https://hertzbeat.com/docs/"))
                 .addSecurityItem(new SecurityRequirement().addList(SECURITY_SCHEME_NAME))
                 .components(new Components().addSecuritySchemes(SECURITY_SCHEME_NAME,
                         new SecurityScheme()

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/controller/GeneralConfigController.java

@@ -17,6 +17,7 @@
 
 package org.apache.hertzbeat.manager.controller;
 
+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;
@@ -24,7 +25,6 @@ import jakarta.annotation.Resource;
 import jakarta.validation.constraints.NotNull;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.hertzbeat.common.entity.dto.Message;
-import org.apache.hertzbeat.common.util.CommonUtil;
 import org.apache.hertzbeat.common.util.ResponseUtil;
 import org.apache.hertzbeat.manager.pojo.dto.TemplateConfig;
 import org.apache.hertzbeat.manager.service.ConfigService;
@@ -37,19 +37,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.TextStyle;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
 /**
  * Alert sender Configuration API
  */
@@ -58,9 +45,6 @@ import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 @Tag(name = "Alert sender Configuration API")
 @Slf4j
 public class GeneralConfigController {
-
-    private static final Set<String> ZONE_IDS = ZoneId.getAvailableZoneIds();
-
     @Resource
     private ConfigService configService;
 
@@ -90,28 +74,4 @@ public class GeneralConfigController {
             @RequestBody TemplateConfig.AppTemplate template) {
         return ResponseUtil.handle(() -> configService.updateTemplateAppConfig(app, template));
     }
-
-    @GetMapping(path = "/timezones")
-    @Operation(summary = "Get all available timezones and their current UTC offset", description = "Get all available timezones and their current UTC offset")
-    public ResponseEntity<Message<List<Map<String, String>>>> getTimezones() {
-        List<Map<String, String>> timezones = ZONE_IDS.stream()
-                .map(id -> {
-                    try {
-                        ZoneId zoneId = ZoneId.of(id);
-                        ZonedDateTime now = ZonedDateTime.now(zoneId);
-                        int totalSeconds = now.getOffset().getTotalSeconds();
-                        String offset = String.format("UTC%+03d:%02d", totalSeconds / 3600, Math.abs((totalSeconds / 60) % 60));
-                        String displayName = zoneId.getDisplayName(TextStyle.FULL, Locale.getDefault());
-                        return Map.of("zoneId", id, "offset", offset, "displayName", displayName);
-                    } catch (Exception e) {
-                        String errorMsg = CommonUtil.getMessageFromThrowable(e);
-                        log.warn("Query Timezone failed. {} ", errorMsg);
-                        return null;
-                    }
-                })
-                .filter(t -> Objects.nonNull(t) && Objects.nonNull(t.get("zoneId")))
-                .sorted(Comparator.comparing(m -> m.get("zoneId")))
-                .collect(Collectors.toList());
-        return ResponseEntity.ok(Message.success(timezones));
-    }
 }

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/pojo/dto/SystemSecret.java

@@ -35,9 +35,4 @@ public class SystemSecret {
      * secret key for jwt
      */
     private String jwtSecret;
-
-    /**
-     * secret key for aes
-     */
-    private String aesSecret;
 }

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/CollectorJobScheduler.java

@@ -36,7 +36,6 @@ import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectJobServi
 import org.apache.hertzbeat.collector.dispatch.entrance.internal.CollectResponseEventListener;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.entity.dto.CollectorInfo;
-import org.apache.hertzbeat.common.entity.dto.ServerInfo;
 import org.apache.hertzbeat.common.entity.job.Configmap;
 import org.apache.hertzbeat.common.entity.job.Job;
 import org.apache.hertzbeat.common.entity.manager.Collector;
@@ -46,7 +45,6 @@ import org.apache.hertzbeat.common.entity.manager.Param;
 import org.apache.hertzbeat.common.entity.manager.ParamDefine;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
 import org.apache.hertzbeat.common.entity.message.CollectRep;
-import org.apache.hertzbeat.common.util.AesUtil;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.common.util.SnowFlakeIdGenerator;
 import org.apache.hertzbeat.manager.dao.CollectorDao;
@@ -149,9 +147,6 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
                 appDefine.setDefaultInterval(monitor.getIntervals());
                 appDefine.setCyclic(true);
                 appDefine.setTimestamp(System.currentTimeMillis());
-                Map<String, String> metadata = Map.of(CommonConstants.LABEL_INSTANCE_NAME, monitor.getName(),
-                        CommonConstants.LABEL_INSTANCE_HOST, monitor.getHost());
-                appDefine.setMetadata(metadata);
                 List<Param> params = paramDao.findParamsByMonitorId(monitor.getId());
                 List<Configmap> configmaps = params.stream()
                         .map(param -> Configmap.builder()
@@ -263,11 +258,9 @@ public class CollectorJobScheduler implements CollectorScheduling, CollectJobSch
         if (Objects.isNull(collector)) {
             return false;
         }
-        ServerInfo serverInfo = ServerInfo.builder().aesSecret(AesUtil.getDefaultSecretKey()).build();
         ClusterMsg.Message message = ClusterMsg.Message.newBuilder()
                 .setType(ClusterMsg.MessageType.GO_ONLINE)
                 .setDirection(ClusterMsg.Direction.REQUEST)
-                .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(serverInfo)))
                 .setIdentity(identity)
                 .build();
         ClusterMsg.Message response = this.manageServer.sendMsgSync(identity, message);

hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/scheduler/netty/process/CollectorOnlineProcessor.java

@@ -17,15 +17,12 @@
 
 package org.apache.hertzbeat.manager.scheduler.netty.process;
 
-import com.google.protobuf.ByteString;
 import io.netty.channel.ChannelHandlerContext;
 import java.net.InetSocketAddress;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.common.entity.dto.CollectorInfo;
-import org.apache.hertzbeat.common.entity.dto.ServerInfo;
 import org.apache.hertzbeat.common.entity.message.ClusterMsg;
-import org.apache.hertzbeat.common.util.AesUtil;
 import org.apache.hertzbeat.common.util.JsonUtil;
 import org.apache.hertzbeat.manager.scheduler.netty.ManageServer;
 import org.apache.hertzbeat.remoting.netty.NettyRemotingProcessor;
@@ -55,12 +52,6 @@ public class CollectorOnlineProcessor implements NettyRemotingProcessor {
         }
         this.manageServer.addChannel(collector, ctx.channel());
         this.manageServer.getCollectorAndJobScheduler().collectorGoOnline(collector, collectorInfo);
-        ServerInfo serverInfo = ServerInfo.builder().aesSecret(AesUtil.getDefaultSecretKey()).build();
-        return ClusterMsg.Message.newBuilder()
-                .setIdentity(message.getIdentity())
-                .setDirection(ClusterMsg.Direction.RESPONSE)
-                .setMsg(ByteString.copyFromUtf8(JsonUtil.toJson(serverInfo)))
-                .setType(ClusterMsg.MessageType.GO_ONLINE)
-                .build();
+        return null;
     }
 }

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

@@ -41,7 +41,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.collector.util.CollectUtil;
-import org.apache.hertzbeat.common.constants.JexlKeywordsEnum;
 import org.apache.hertzbeat.common.entity.job.Configmap;
 import org.apache.hertzbeat.common.entity.job.Job;
 import org.apache.hertzbeat.common.entity.job.Metrics;
@@ -459,10 +458,6 @@ public class AppServiceImpl implements AppService, InitializingBean {
                     throw new IllegalArgumentException(app.getApp() + " " + metrics.getName() + " " 
                             + field.getField() + " can not duplicated.");
                 }
-                if (JexlKeywordsEnum.match(field.getField())) {
-                    throw new IllegalArgumentException(app.getApp() + " " + metrics.getName() + " "
-                            + field.getField() + " prohibited keywords.");
-                }
                 fieldsSet.add(field.getField());
             }
         }
@@ -523,15 +518,16 @@ public class AppServiceImpl implements AppService, InitializingBean {
         } else {
             if (objectStoreConfig.getType() == ObjectStoreDTO.Type.OBS) {
                 appDefineStore = new ObjectStoreAppDefineStoreImpl();
-            } else if (objectStoreConfig.getType() == ObjectStoreDTO.Type.DATABASE) {
+            } else if (objectStoreConfig.getType() == ObjectStoreDTO.Type.DATABASE){
                 appDefineStore = new DatabaseAppDefineStoreImpl();
             } else {
                 appDefineStore = new LocalFileAppDefineStoreImpl();
             }
         }
-        jarAppDefineStore.loadAppDefines();
-        // merge define yml files inside jars
-        appDefineStore.loadAppDefines();
+        var success = appDefineStore.loadAppDefines();
+        if (!success) {
+            new JarAppDefineStoreImpl().loadAppDefines();
+        }
     }
 
     private interface AppDefineStore {
@@ -713,7 +709,7 @@ public class AppServiceImpl implements AppService, InitializingBean {
                             }
                         }
                     });
-            return true;
+            return false;
         }
 
         @Override
@@ -773,7 +769,8 @@ public class AppServiceImpl implements AppService, InitializingBean {
                     appDefines.put(define.getApp().toLowerCase(), app);
                 }
             }
-            return true;
+            // merge define yml files inside jars
+            return false;
         }
 
         @Override

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

@@ -67,7 +67,7 @@ public class LabelServiceImpl implements LabelService {
     public void modifyLabel(Label label) {
         Optional<Label> optional = labelDao.findById(label.getId());
         if (optional.isPresent()) {
-
+            
             Optional<Label> existOptional = labelDao.findLabelByNameAndTagValue(label.getName(), label.getTagValue());
             if (existOptional.isPresent() && !existOptional.get().getId().equals(label.getId())) {
                 throw new IllegalArgumentException("The label with same key and value already exists.");
@@ -116,38 +116,33 @@ public class LabelServiceImpl implements LabelService {
 
     @Override
     public void deleteLabels(HashSet<Long> ids) {
-        if (CollectionUtils.isEmpty(ids)) {
+        if (CollectionUtils.isEmpty(ids)){
             return;
         }
         labelDao.deleteLabelsByIdIn(ids);
     }
 
-    @Override
-    public List<Label> determineNewLabels(Set<Map.Entry<String, String>> originLabels) {
+    public List<Label> determineNewLabels(Set<Map.Entry<String, String>> originLabels){
 
         if (originLabels == null || originLabels.isEmpty()) return List.of();
 
         // Get all labels from the database
-        Set<Label> allLabels = labelDao.findAll().stream()
-                .map(label -> Label.builder()
-                        .name(label.getName())
-                        .tagValue(label.getTagValue())
-                        .build())
+        Set<Map.Entry<String, String>> allLabels = labelDao.findAll().stream()
+                .map(label -> Map.entry(label.getName(), label.getTagValue()))
                 .collect(Collectors.toSet());
 
         // If the bound label (key:value) does not exist, then add it
-        return originLabels.stream()
-                .map(entry -> Label.builder()
-                        .name(entry.getKey())
-                        .tagValue(entry.getValue())
-                        .build())
+        Set<Map.Entry<String, String>> addLabelsKv = originLabels.stream()
                 .filter(label -> !allLabels.contains(label))
-                .map(label -> Label.builder()
-                        .id(null)
-                        .name(label.getName())
-                        .tagValue(label.getTagValue())
-                        .type((byte) 0)
-                        .build())
-                .toList();
+                .collect(Collectors.toCollection(HashSet::new));
+
+        return addLabelsKv.stream().map(kv -> {
+            Label label = new Label();
+            label.setId(null);
+            label.setName(kv.getKey());
+            label.setTagValue(kv.getValue());
+            label.setType((byte) 0);
+            return label;
+        }).toList();
     }
 }

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

@@ -27,7 +27,6 @@ import org.apache.hertzbeat.alert.dao.AlertDefineBindDao;
 import org.apache.hertzbeat.collector.dispatch.DispatchConstants;
 import org.apache.hertzbeat.common.constants.CommonConstants;
 import org.apache.hertzbeat.common.constants.ExportFileConstants;
-import org.apache.hertzbeat.common.constants.JexlKeywordsEnum;
 import org.apache.hertzbeat.common.constants.NetworkConstants;
 import org.apache.hertzbeat.common.constants.SignConstants;
 import org.apache.hertzbeat.common.entity.grafana.GrafanaDashboard;
@@ -437,27 +436,6 @@ public class MonitorServiceImpl implements MonitorService {
                 }
             }
         }
-        checkJobFields(monitorDto.getMonitor().getApp());
-    }
-
-    private void checkJobFields(String app) {
-        if (null == app || app.trim().isEmpty()) {
-            return;
-        }
-        Job job = appService.getAppDefine(app);
-        if (null != job && !CollectionUtils.isEmpty(job.getMetrics())) {
-            for (Metrics metrics : job.getMetrics()) {
-                if (null == metrics.getFields() || metrics.getFields().isEmpty()) {
-                    continue;
-                }
-                for (Metrics.Field field : metrics.getFields()) {
-                    if (JexlKeywordsEnum.match(field.getField())) {
-                        throw new IllegalArgumentException(job.getApp() + " " + metrics.getName() + " "
-                                + field.getField() + " prohibited keywords, please modify the template information.");
-                    }
-                }
-            }
-        }
     }
 
     @Override

hertzbeat-manager/src/main/resources/application-test.yml

@@ -22,7 +22,6 @@ spring:
     url: jdbc:h2:./data/test;MODE=MYSQL
     hikari:
       max-lifetime: 120000
-
   jpa:
     show-sql: false
     database-platform: org.eclipse.persistence.platform.database.MySQLPlatform
@@ -31,10 +30,8 @@ spring:
       eclipselink:
         logging:
           level: SEVERE
-
   flyway:
     enabled: false
-
   mail:
     host: smtp.exmail.qq.com
     username: example@tancloud.cn
@@ -58,57 +55,26 @@ warehouse:
     jpa:
       enabled: true
       expire-time: 1h
-      max-history-record-num: 6000
     victoria-metrics:
       enabled: false
       url: http://localhost:8428
       username: root
       password: root
       insert:
-        buffer-size: 100
+        buffer-size: 1000
         flush-interval: 3
-        compression:
-          enabled: false
-      cluster:
-        enabled: false
-        select:
-          url: http://localhost:8481
-          username: root
-          password: root
-        insert:
-          url: http://localhost:8480
-          username: root
-          password: root
-          buffer-size: 1000
-          flush-interval: 3
     td-engine:
       enabled: false
       driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
       url: jdbc:TAOS-RS://127.0.0.1:6041/hertzbeat
       username: root
       password: taosdata
-    greptime:
-      enabled: false
-      grpc-endpoints: localhost:4001
-      http-endpoint: http://localhost:4000
-      database: public
-      username: greptime
-      password: greptime
     iot-db:
       enabled: false
       host: 127.0.0.1
       rpc-port: 6667
       username: root
       password: root
-      query-timeout-in-ms: -1
-      expire-time: '7776000000'
-    influxdb:
-      enabled: false
-      server-url: http://127.0.0.1:8086
-      username: root
-      password: root
-      expire-time: '30d'
-      replication: 1
   # store real-time metrics data, enable only one below
   real-time:
     memory:
@@ -126,58 +92,6 @@ warehouse:
       # redis db index, default: DB0
       db: 0
 
-alerter:
-  # custom console url
-  console-url: https://console.tancloud.io
-  # we work
-  we-work-webhook-url: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=
-  # ding ding talk
-  ding-talk-webhook-url: https://oapi.dingtalk.com/robot/send?access_token=
-  # fei shu fly book
-  fly-book-webhook-url: https://open.feishu.cn/open-apis/bot/v2/hook/
-  # telegram
-  telegram-webhook-url: https://api.telegram.org/bot%s/sendMessage
-  # discord
-  discord-webhook-url: https://discord.com/api/v9/channels/%s/messages
-  # serverChan
-  server-chan-webhook-url: https://sctapi.ftqq.com/%s.send
-  # gotify
-  gotify-webhook-url: http://127.0.0.1/message?token=%s
-  # alert inhibit ttl unit ms, default 14400000(4 hours)
-  inhibit:
-    ttl: 14400000
-  sms:
-    enable: false
-    type: tencent
-    tencent:
-      secret-id:
-      secret-key:
-      app-id:
-      sign-name:
-      template-id:
-    alibaba:
-      access-key-id:
-      access-key-secret:
-      sign-name:
-      template-code:
-    unisms:
-      # auth-mode: simple or hmac
-      auth-mode: simple
-      access-key-id: YOUR_ACCESS_KEY_ID
-      # hmac mode need to fill in access-key-secret
-      access-key-secret: YOUR_ACCESS_KEY_SECRET
-      signature: YOUR_SMS_SIGNATURE
-      template-id: YOUR_TEMPLATE_ID
-    smslocal:
-      api-key: YOUR_API_KEY_HERE
-    aws:
-      access-key-id: YOUR_ACCESS_KEY_ID
-      access-key-secret: YOUR_ACCESS_KEY_SECRET
-      region: AWS_REGION_FOR_END_USER_MESSAGING
-    twilio:
-      account-sid: YOUR_ACCOUNT_SID
-      auth-token: YOUR_AUTH_TOKEN
-      twilio-phone-number: YOUR_TWILIO_PHONE_NUMBER
 scheduler:
   server:
     enabled: true
@@ -186,13 +100,13 @@ scheduler:
 grafana:
   enabled: false
   url: http://127.0.0.1:3000
-  expose-url: http://127.0.0.1:3000
   username: admin
   password: admin
 
+# AI config
 # See the documentation for details : https://hertzbeat.apache.org/zh-cn/docs/help/aiConfig
 ai:
-  # AI Type:zhiPu、alibabaAi、kimiAi、sparkDesk、ollama、openRouter
+  # AI Type:zhiPu、alibabaAi、kimiAi、sparkDesk
   type:
   # Model name：glm-4、qwen-turboo、moonshot-v1-8k、generalv3.5
   model:
@@ -200,5 +114,3 @@ ai:
   api-key:
   #At present, only IFLYTEK large model needs to be filled in
   api-secret:
-  # The URL of the ollama AI service
-  api-url:

hertzbeat-manager/src/main/resources/application.yml

@@ -48,19 +48,7 @@ management:
         include:
           - 'metrics'
           - 'health'
-          - 'prometheus'
     enabled-by-default: on
-  endpoint:
-    prometheus:
-      access: read_only
-  metrics:
-    tags:
-      application: ${spring.application.name}
-      environment: ${spring.profiles.active}
-  prometheus:
-    metrics:
-      export:
-        enabled: true
 
 sureness:
   container: jakarta_servlet
@@ -150,10 +138,8 @@ warehouse:
       username: root
       password: root
       insert:
-        buffer-size: 100
+        buffer-size: 1000
         flush-interval: 3
-        compression:
-          enabled: false
       cluster:
         enabled: false
         select:

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

@@ -26,8 +26,8 @@ name:
 help:
   zh-CN: HertzBeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jmx'> JMX 协议</a> 对 Apache ActiveMQ 消息中间件的运行状态，节点，Topic等相关指标（broker、topic、memory pool、class loading、thread）进行监测。<br><span class='help_module_span'>⚠️注意：您需要在 ActiveMQ 开启 JMX 服务。<a class='help_module_content' href='https://hertzbeat.apache.org/zh-cn/docs/help/activemq'>点击查看开启步骤</a>。</span>
   en-US: "HertzBeat uses <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jmx'> JMX protocol</a> to monitor the running status, nodes, topics, and other metrics of Apache ActiveMQ message-oriented middleware. <br><span class='help_module_span'>⚠️Note: You should enable the JMX service in ActiveMQ. <a class='help_module_content' href='https://hertzbeat.apache.org/docs/help/activemq'>Click here to view the specific steps.</a></span>"
-  zh-TW: HertzBeat使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jmx'> JMX 協定</a> 對 Apache ActiveMQ 消息中介軟體的運行狀態，節點，Topic 等相關名額（broker、topic、memory pool、class loading、thread）進行監測。<br><span class='help_module_span'> ⚠️注意：您需要在 ActiveMQ 開啟 JMX 服務。<a class='help_module_content' href='https://hertzbeat.apache.org/zh-cn/docs/help/activemq'>點擊查看開啟步驟</a>。</span>
-  ja-JP: HertzBeatは <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jmx'> JMXプロトコルを介して</a> Apache ActiveMQメッセージングシステムのランタイムステータス、ノード、トピック、その他の関連メトリクスを監視します。<br><span class='help_module_span'> ⚠️注意：ActiveMQ で JMX サービスを有効にする必要があります。<a class='help_module_content' href='https://hertzbeat.apache.org/docs/help/activemq'>クリックしてガイドを見ます</a>。</span>
+  zh-TW: HertzBeat使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jmx'> JMX 協定</a> 對 Apache ActiveMQ 消息中介軟體的運行狀態，節點，Topic 等相關名額（broker、topic、memory pool、class loading、thread）進行監測。<br><span class='help_module_span'> ⚠️注意：您需要在 ActiveMQ 開啟 JMX 服務。<a class='help_module_content' href=' https://hertzbeat.apache.org/zh-cn/docs/help/activemq'>點擊查看開啟步驟</a>。</span>
+  ja-JP: HertzBeatは <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-jmx'> JMXプロトコルを介して</a> Apache ActiveMQメッセージングシステムのランタイムステータス、ノード、トピック、その他の関連メトリックを監視します。<br><span class='help_module_span'> ⚠️注意：ActiveMQ で JMX サービスを有効にする必要があります。<a class='help_module_content' href=' https://hertzbeat.apache.org/zh-cn/docs/help/activemq'>クリックしてガイドを見ます</a>。</span>
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/activemq
   en-US: https://hertzbeat.apache.org/docs/help/activemq
@@ -196,7 +196,7 @@ metrics:
         i18n:
           zh-CN: 持久化
           en-US: Persistence
-          ja-JP: 永続化
+          ja-JP: 永続性
         type: 1
       - field: DataDirectory
         i18n:
@@ -271,19 +271,19 @@ metrics:
         i18n:
           zh-CN: 平均消息大小
           en-US: Average Message Size
-          ja-JP: メッセージの平均サイズ
+          ja-JP: 平均メッセージサイズ
         type: 0
       - field: MaxMessageSize
         i18n:
           zh-CN: 最大消息大小
           en-US: Max Message Size
-          ja-JP: メッセージの最大サイズ
+          ja-JP: 最大メッセージサイズ
         type: 0
       - field: MinMessageSize
         i18n:
           zh-CN: 最小消息大小
           en-US: Min Message Size
-          ja-JP: メッセージの最小サイズ
+          ja-JP: 最小メッセージサイズ
         type: 0
     protocol: jmx
     jmx:
@@ -372,7 +372,7 @@ metrics:
         i18n:
           zh-CN: 存储消息大小
           en-US: Store Message Size
-          ja-JP: ストレージメッセージのサイズ
+          ja-JP: ストレージメッセージサイズ
       - field: AverageEnqueueTime
         type: 0
         unit: ms
@@ -407,21 +407,21 @@ metrics:
         i18n:
           zh-CN: 平均消息大小
           en-US: Average Message Size
-          ja-JP: メッセージの平均サイズ
+          ja-JP: 平均メッセージサイズ
       - field: MaxMessageSize
         type: 0
         unit: B
         i18n:
           zh-CN: 最大消息大小
           en-US: Max Message Size
-          ja-JP: メッセージの最大サイズ
+          ja-JP: 最大メッセージサイズ
       - field: MinMessageSize
         type: 0
         unit: B
         i18n:
           zh-CN: 最小消息大小
           en-US: Min Message Size
-          ja-JP: メッセージの最小サイズ
+          ja-JP: 最小メッセージサイズ
     units:
       - MemoryLimit=B->MB
     protocol: jmx
@@ -446,14 +446,14 @@ metrics:
         i18n:
           zh-CN: 指标名称
           en-US: Name
-          ja-JP: メトリクス名
+          ja-JP: 指標名
       - field: committed
         type: 0
         unit: MB
         i18n:
           zh-CN: 已分配内存
           en-US: Committed
-          ja-JP: コミットされたメモリ
+          ja-JP: コミットメモリ
       - field: init
         type: 0
         unit: MB
@@ -474,7 +474,7 @@ metrics:
         i18n:
           zh-CN: 已使用内存
           en-US: Used
-          ja-JP: 使用したメモリ
+          ja-JP: 使用済みのメモリ
     units:
       - committed=B->MB
       - init=B->MB

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

@@ -27,7 +27,7 @@ help:
   zh-CN: Hertzbeat 对 Apache Airflow 通用性能指标（airflow health、airflow version）进行采集监控。<br>您可以点击“<i>新建 Apache Airflow </i>”并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: HertzBeat monitors Apache Airflow through general performance metrics such as airflow health and airflow version. You could click the "<i>New Apache Airflow</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat對Apache Airflow通用性能指標（airflow health、airflow version）進行採集監控。<br>您可以點擊“<i>新建 Apache Airflow</i>”並進行配寘，或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: Hertzbeatは、Apache Airflowの一般的なパフォーマンスのメトリクスを監視します。 <br><i>新規Apache Airflow</i>をクリックして設定しましょう。
+  ja-JP: Hertzbeatは、Apache Airflowの一般的なパフォーマンスのメトリックを監視します。 <br><i>新規Apache Airflow</i>をクリックして設定しましょう。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/airflow/
   en-US: https://hertzbeat.apache.org/docs/help/airflow/

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システムの一般的なパフォーマンスのメトリクスを監視します。<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システムの一般的なパフォーマンスのメトリック監視します。<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
@@ -80,7 +80,7 @@ params:
     name:
       zh-CN: 复用连接
       en-US: Reuse Connection
-      ja-JP: 接続再利用
+      ja-JP: コネクション再利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -92,7 +92,7 @@ params:
     name:
       zh-CN: 使用代理
       en-US: Use Proxy Connection
-      ja-JP: プロキシ接続利用
+      ja-JP: プロキシコネクション利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -246,7 +246,7 @@ metrics:
         i18n:
           zh-CN: 操作系统版本
           en-US: System Version
-          ja-JP: オーエスバージョン
+          ja-JP: システムバージョン
       - field: uptime
         type: 1
         i18n:
@@ -544,14 +544,14 @@ metrics:
         i18n:
           zh-CN: 入站数据流量
           en-US: Receive Bytes
-          ja-JP: 受信されたバイト数
+          ja-JP: 受信バイト数
       - field: transmit_bytes
         type: 0
         unit: Mb
         i18n:
           zh-CN: 出站数据流量
           en-US: Transmit Bytes
-          ja-JP: 転送されたバイト数
+          ja-JP: 送信バイト数
     units:
       - receive_bytes=B->MB
       - transmit_bytes=B->MB
@@ -679,7 +679,7 @@ metrics:
         i18n:
           zh-CN: 执行命令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^
@@ -738,7 +738,7 @@ metrics:
         i18n:
           zh-CN: 执行命令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^

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

@@ -27,7 +27,7 @@ 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」をクリックして設定しましょう。
+  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
@@ -173,6 +173,7 @@ params:
       ja-JP: ボディ
     # type-param field type(most mapping the html input type)
     type: textarea
+    # 参数输入框提示信息
     # param field input placeholder
     placeholder: 'Available When POST PUT'
     # dependent parameter values list

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

@@ -27,7 +27,7 @@ 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: Hertzbeatは、HTTP APIを呼び出して利用可能かどうかを確認し、ビジネスステータスコード（HTTPステータスコードではない）のメトリクスを監視します。これには、API のビジネスステータスコードのパスを解析するように JsonPath を構成する必要があります。「新規API Code」をクリックして設定しましょう。
+  ja-JP: Hertzbeatは、HTTP APIを呼び出して利用可能かどうかを確認し、ビジネスステータスコード（HTTPステータスコードではない）のメトリックを監視します。これには、API のビジネスステータスコードのパスを解析するように JsonPath を構成する必要があります。「新規API Code」をクリックして設定しましょう。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/api_code
   en-US: https://hertzbeat.apache.org/docs/help/api_code

hertzbeat-manager/src/main/resources/define/app-centos.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> 对 Centos 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>您可以点击“<i>新建 Centos</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 Centos 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 Centos</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> 對 Centos 操作系统的通用性能指標 (系統信息、CPU、內存、磁盤、網卡、文件系統、TOP資源進程等) 進行採集監控。<br>您可以點擊“<i>新建 Centos</i>”並配置HOST端口賬戶等相關參數進行添加，支持SSH賬戶密碼或密鑰認證。或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> Centosシステムの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 Centos Linux</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
+  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> Centosシステムの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 Centos Linux</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/centos/
   en-US: https://hertzbeat.apache.org/docs/help/centos/
@@ -80,7 +80,7 @@ params:
     name:
       zh-CN: 复用连接
       en-US: Reuse Connection
-      ja-JP: 接続再利用
+      ja-JP: コネクション再利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -92,7 +92,7 @@ params:
     name:
       zh-CN: 使用代理
       en-US: Use Proxy Connection
-      ja-JP: プロキシ接続利用
+      ja-JP: プロキシコネクション利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -246,7 +246,7 @@ metrics:
         i18n:
           zh-CN: 操作系统版本
           en-US: System Version
-          ja-JP: オーエスバージョン
+          ja-JP: システムバージョン
       - field: uptime
         type: 1
         i18n:
@@ -544,14 +544,14 @@ metrics:
         i18n:
           zh-CN: 入站数据流量
           en-US: Receive Bytes
-          ja-JP: 受信されたバイト数
+          ja-JP: 受信バイト数
       - field: transmit_bytes
         type: 0
         unit: Mb
         i18n:
           zh-CN: 出站数据流量
           en-US: Transmit Bytes
-          ja-JP: 転送されたバイト数
+          ja-JP: 送信バイト数
     units:
       - receive_bytes=B->MB
       - transmit_bytes=B->MB
@@ -679,7 +679,7 @@ metrics:
         i18n:
           zh-CN: 执行命令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^
@@ -738,7 +738,7 @@ metrics:
         i18n:
           zh-CN: 执行命令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^

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

@@ -27,7 +27,7 @@ help:
   zh-CN: Hertzbeat 使用 <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-snmp'> SNMP 协议</a> 对 思科交换机 的通用指标(可用性，系统信息，端口流量等)进行采集监控。<br>您可以点击 “<i>新建 思科通用交换机</i>” 并进行配置SNMP相关参数添加，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: HertzBeat uses <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-snmp'> SNMP Protocol</a> to monitoring Cisco Switch general performance metrics. <br>You can click the "<i>New Cisco Switch</i>" button and config snmp params to add monitor 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-snmp'> SNMP 協議</a> 對 思科交換機 的通用指標(可用性，系統信息，端口流量等)進行采集監控。<br>您可以點擊 “<i>新建 思科通用交換機</i>” 並進行配置SNMP相關參數添加，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-snmp'> SNMP プロトコルを介して</a> シスコ・スイッチングハブの一般的なメトリクスを監視します。<br>「<i>新規 シスコ・スイッチングハブ</i>」をクリックしてSNMPなどのパラメタを設定した後、新規することができます。
+  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-snmp'> SNMP プロトコルを介して</a> シスコ・スイッチングハブの一般的なメトリック監視します。<br>「<i>新規 シスコ・スイッチングハブ</i>」をクリックしてSNMPなどのパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/cisco_switch
   en-US: https://hertzbeat.apache.org/docs/help/cisco_switch
@@ -361,13 +361,13 @@ metrics:
         i18n:
           zh-CN: 入流量
           en-US: In Octets
-          ja-JP: 受信されたバイト数
+          ja-JP: 受信バイト数
       - field: in_discards
         type: 0
         i18n:
           zh-CN: 入丢包数
           en-US: In Discards
-          ja-JP: 受信されたパケットのロス数
+          ja-JP: 受信パケットロス数
       - field: in_errors
         type: 0
         i18n:
@@ -380,19 +380,19 @@ metrics:
         i18n:
           zh-CN: 出流量
           en-US: Out Octets
-          ja-JP: 転送されたバイト数
+          ja-JP: 送信バイト数
       - field: out_discards
         type: 0
         i18n:
           zh-CN: 出丢包数
           en-US: Out Discards
-          ja-JP: 転送されたパケットロス数
+          ja-JP: 送信パケットロス数
       - field: out_errors
         type: 0
         i18n:
           zh-CN: 出错包数
           en-US: Out Errors
-          ja-JP: 転送された異常パケット数
+          ja-JP: 送信異常パケット数
       - field: admin_status
         type: 1
         i18n:
@@ -404,7 +404,7 @@ metrics:
         i18n:
           zh-CN: 当前状态
           en-US: Current Status
-          ja-JP: 現在のステータス
+          ja-JP: ステータス
     # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
     aliasFields:
       - ifIndex

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

@@ -27,7 +27,7 @@ help:
   zh-CN: Hertzbeat 对 ClickHouse 数据库监控通用指标进行测量监控。<br>您可以点击 “<i>新建 ClickHouse 数据库</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: Hertzbeat monitors the status codes which returned by the API. You could click the "<i>New ClickHouse Database</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat 對 ClickHouse 資料庫監控通用名額進行量測監控。<br>您可以點擊 “<i>新建ClickHouse資料庫</i>” 並進行配寘，或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: Hertzbeat は ClickHouse データベースの一般的なメトリクスを監視します。<br>「<i>新規 ClickHouse データベース</i>」をクリックしてパラメタを設定した後、新規することができます。
+  ja-JP: Hertzbeat は ClickHouse データベースの一般的なメトリック監視します。<br>「<i>新規 ClickHouse データベース</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/clickhouse
   en-US: https://hertzbeat.apache.org/docs/help/clickhouse
@@ -161,19 +161,19 @@ metrics:
         i18n:
           zh-CN: 指标名称
           en-US: metric
-          ja-JP: メトリクス名
+          ja-JP: メトリック名
       - field: value
         type: 0
         i18n:
           zh-CN: 指标值
           en-US: value
-          ja-JP: メトリクス値
+          ja-JP: メトリック値
       - field: description
         type: 1
         i18n:
           zh-CN: 说明
           en-US: description
-          ja-JP: メトリクス説明
+          ja-JP: メトリック説明
     protocol: jdbc
     jdbc:
       host: ^_^host^_^
@@ -236,19 +236,19 @@ metrics:
         i18n:
           zh-CN: 指标名称
           en-US: metric
-          ja-JP: メトリクス名
+          ja-JP: メトリック名
       - field: value
         type: 0
         i18n:
           zh-CN: 指标值
           en-US: value
-          ja-JP: メトリクス値
+          ja-JP: メトリック値
       - field: description
         type: 1
         i18n:
           zh-CN: 说明
           en-US: description
-          ja-JP: メトリクス説明
+          ja-JP: メトリック説明
     protocol: jdbc
     jdbc:
       host: ^_^host^_^

hertzbeat-manager/src/main/resources/define/app-coreos.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> 对 Fedora CoreOS 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>您可以点击“<i>新建 Fedora CoreOS</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 Fedora CoreOS 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 Fedora CoreOS</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> 對 Fedora CoreOS 操作系统的通用性能指標 (系統信息、CPU、內存、磁盤、網卡、文件系統、TOP資源進程等) 進行採集監控。<br>您可以點擊“<i>新建 Fedora CoreOS</i>”並配置HOST端口賬戶等相關參數進行添加，支持SSH賬戶密碼或密鑰認證。或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSH プロトコルを介して</a> Fedora CoreOSの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 Fedora CoreOS</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
+  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSH プロトコルを介して</a> Fedora CoreOSの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 Fedora CoreOS</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/coreos
   en-US: https://hertzbeat.apache.org/docs/help/coreos
@@ -80,7 +80,7 @@ params:
     name:
       zh-CN: 复用连接
       en-US: Reuse Connection
-      ja-JP: 接続再利用
+      ja-JP: コネクション再利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -92,7 +92,7 @@ params:
     name:
       zh-CN: 使用代理
       en-US: Use Proxy Connection
-      ja-JP: プロキシ接続利用
+      ja-JP: プロキシコネクション利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -246,7 +246,7 @@ metrics:
         i18n:
           zh-CN: 操作系统版本
           en-US: System Version
-          ja-JP: オーエスバージョン
+          ja-JP: システムバージョン
       - field: uptime
         type: 1
         i18n:
@@ -544,14 +544,14 @@ metrics:
         i18n:
           zh-CN: 入站数据流量
           en-US: Receive Bytes
-          ja-JP: 受信されたバイト数
+          ja-JP: 受信バイト数
       - field: transmit_bytes
         type: 0
         unit: Mb
         i18n:
           zh-CN: 出站数据流量
           en-US: Transmit Bytes
-          ja-JP: 転送されたバイト数
+          ja-JP: 送信バイト数
     units:
       - receive_bytes=B->MB
       - transmit_bytes=B->MB
@@ -679,7 +679,7 @@ metrics:
         i18n:
           zh-CN: 执行命令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^
@@ -738,7 +738,7 @@ metrics:
         i18n:
           zh-CN: 执行命令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^

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

@@ -80,7 +80,7 @@ params:
 
 # collect metrics config list
 metrics:
-  - name: network_info
+  - name: network_info # 指标集合名称
     i18n:
       zh-CN: 网络信息
       en-US: Network Info

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

@@ -20,18 +20,18 @@ app: darwin
 # The monitoring i18n name
 name:
   zh-CN: Darwin操作系统
-  en-US: OS Darwin
-  ja-JP: Darwinオーエス
+  en-US: Darwin Linux
+  ja-JP: Darwin Linux
   zh-TW: Darwin操作系統
 # The description and help of this monitoring type
 help:
   zh-CN: HertzBeat 使用 <a class='help_module_content' href='https://HertzBeat.apache.org/docs/advanced/extend-ssh'> SSH 协议</a> 对 Darwin 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>您可以点击“<i>新建 Darwin</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 Darwin 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 Darwin</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> 對 Darwin 操作系统的通用性能指標 (系統信息、CPU、內存、磁盤、網卡、文件系統、TOP資源進程等) 進行採集監控。<br>您可以點擊“<i>新建 Darwin</i>”並配置HOST端口賬戶等相關參數進行添加，支持SSH賬戶密碼或密鑰認證。或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: HertzBeat は <a class='help_module_content' href='https://HertzBeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> Darwinシステムの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 Darwin Linux</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
+#  zh-TW: HertzBeat 使用 <a class='help_module_content' href='https://HertzBeat.apache.org/docs/advanced/extend-ssh'> SSH 协议</a> 對 Darwin 操作系统的通用性能指標 (系統信息、CPU、內存、磁盤、網卡、文件系統、TOP資源進程等) 進行採集監控。<br>您可以點擊“<i>新建 Darwin</i>”並配置HOST端口賬戶等相關參數進行添加，支持SSH賬戶密碼或密鑰認證。或者選擇“<i>更多操作</i>”，導入已有配寘。
+#  ja-JP: HertzBeat は <a class='help_module_content' href='https://HertzBeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> Darwinシステムの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 Darwin Linux</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
 helpLink:
-  zh-CN: https://HertzBeat.apache.org/zh-cn/docs/help/darwin/
-  en-US: https://HertzBeat.apache.org/docs/help/darwin/
+  zh-CN: https://HertzBeat.apache.org/zh-cn/docs/help/Darwin/
+  en-US: https://HertzBeat.apache.org/docs/help/Darwin/
 # Input params define for monitoring(render web ui by the definition)
 params:
   # field-param field key
@@ -77,6 +77,7 @@ params:
     # required-true or false
     required: false
     # default value
+    # 默认值
     defaultValue: 6000
   # field-param field key
   - field: reuseConnection
@@ -84,7 +85,7 @@ params:
     name:
       zh-CN: 复用连接
       en-US: Reuse Connection
-      ja-JP: 接続再利用
+      ja-JP: コネクション再利用
       zh-TW: 復用連接
     # type-param field type(most mapping the html input type)
     type: boolean
@@ -97,7 +98,7 @@ params:
     name:
       zh-CN: 使用代理
       en-US: Use Proxy Connection
-      ja-JP: プロキシ接続利用
+      ja-JP: プロキシコネクション利用
       zh-TW: 使用代理
     # type-param field type(most mapping the html input type)
     type: boolean
@@ -263,7 +264,7 @@ metrics:
         i18n:
           zh-CN: 操作系统版本
           en-US: System Version
-          ja-JP: オーエスバージョン
+          ja-JP: システムバージョン
           zh-TW: 操作系統版本
       - field: uptime
         type: 1
@@ -525,75 +526,74 @@ metrics:
         }'
       parseType: multiRow
 
-  - name: disk
-    i18n:
-      zh-CN: 磁盘信息
-      zh-TW: 磁盤信息
-      en-US: Disk Info
-      ja-JP: ディスク情報
-    priority: 3
-    fields:
-      - field: disk_num
-        type: 1
-        i18n:
-          zh-CN: 磁盘总数
-          zh-TW: 磁盤總數
-          en-US: Disk Num
-          ja-JP: ディスク番号
-      - field: partition_num
-        type: 1
-        i18n:
-          zh-CN: 分区总数
-          zh-TW: 分區總數
-          en-US: Partition Num
-          ja-JP: パーティション
-    #      - field: block_write
-    #        type: 0
-    #        i18n:
-    #          zh-CN: 写磁盘块数
-    #          zh-TW: 寫磁盤塊數
-    #          en-US: Block Write
-    #          ja-JP: 書き込みディスクブロック数
-    #      - field: block_read
-    #        type: 0
-    #        i18n:
-    #          zh-CN: 读磁盘块数
-    #          zh-TW: 讀磁盤塊數
-    #          en-US: Block Read
-    #          ja-JP: 読み取りブロック数
-    #      - field: write_rate
-    #        type: 0
-    #        unit: iops
-    #        i18n:
-    #          zh-CN: 磁盘写速率
-    #          zh-TW: 磁盤寫速率
-    #          en-US: Write Rate
-    #          ja-JP: ディスク書き込み速度
-    protocol: ssh
-    ssh:
-      host: ^_^host^_^
-      port: ^_^port^_^
-      username: ^_^username^_^
-      password: ^_^password^_^
-      privateKey: ^_^privateKey^_^
-      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
-      timeout: ^_^timeout^_^
-      reuseConnection: ^_^reuseConnection^_^
-      # whether to use proxy server for ssh connection
-      useProxy: ^_^useProxy^_^
-      # ssh proxy host: ipv4 domain
-      proxyHost: ^_^proxyHost^_^
-      # ssh proxy port
-      proxyPort: ^_^proxyPort^_^
-      # ssh proxy username
-      proxyUsername: ^_^proxyUsername^_^
-      # ssh proxy password
-      proxyPassword: ^_^proxyPassword^_^
-      # ssh proxy private key
-      proxyPrivateKey: ^_^proxyPrivateKey^_^
-      #      script: cat /proc/net/dev | tail -n +3 | awk 'BEGIN{ print "interface_name receive_bytes transmit_bytes"} {gsub(":", "", $1); print $1,$2,$10}'
-      script: diskutil list | grep '^/dev/' | wc -l; diskutil list | grep -E 'Apple_HFS|Apple_APFS|Microsoft Basic Data|Linux Filesystem' | wc -l;
-      parseType: oneRow
+#  - name: disk
+#    i18n:
+#      zh-CN: 磁盘信息
+#      zh-TW: 磁盤信息
+#      en-US: Disk Info
+#      ja-JP: ディスク情報
+#    priority: 3
+#    fields:
+#      - field: disk_num
+#        type: 1
+#        i18n:
+#          zh-CN: 磁盘总数
+#          zh-TW: 磁盤總數
+#          en-US: Disk Num
+#          ja-JP: ディスク番号
+#      - field: partition_num
+#        type: 1
+#        i18n:
+#          zh-CN: 分区总数
+#          zh-TW: 分區總數
+#          en-US: Partition Num
+#          ja-JP: パーティション
+#      - field: block_write
+#        type: 0
+#        i18n:
+#          zh-CN: 写磁盘块数
+#          zh-TW: 寫磁盤塊數
+#          en-US: Block Write
+#          ja-JP: 書き込みディスクブロック数
+#      - field: block_read
+#        type: 0
+#        i18n:
+#          zh-CN: 读磁盘块数
+#          zh-TW: 讀磁盤塊數
+#          en-US: Block Read
+#          ja-JP: 読み取りブロック数
+#      - field: write_rate
+#        type: 0
+#        unit: iops
+#        i18n:
+#          zh-CN: 磁盘写速率
+#          zh-TW: 磁盤寫速率
+#          en-US: Write Rate
+#          ja-JP: ディスク書き込み速度
+#    protocol: ssh
+#    ssh:
+#      host: ^_^host^_^
+#      port: ^_^port^_^
+#      username: ^_^username^_^
+#      password: ^_^password^_^
+#      privateKey: ^_^privateKey^_^
+#      privateKeyPassphrase: ^_^privateKeyPassphrase^_^
+#      timeout: ^_^timeout^_^
+#      reuseConnection: ^_^reuseConnection^_^
+#      # whether to use proxy server for ssh connection
+#      useProxy: ^_^useProxy^_^
+#      # ssh proxy host: ipv4 domain
+#      proxyHost: ^_^proxyHost^_^
+#      # ssh proxy port
+#      proxyPort: ^_^proxyPort^_^
+#      # ssh proxy username
+#      proxyUsername: ^_^proxyUsername^_^
+#      # ssh proxy password
+#      proxyPassword: ^_^proxyPassword^_^
+#      # ssh proxy private key
+#      proxyPrivateKey: ^_^proxyPrivateKey^_^
+#      script: cat /proc/net/dev | tail -n +3 | awk 'BEGIN{ print "interface_name receive_bytes transmit_bytes"} {gsub(":", "", $1); print $1,$2,$10}'
+#      parseType: oneRow
 
   - name: interface
     i18n:
@@ -618,7 +618,7 @@ metrics:
           zh-CN: 入站数据流量
           zh-TW: 入站數據流量
           en-US: Receive Bytes
-          ja-JP: 受信されたバイト数
+          ja-JP: 受信バイト数
       - field: transmit_bytes
         type: 0
         unit: Mb
@@ -626,7 +626,7 @@ metrics:
           zh-CN: 出站数据流量
           zh-TW: 出站數據流量
           en-US: Transmit Bytes
-          ja-JP: 転送されたバイト数
+          ja-JP: 送信バイト数
     units:
       - receive_bytes=B->MB
       - transmit_bytes=B->MB
@@ -765,7 +765,7 @@ metrics:
           zh-CN: 执行命令
           zh-TW: 執行指令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^
@@ -829,7 +829,7 @@ metrics:
           zh-CN: 执行命令
           zh-TW: 執行指令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^

hertzbeat-manager/src/main/resources/define/app-debian.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> 对 Debian 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>您可以点击“<i>新建 Debian</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 Debian 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 Debian</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> 對 Debian 操作系统的通用性能指標 (系統信息、CPU、內存、磁盤、網卡、文件系統、TOP資源進程等) 進行採集監控。<br>您可以點擊“<i>新建 Debian</i>”並配置HOST端口賬戶等相關參數進行添加，支持SSH賬戶密碼或密鑰認證。或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> Centosシステムの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 Debian</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
+  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> Centosシステムの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 Debian</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/debian
   en-US: https://hertzbeat.apache.org/docs/help/debian
@@ -80,7 +80,7 @@ params:
     name:
       zh-CN: 复用连接
       en-US: Reuse Connection
-      ja-JP: 接続再利用
+      ja-JP: コネクション再利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -92,7 +92,7 @@ params:
     name:
       zh-CN: 使用代理
       en-US: Use Proxy Connection
-      ja-JP: プロキシ接続利用
+      ja-JP: プロキシコネクション利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -245,7 +245,7 @@ metrics:
         i18n:
           zh-CN: 操作系统版本
           en-US: System Version
-          ja-JP: オーエスバージョン
+          ja-JP: システムバージョン
       - field: uptime
         type: 1
         i18n:
@@ -543,14 +543,14 @@ metrics:
         i18n:
           zh-CN: 入站数据流量
           en-US: Receive Bytes
-          ja-JP: 受信されたバイト数
+          ja-JP: 受信バイト数
       - field: transmit_bytes
         type: 0
         unit: Mb
         i18n:
           zh-CN: 出站数据流量
           en-US: Transmit Bytes
-          ja-JP: 転送されたバイト数
+          ja-JP: 送信バイト数
     units:
       - receive_bytes=B->MB
       - transmit_bytes=B->MB
@@ -678,7 +678,7 @@ metrics:
         i18n:
           zh-CN: 执行命令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^
@@ -737,7 +737,7 @@ metrics:
         i18n:
           zh-CN: 执行命令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^

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

@@ -27,7 +27,7 @@ help:
   zh-CN: HertzBeat 对 DM达梦数据库 的通用性能指标(basic、status、thread)进行采集监控，支持版本为 DM8+。<br>您可以点击“<i>新建 达梦数据库</i>”并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: HertzBeat monitors DM database of basic performance metrics such as status and thread, the version we support is DM8+. You could click the "<i>New DM</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: HertzBeat 對 DM達夢數據庫 的通用性能指標(basic、status、thread)進行采集監控，支持版本爲 DM8+。<br>您可以點擊“<i>新建 達夢數據庫</i>”並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: Hertzbeat は DM データベースの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 DM データベース</i>」をクリックしてパラメタを設定した後、新規することができます。
+  ja-JP: Hertzbeat は DM データベースの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 DM データベース</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/dm
   en-US: https://hertzbeat.apache.org/docs/help/dm

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

@@ -27,7 +27,7 @@ help:
   zh-CN: HertzBeat 对 DNS 服务相关指标进行监测。
   en-US: HertzBeat monitors related indicators of the DNS service.
   zh-TW: HertzBeat對DNS服務相關名額進行監測。
-  ja-JP: HertzBeatはDNSのメトリクスを監視します。
+  ja-JP: HertzBeatはDNSのメトリックを監視します。
 # Input params define for monitoring(render web ui by the definition)
 params:
   # field-param field key

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

@@ -27,7 +27,7 @@ help:
   zh-CN: HertzBeat 对 Docker 容器的通用性能指标（system、containers、stats）进行采集监控。<br><span class='help_module_span'>注意⚠️：为了监控 Docker 中的容器信息，您需要打开端口，让采集请求获取到对应的信息, <a class='help_module_content' href='https://hertzbeat.apache.org/zh-cn/docs/help/docker'>点击查看开启步骤</a>。</span>
   en-US: HertzBeat monitoring Docker of general performance metrics such as containers, status etc. <br><span class='help_module_span'>Note⚠️:In order to monitoring metrics of Docker, you need to enable the data export port so that the collector can collect data from here，<a class='help_module_content' href='https://hertzbeat.apache.org/docs/help/docker'>Click here to view the steps</a>.</span>
   zh-TW: HertzBeat 對 Docker 容器的通用性能指標（system、containers、stats）進行采集監控。<br><span class='help_module_span'>注意⚠️：爲了監控 Docker 中的容器信息，您需要打開端口，讓采集請求獲取到對應的信息, <a class='help_module_content' href='https://hertzbeat.apache.org/zh-cn/docs/help/docker'>點擊查看開啓步驟</a>。</span>
-  ja-JP: HertzBeat は Dockerコンテナの一般的なパフォーマンスのメトリクスを監視します。<br><span class='help_module_span'>注意⚠️：Dockerコンテナの情報を監視するために、ポートを有効にする必要があります。<a class='help_module_content' href='https://hertzbeat.apache.org/docs/help/docker'>クリックしてガイドを見ます</a>。</span>
+  ja-JP: HertzBeat は Dockerコンテナの一般的なパフォーマンスのメトリック監視します。<br><span class='help_module_span'>注意⚠️：Dockerコンテナの情報を監視するために、ポートを有効にする必要があります。<a class='help_module_content' href='https://hertzbeat.apache.org/docs/help/docker'>クリックしてガイドを見ます</a>。</span>
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/docker/
   en-US: https://hertzbeat.apache.org/docs/help/docker/
@@ -226,7 +226,7 @@ metrics:
         i18n:
           zh-CN: 命令行
           en-US: command
-          ja-JP: コマンド
+          ja-JP: 指令
         type: 1
       - field: state
         i18n:
@@ -274,9 +274,9 @@ metrics:
 
   - name: stats
     i18n:
-      zh-CN: 统计
+      zh-CN: 状态
       en-US: stats
-      ja-JP: 統計
+      ja-JP: スタッツ
     priority: 2
     fields:
       - field: name
@@ -296,7 +296,7 @@ metrics:
         i18n:
           zh-CN: 已用内存
           en-US: used memory
-          ja-JP: 使用したメモリ
+          ja-JP: 使用済みのメモリ
         type: 0
         unit: MB
       - field: memory_usage

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

@@ -26,7 +26,7 @@ help:
   zh-CN: Hertzbeat 对 DORIS 数据库BE的通用性能指标（load channel count、memtable flush total、process thread num、light work max threads等）进行采集监控，支持版本为DORIS2.0.0。<br>您可以点击 “<i>新建 Doris DatabaseBE</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: Hertzbeat monitoring Doris DatabaseBE through general performance metric such as load channel count, memtable flush total, process thread num and light work max threads. The version we support is DORIS2.0.0. You could click the "<i>New Doris DatabaseBE Monitor</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat 對 DORIS 資料庫BE的通用性能指標（load channel count、memtable flush total、process thread num、light work max threads等）進行採集監控，支持版本為DORIS2.0.0。<br>您可以點擊“<i>新建Doris DatabaseBE</i>”並進行配寘，或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: Hertzbeat は DORIS 2.0.0のデータベースBEの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 Doris DatabaseBE</i>」をクリックしてパラメタを設定した後、新規することができます。
+  ja-JP: Hertzbeat は DORIS 2.0.0のデータベースBEの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 Doris DatabaseBE</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/doris_be/
   en-US: https://hertzbeat.apache.org/docs/help/doris_be/
@@ -178,7 +178,7 @@ metrics:
     i18n:
       zh-CN: 批量发送线程池队列大小
       en-US: Send Batch Thread Pool Queue Size
-      ja-JP: バッチ転送されたスレッドプールのキューサイズ
+      ja-JP: バッチ送信スレッドプールのキューサイズ
     priority: 6
     fields:
       - field: value

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

@@ -26,7 +26,7 @@ help:
   zh-CN: Hertzbeat 对 Doris 数据库FE的通用指标（doris_fe connection total、doris_fe edit log clean、doris_fe image、doris_fe rps等）进行测量监控，支持版本为DORIS2.0.0。<br>您可以点击 “<i>新建 Doris DatabaseFE</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: Hertzbeat monitoring Doris DatabaseFE through general performance metric such as doris_fe connection total, doris_fe edit log clean, doris_fe image and doris_fe rps. The version we support is DORIS2.0.0. You could click the "<i>New Doris DatabaseFE Monitor</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat 對 Doris 資料庫FE的通用名額（doris_fe connection total、doris_fe edit log clean、doris_fe image、doris_fe rps等）進行量測監控，支持版本為DORIS2.0.0。<br>您可以點擊“<i>新建Doris DatabaseFE</i>”並進行配寘，或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: Hertzbeat は DORIS 2.0.0のデータベースFEの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 Doris DatabaseFE</i>」をクリックしてパラメタを設定した後、新規することができます。
+  ja-JP: Hertzbeat は DORIS 2.0.0のデータベースFEの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 Doris DatabaseFE</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/doris_fe/
   en-US: https://hertzbeat.apache.org/docs/help/doris_fe/
@@ -70,7 +70,7 @@ metrics:
     i18n:
       zh-CN: 连接总数
       en-US: Connection Total
-      ja-JP: 接続総数
+      ja-JP: コネクション数
     priority: 0
     fields:
       - field: value

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

@@ -26,8 +26,8 @@ name:
 help:
   zh-CN: HertzBeat 对 DynamicTp actuator 暴露的线程池性能指标（thread pool）进行采集监控。<br><span class='help_module_span'>注意⚠️：您需要集成使用 DynamicTp，<a class='help_module_content' href='https://hertzbeat.apache.org/zh-cn/docs/help/dynamic_tp'>点击查看集成步骤</a>。
   en-US: HertzBeat monitoring DynamicTp of the thread Pool Performance Metrics which exposed by DynamicTp actuator. <br><span class='help_module_span'>Note⚠️:You should integrate and use DynamicTp, <a class='help_module_content' href='https://hertzbeat.apache.org/docs/help/dynamic_tp'>Click here to view the specific steps.</a>"
-  zh-TW: HertzBeat 對 DynamicTp actuator暴露的執行緒池性能指標（thread pool）進行採集監控。<br><span class='help_module_span'>注意⚠️：您需要集成使用DynamicTp，<a class='help_module_content' href='https://hertzbeat.apache.org/zh-cn/docs/help/dynamic_tp'>點擊查看集成步驟</a>。
-  ja-JP: HertzBeat は DynamicTpスレッドプールの一般的なパフォーマンスのメトリクスを監視します。<br><span class='help_module_span'>注意⚠️：DynamicTpの使用を統合する必要があり、<a class='help_module_content' href='https://hertzbeat.apache.org/docs/help/dynamic_tp'>クリックしてガイドを見ます</a>。
+  zh-TW: HertzBeat 對 DynamicTp actuator暴露的執行緒池性能指標（thread pool）進行採集監控。<br><span class='help_ module_ span'>注意⚠️：您需要集成使用DynamicTp，<a class='help_ module_ content' href='https://hertzbeat.apache.org/zh-cn/docs/help/dynamic_tp'>點擊查看集成步驟</a>。
+  ja-JP: HertzBeat は DynamicTpスレッドプールの一般的なパフォーマンスのメトリック監視します。<br><span class='help_module_span'>注意⚠️：DynamicTpの使用を統合する必要があり、<a class='help_module_content' href='https://hertzbeat.apache.org/docs/help/dynamic_tp'>クリックしてガイドを見ます</a>。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/dynamic_tp/
   en-US: https://hertzbeat.apache.org/docs/help/dynamic_tp/
@@ -128,7 +128,7 @@ metrics:
         i18n:
           zh-CN: 公平
           en-US: fair
-          ja-JP: 公平
+          ja-JP: 目標ホスト
         type: 1
       - field: reject_handler_name
         type: 1

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

@@ -27,7 +27,7 @@ help:
   zh-CN: Hertzbeat 对 ElasticSearch 数据库监控通用指标进行测量监控。<br>您可以点击 “<i>新建 ElasticSearch</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: Hertzbeat monitoring ElasticSearch through general performance metrics. You could click the "<i>New ElasticSearch</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat 對 ElasticSearch 資料庫監控通用名額進行量測監控。<br>您可以點擊“<i>新建ElasticSearch</i>”並進行配寘，或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: HertzBeat は ElasticSearch データベースの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 ElasticSearch</i>」をクリックしてパラメタを設定した後、新規することができます。
+  ja-JP: HertzBeat は ElasticSearch データベースの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 ElasticSearch</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/elasticsearch
   en-US: https://hertzbeat.apache.org/docs/help/elasticsearch

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

@@ -27,7 +27,7 @@ help:
   zh-CN: EMQX 是一款开源的大规模分布式 MQTT 消息服务器。Hertzbeat对EMQX MQTT消息服务器 5.0+ 版本的通用指标进行测量监控，<br>您可以点击 “<i>新建 EMQX 消息服务器</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: EMQX is an open source large-scale distributed MQTT message server. Hertzbeat measures and monitors common metrics of the EMQX message server 5.0+ version.<br>You can click "<i>New EMQX message server</i>" and configure it, or select "<i>More operations</i>", Import existing configuration.
   zh-TW: EMQX 是一款開源的大規模分散式 MQTT 訊息伺服器。 Hertzbeat對EMQX MQTT訊息伺服器 5.0+ 版本的通用指標進行測量監控，<br>您可以點擊“<i>新建 EMQX 訊息伺服器</i>” 並進行配置，或者選擇“<i>更多操作</i>” ，導入已有配置。
-  ja-JP: EMQXは、オープンソースの大規模分散MQTTメッセージサーバーです。HertzbeatはEMQX MQTTメッセージサーバー（バージョン5.0+）の一般的なフォーマンスのメトリクスを監視します。<br>「<i>新規 EMQX</i>」をクリックしてパラメタを設定した後、新規することができます。
+  ja-JP: EMQXは、オープンソースの大規模分散MQTTメッセージサーバーです。HertzbeatはEMQX MQTTメッセージサーバー（バージョン5.0+）の一般的なフォーマンスのメトリック監視します。<br>「<i>新規 EMQX</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/emqx
   en-US: https://hertzbeat.apache.org/docs/help/emqx
@@ -179,7 +179,7 @@ metrics:
     i18n:
       zh-CN: 指标
       en-US: Metrics
-      ja-JP: メトリクス
+      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
@@ -203,31 +203,31 @@ metrics:
         i18n:
           zh-CN: 发送数据包
           en-US: Packets Sent
-          ja-JP: 転送されたパケット
+          ja-JP: 送信パケット
       - field: packets_received
         type: 0
         i18n:
           zh-CN: 接收数据包
           en-US: Packets Received
-          ja-JP: 受信されたパケット
+          ja-JP: 受信パケット
       - field: bytes_sent
         type: 0
         i18n:
           zh-CN: 发送字节
           en-US: Bytes Sent
-          ja-JP: 転送されたバイト数
+          ja-JP: 送信バイト数
       - field: bytes_received
         type: 0
         i18n:
           zh-CN: 接收字节
           en-US: Bytes Received
-          ja-JP: 受信されたバイト数
+          ja-JP: 受信バイト数
       - field: messages_sent
         type: 0
         i18n:
           zh-CN: 发送消息
           en-US: Messages Sent
-          ja-JP: 転送されたメッセージ
+          ja-JP: 送信メッセージ
       - field: messages_acked
         type: 0
         i18n:
@@ -257,13 +257,13 @@ metrics:
         i18n:
           zh-CN: 会话创建
           en-US: Session Created
-          ja-JP: 作成されたセッション
+          ja-JP: 目標ホスト
       - field: session_discarded
         type: 0
         i18n:
           zh-CN: 会话丢弃
           en-US: Session Discarded
-          ja-JP: 廃棄されたセッション
+          ja-JP: 目標ホスト
     # (optional)metrics field alias name, it is used as an alias field to map and convert the collected data and metrics field
     aliasFields:
       - client.connected
@@ -324,7 +324,7 @@ metrics:
     i18n:
       zh-CN: 统计
       en-US: Stats
-      ja-JP: 統計
+      ja-JP: スタッツ
     priority: 2
     fields:
       # metrics content contains field-metric name, type-metric type:0-number,1-string, instance-if is metrics, unit-metric unit('%','ms','MB')

hertzbeat-manager/src/main/resources/define/app-euleros.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> 对 EulerOS 操作系统的通用性能指标 (系统信息、CPU、内存、磁盘、网卡、文件系统、TOP资源进程等) 进行采集监控。<br>您可以点击“<i>新建 EulerOS</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 EulerOS 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 EulerOS</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> 對 EulerOS 操作系统的通用性能指標 (系統信息、CPU、內存、磁盤、網卡、文件系統、TOP資源進程等) 進行採集監控。<br>您可以點擊“<i>新建 EulerOS</i>”並配置HOST端口賬戶等相關參數進行添加，支持SSH賬戶密碼或密鑰認證。或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> EulerOS システムの一般的なパフォーマンスのメトリクスを監視します。<br>「<i>新規 EulerOS</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
+  ja-JP: Hertzbeat は <a class='help_module_content' href='https://hertzbeat.apache.org/docs/advanced/extend-ssh'> SSHプロトコルを介して</a> EulerOS システムの一般的なパフォーマンスのメトリック監視します。<br>「<i>新規 EulerOS</i>」をクリックしてホストなどのパラメタを設定した後、新規することができます。SSHまたはキー認証をサポートします。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/euleros
   en-US: https://hertzbeat.apache.org/docs/help/euleros
@@ -80,7 +80,7 @@ params:
     name:
       zh-CN: 复用连接
       en-US: Reuse Connection
-      ja-JP: 接続再利用
+      ja-JP: コネクション再利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -92,7 +92,7 @@ params:
     name:
       zh-CN: 使用代理
       en-US: Use Proxy Connection
-      ja-JP: プロキシ接続利用
+      ja-JP: プロキシコネクション利用
     # type-param field type(most mapping the html input type)
     type: boolean
     # required-true or false
@@ -246,7 +246,7 @@ metrics:
         i18n:
           zh-CN: 操作系统版本
           en-US: System Version
-          ja-JP: オーエスバージョン
+          ja-JP: システムバージョン
       - field: uptime
         type: 1
         i18n:
@@ -544,14 +544,14 @@ metrics:
         i18n:
           zh-CN: 入站数据流量
           en-US: Receive Bytes
-          ja-JP: 受信されたバイト数
+          ja-JP: 受信バイト数
       - field: transmit_bytes
         type: 0
         unit: Mb
         i18n:
           zh-CN: 出站数据流量
           en-US: Transmit Bytes
-          ja-JP: 転送されたバイト数
+          ja-JP: 送信バイト数
     units:
       - receive_bytes=B->MB
       - transmit_bytes=B->MB
@@ -679,7 +679,7 @@ metrics:
         i18n:
           zh-CN: 执行命令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^
@@ -738,7 +738,7 @@ metrics:
         i18n:
           zh-CN: 执行命令
           en-US: Command
-          ja-JP: コマンド
+          ja-JP: 指令
     protocol: ssh
     ssh:
       host: ^_^host^_^

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

@@ -27,7 +27,7 @@ help:
   zh-CN: Hertzbeat 对 Flink流引擎的通用指标进行测量监控。<br>您可以点击 “<i>新建 Flink流引擎</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: Hertzbeat monitoring Flink Stream through general performance metric. You could click the "<i>New Flink Stream</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat 對 Flink流引擎的通用名額進行量測監控。<br>您可以點擊“<i>新建Flink流引擎</i>”並進行配寘，或者選擇“<i>更多操作</i>”，導入已有配寘。
-  ja-JP: HertzBeat は Flinkの一般的なメトリクスを監視します。<br>「<i>新規 Flink</i>」をクリックしてパラメタを設定した後、新規することができます。
+  ja-JP: HertzBeat は Flinkの一般的なメトリック監視します。<br>「<i>新規 Flink</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/flink
   en-US: https://hertzbeat.apache.org/docs/help/flink
@@ -158,7 +158,7 @@ metrics:
         i18n:
           zh-CN: 已用插槽数
           en-US: Slots Used
-          ja-JP: 使用したスロット数
+          ja-JP: 使用済みのスロット数
       - field: task_total        # task count
         type: 0
         i18n:

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

@@ -27,7 +27,7 @@ help:
   zh-CN: Hertzbeat 对 Flink 流引擎 Yarn 模式的通用指标进行测量监控。<br>您可以点击 “<i>新建 Flink On Yarn</i>” 并进行配置，或者选择“<i>更多操作</i>”，导入已有配置。
   en-US: Hertzbeat monitoring Flink Stream through general performance metric. You could click the "<i>New Flink Stream</i>" button and proceed with the configuration or import an existing setup through the "<i>More Actions</i>" menu.
   zh-TW: Hertzbeat 對 Flink 流引擎 Yarn 模式的通用指標進行測量監控。<br>您可以點擊 “<i>新建 Flink On Yarn</i>” 並進行配置，或者選擇“<i>更多操作</i>”，導入已有配置。
-  ja-JP: HertzBeat は Flink 「Yarn モード」の一般的なメトリクスを監視します。<br>「<i>新規 Flink</i>」をクリックしてパラメタを設定した後、新規することができます。
+  ja-JP: HertzBeat は Flink 「Yarn モード」の一般的なメトリック監視します。<br>「<i>新規 Flink</i>」をクリックしてパラメタを設定した後、新規することができます。
 helpLink:
   zh-CN: https://hertzbeat.apache.org/zh-cn/docs/help/flink_on_yarn
   en-US: https://hertzbeat.apache.org/docs/help/flink_on_yarn
@@ -120,7 +120,7 @@ metrics:
     i18n:
       zh-CN: JobManager Metrics
       en-US: JobManager Metrics
-      ja-JP: JobManagerメトリクス
+      ja-JP: JobManagerメトリック
     priority: 0
     fields:
       - field: id
@@ -485,7 +485,7 @@ metrics:
     i18n:
       zh-CN: TaskManager Metrics
       en-US: TaskManager Metrics
-      ja-JP: TaskManagerメトリクス
+      ja-JP: TaskManagerメトリック
     priority: 3
     fields:
       - field: container_id