(hertzbeat) 01/01: [bugfix] fix the calculator expr exist not work

[gongchao]

This is an automated email from the ASF dual-hosted git repository.

gongchao pushed a commit to branch fix-exist-error
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git

commit 62186cc254fb70b8ae6612fd9625d90c40416680
Author: tomsun28 <tomsu...@outlook.com>
AuthorDate: Thu May 1 18:17:40 2025 +0800

    [bugfix] fix the calculator expr exist not work
    
    Signed-off-by: tomsun28 <tomsu...@outlook.com>
---
 .../org/apache/hertzbeat/alert/calculate/RealTimeAlertCalculator.java | 4 ++--
 hertzbeat-manager/src/main/resources/define/app-website.yml           | 4 ++--
 script/helm/hertzbeat-helm-chart                                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/RealTimeAlertCalculator.java
 
b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/RealTimeAlertCalculator.java
index 0db6bb15cc..8c920a8482 100644
--- 
a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/RealTimeAlertCalculator.java
+++ 
b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/RealTimeAlertCalculator.java
@@ -220,11 +220,11 @@ public class RealTimeAlertCalculator {
                 fingerPrints.putAll(commonFingerPrints);
                 for (int index = 0; index < valueRow.getColumnsList().size(); 
index++) {
                     String valueStr = valueRow.getColumns(index);
+                    final CollectRep.Field field = fields.get(index);
                     if (CommonConstants.NULL_VALUE.equals(valueStr)) {
+                        fieldValueMap.put(field.getName(), null);
                         continue;
                     }
-                    
-                    final CollectRep.Field field = fields.get(index);
                     final int fieldType = field.getType();
 
                     if (fieldType == CommonConstants.TYPE_NUMBER) {
diff --git a/hertzbeat-manager/src/main/resources/define/app-website.yml 
b/hertzbeat-manager/src/main/resources/define/app-website.yml
index fd19bf25bd..98568db230 100644
--- a/hertzbeat-manager/src/main/resources/define/app-website.yml
+++ b/hertzbeat-manager/src/main/resources/define/app-website.yml
@@ -207,12 +207,12 @@ metrics:
     # collect metrics content
     fields:
       # field-metric name, type-metric type(0-number,1-string), unit-metric 
unit('%','ms','MB'), label-whether it is a metrics label field
-      - field: Content-Type
+      - field: content_type
         type: 1
         i18n:
           zh-CN: Content Type
           en-US: Content Type
-      - field: Content-Length
+      - field: content_length
         type: 1
         i18n:
           zh-CN: 响应内容长度
diff --git a/script/helm/hertzbeat-helm-chart b/script/helm/hertzbeat-helm-chart
index bdb57c002b..2fa5905e9c 160000
--- a/script/helm/hertzbeat-helm-chart
+++ b/script/helm/hertzbeat-helm-chart
@@ -1 +1 @@
-Subproject commit bdb57c002b90d4c409daddcab5ceb9560ce871a1
+Subproject commit 2fa5905e9c3cebcf96c1d98b9a6ffd5f8bab0a90


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@hertzbeat.apache.org
For additional commands, e-mail: notifications-h...@hertzbeat.apache.org