From a96318fa5d0e73bd3c584f1e8d3bccdc195961ed Mon Sep 17 00:00:00 2001
From: fengqiongfeng <fengqiongfeng@sina.com>
Date: Wed, 1 Feb 2023 13:21:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=E5=81=A5=E5=BA=B7=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../health/checker/cluster/HealthCheckClusterService.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java
index 39ee67791..7534caa62 100644
--- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java
+++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java
@@ -71,7 +71,11 @@ private HealthCheckResult checkClusterNoController(Tuple<ClusterParam, BaseClust
         );
 
         Float activeController = clusterMetricsResult.getData().getMetric(ClusterMetricVersionItems.CLUSTER_METRIC_ACTIVE_CONTROLLER_COUNT);
-
+        if (activeController == null) {
+            log.error("method=checkClusterNoController||param={}||config={}||errMsg=get metrics failed, activeControllerCount is null",
+                    param, valueConfig);
+            return null;
+        }
 
         checkResult.setPassed(activeController.intValue() != valueConfig.getValue().intValue() ? 0: 1);
 

From a5cbd4cc38b755ec7d1ec8c2cf01956412078156 Mon Sep 17 00:00:00 2001
From: fengqiongfeng <fengqiongfeng@sina.com>
Date: Wed, 1 Feb 2023 13:21:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[Optimize]=E5=81=A5=E5=BA=B7=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96(#869)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../health/checker/cluster/HealthCheckClusterService.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java
index 39ee67791..7534caa62 100644
--- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java
+++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java
@@ -71,7 +71,11 @@ private HealthCheckResult checkClusterNoController(Tuple<ClusterParam, BaseClust
         );
 
         Float activeController = clusterMetricsResult.getData().getMetric(ClusterMetricVersionItems.CLUSTER_METRIC_ACTIVE_CONTROLLER_COUNT);
-
+        if (activeController == null) {
+            log.error("method=checkClusterNoController||param={}||config={}||errMsg=get metrics failed, activeControllerCount is null",
+                    param, valueConfig);
+            return null;
+        }
 
         checkResult.setPassed(activeController.intValue() != valueConfig.getValue().intValue() ? 0: 1);
 

From 2776941cb18052946146217b181f6bfe1b3d1338 Mon Sep 17 00:00:00 2001
From: fengqiongfeng <fengqiongfeng@sina.com>
Date: Wed, 8 Feb 2023 07:54:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[Optimize]=E5=81=A5=E5=BA=B7=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96(#869)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../health/checker/cluster/HealthCheckClusterService.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java
index 7534caa62..9d31af2d3 100644
--- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java
+++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/checker/cluster/HealthCheckClusterService.java
@@ -58,7 +58,7 @@ private HealthCheckResult checkClusterNoController(Tuple<ClusterParam, BaseClust
 
         Result<ClusterMetrics> clusterMetricsResult = clusterMetricService.getLatestMetricsFromES(param.getClusterPhyId(), Arrays.asList(ClusterMetricVersionItems.CLUSTER_METRIC_ACTIVE_CONTROLLER_COUNT));
         if (clusterMetricsResult.failed() || !clusterMetricsResult.hasData()) {
-            log.error("method=checkClusterNoController||param={}||config={}||result={}||errMsg=get metrics failed",
+            log.error("method=checkClusterNoController||param={}||config={}||result={}||errMsg=get metrics from es failed",
                     param, valueConfig, clusterMetricsResult);
             return null;
         }
@@ -72,7 +72,7 @@ private HealthCheckResult checkClusterNoController(Tuple<ClusterParam, BaseClust
 
         Float activeController = clusterMetricsResult.getData().getMetric(ClusterMetricVersionItems.CLUSTER_METRIC_ACTIVE_CONTROLLER_COUNT);
         if (activeController == null) {
-            log.error("method=checkClusterNoController||param={}||config={}||errMsg=get metrics failed, activeControllerCount is null",
+            log.error("method=checkClusterNoController||param={}||config={}||errMsg=get metrics from es failed, activeControllerCount is null",
                     param, valueConfig);
             return null;
         }