删除无效的健康分计算代码

km-common/src/main/java/com/xiaojukeji/know/streaming/km/common/enums/health/HealthStateEnum.java

@@ -0,0 +1,31 @@
+package com.xiaojukeji.know.streaming.km.common.enums.health;
+
+import lombok.Getter;
+
+
+/**
+ * 健康状态
+ */
+@Getter
+public enum HealthStateEnum {
+    UNKNOWN(-1, "未知"),
+
+    GOOD(0, "好"),
+
+    MEDIUM(1, "中"),
+
+    POOR(2, "差"),
+
+    DEAD(3, "宕机"),
+
+    ;
+
+    private final int dimension;
+
+    private final String message;
+
+    HealthStateEnum(int dimension, String message) {
+        this.dimension = dimension;
+        this.message = message;
+    }
+}

km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/cluster/impl/ClusterMetricServiceImpl.java

@@ -85,7 +85,7 @@ public class ClusterMetricServiceImpl extends BaseMetricService implements Clust
     public static final String CLUSTER_METHOD_GET_TOTAL_LOG_SIZE                            = "getTotalLogSize";
     public static final String CLUSTER_METHOD_GET_PARTITION_SIZE                            = "getPartitionSize";
     public static final String CLUSTER_METHOD_GET_PARTITION_NO_LEADER_SIZE                  = "getPartitionNoLeaderSize";
-    public static final String CLUSTER_METHOD_GET_HEALTH_SCORE                              = "getTopicHealthScore";
+    public static final String CLUSTER_METHOD_GET_HEALTH_SCORE                              = "getClusterHealthScore";
     public static final String CLUSTER_METHOD_GET_METRIC_FROM_KAFKA_BY_TOTAL_BROKERS_JMX    = "getMetricFromKafkaByTotalBrokersJMX";
     public static final String CLUSTER_METHOD_GET_METRIC_FROM_KAFKA_BY_CONTROLLER_JMX       = "getMetricFromKafkaByControllerJMX";
     public static final String CLUSTER_METHOD_GET_ZK_COUNT                                  = "getZKCount";
@@ -188,7 +188,7 @@ public class ClusterMetricServiceImpl extends BaseMetricService implements Clust
         registerVCHandler( CLUSTER_METHOD_GET_PARTITION_SIZE,                           this::getPartitionSize);
         registerVCHandler( CLUSTER_METHOD_GET_PARTITION_NO_LEADER_SIZE,                 this::getPartitionNoLeaderSize);
 
-        registerVCHandler( CLUSTER_METHOD_GET_HEALTH_SCORE,                             this::getTopicHealthScore);
+        registerVCHandler( CLUSTER_METHOD_GET_HEALTH_SCORE,                             this::getClusterHealthScore);
 
         registerVCHandler( CLUSTER_METHOD_GET_METRIC_FROM_KAFKA_BY_TOTAL_BROKERS_JMX,   this::getMetricFromKafkaByTotalBrokersJMX);
         registerVCHandler( CLUSTER_METHOD_GET_METRIC_FROM_KAFKA_BY_CONTROLLER_JMX,      this::getMetricFromKafkaByControllerJMX);
@@ -364,7 +364,7 @@ public class ClusterMetricServiceImpl extends BaseMetricService implements Clust
     /**
      * 获取集群的健康分
      */
-    private Result<ClusterMetrics> getTopicHealthScore(VersionItemParam metricParam){
+    private Result<ClusterMetrics> getClusterHealthScore(VersionItemParam metricParam){
         ClusterMetricParam param = (ClusterMetricParam)metricParam;
         ClusterMetrics clusterMetrics = healthScoreService.calClusterHealthScore(param.getClusterId());
         return Result.buildSuc(clusterMetrics);

km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/score/HealthScoreService.java

@@ -15,35 +15,16 @@ public interface HealthScoreService {
      * @param clusterPhyId 集群ID
      * @return
      */
+    @Deprecated
     ClusterMetrics calClusterHealthScore(Long clusterPhyId);
 
-    /**
-     * 获取集群Topics健康分指标
-     * @param clusterPhyId 集群ID
-     * @return
-     */
-    ClusterMetrics calClusterTopicsHealthScore(Long clusterPhyId);
-
-    /**
-     * 获取集群Brokers健康分指标
-     * @param clusterPhyId 集群ID
-     * @return
-     */
-    ClusterMetrics calClusterBrokersHealthScore(Long clusterPhyId);
-
-    /**
-     * 获取集群Groups健康分指标
-     * @param clusterPhyId 集群ID
-     * @return
-     */
-    ClusterMetrics calClusterGroupsHealthScore(Long clusterPhyId);
-
     /**
      * 获取集群健康分指标
      * @param clusterPhyId 集群ID
      * @param topicName Topic名称
      * @return
      */
+    @Deprecated
     TopicMetrics calTopicHealthScore(Long clusterPhyId, String topicName);
 
     /**
@@ -52,6 +33,7 @@ public interface HealthScoreService {
      * @param brokerId brokerId
      * @return
      */
+    @Deprecated
     BrokerMetrics calBrokerHealthScore(Long clusterPhyId, Integer brokerId);
 
     /**
@@ -60,6 +42,7 @@ public interface HealthScoreService {
      * @param groupName group名称
      * @return
      */
+    @Deprecated
     GroupMetrics calGroupHealthScore(Long clusterPhyId, String groupName);
 
     /**

km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/health/score/impl/HealthScoreServiceImpl.java

@@ -136,60 +136,6 @@ public class HealthScoreServiceImpl implements HealthScoreService {
         return metrics;
     }
 
-    @Override
-    public ClusterMetrics calClusterTopicsHealthScore(Long clusterPhyId) {
-        List<HealthScoreResult> healthScoreResultList = this.getDimensionHealthScoreResult(clusterPhyId, HealthCheckDimensionEnum.TOPIC);
-
-        ClusterMetrics metrics = new ClusterMetrics(clusterPhyId);
-        if (ValidateUtils.isEmptyList(healthScoreResultList)) {
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_SCORE_TOPICS, Constant.MIN_HEALTH_SCORE);
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_PASSED_TOPICS, 0.0f);
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_TOTAL_TOPICS, 0.0f);
-        } else {
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_SCORE_TOPICS, Math.max(this.getDimensionHealthScore(healthScoreResultList), Constant.MIN_HEALTH_SCORE));
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_PASSED_TOPICS, getHealthCheckPassed(healthScoreResultList));
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_TOTAL_TOPICS, Float.valueOf(healthScoreResultList.size()));
-        }
-
-        return metrics;
-    }
-
-    @Override
-    public ClusterMetrics calClusterBrokersHealthScore(Long clusterPhyId) {
-        List<HealthScoreResult> healthScoreResultList = this.getDimensionHealthScoreResult(clusterPhyId, HealthCheckDimensionEnum.BROKER);
-
-        ClusterMetrics metrics = new ClusterMetrics(clusterPhyId);
-        if (ValidateUtils.isEmptyList(healthScoreResultList)) {
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_SCORE_BROKERS, Constant.MIN_HEALTH_SCORE);
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_PASSED_BROKERS, 0.0f);
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_TOTAL_BROKERS, 0.0f);
-        } else {
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_SCORE_BROKERS, Math.max(this.getDimensionHealthScore(healthScoreResultList), Constant.MIN_HEALTH_SCORE));
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_PASSED_BROKERS, getHealthCheckPassed(healthScoreResultList));
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_TOTAL_BROKERS, Float.valueOf(healthScoreResultList.size()));
-        }
-
-        return metrics;
-    }
-
-    @Override
-    public ClusterMetrics calClusterGroupsHealthScore(Long clusterPhyId) {
-        List<HealthScoreResult> healthScoreResultList = this.getDimensionHealthScoreResult(clusterPhyId, HealthCheckDimensionEnum.GROUP);
-
-        ClusterMetrics metrics = new ClusterMetrics(clusterPhyId);
-        if (ValidateUtils.isEmptyList(healthScoreResultList)) {
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_SCORE_GROUPS, Constant.MIN_HEALTH_SCORE);
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_PASSED_GROUPS, 0.0f);
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_TOTAL_GROUPS, 0.0f);
-        } else {
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_SCORE_GROUPS, Math.max(this.getDimensionHealthScore(healthScoreResultList), Constant.MIN_HEALTH_SCORE));
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_PASSED_GROUPS, this.getHealthCheckPassed(healthScoreResultList));
-            metrics.getMetrics().put(CLUSTER_METRIC_HEALTH_CHECK_TOTAL_GROUPS, Float.valueOf(healthScoreResultList.size()));
-        }
-
-        return metrics;
-    }
-
     @Override
     public TopicMetrics calTopicHealthScore(Long clusterPhyId, String topicName) {
         List<HealthScoreResult> healthScoreResultList = this.getResHealthScoreResult(clusterPhyId, HealthCheckDimensionEnum.TOPIC.getDimension(), topicName);

km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/version/metrics/ClusterMetricVersionItems.java

@@ -20,22 +20,35 @@ import static com.xiaojukeji.know.streaming.km.core.service.cluster.impl.Cluster
 @Component
 public class ClusterMetricVersionItems extends BaseMetricVersionMetric {
 
+    /**
+     * 健康分
+     */
     public static final String CLUSTER_METRIC_HEALTH_SCORE                          = "HealthScore";
+    public static final String CLUSTER_METRIC_HEALTH_SCORE_TOPICS                   = "HealthScore_Topics";
+    public static final String CLUSTER_METRIC_HEALTH_SCORE_BROKERS                  = "HealthScore_Brokers";
+    public static final String CLUSTER_METRIC_HEALTH_SCORE_GROUPS                   = "HealthScore_Groups";
+    public static final String CLUSTER_METRIC_HEALTH_SCORE_CLUSTER                  = "HealthScore_Cluster";
+
+    /**
+     * 健康巡检
+     */
     public static final String CLUSTER_METRIC_HEALTH_CHECK_PASSED                   = "HealthCheckPassed";
     public static final String CLUSTER_METRIC_HEALTH_CHECK_TOTAL                    = "HealthCheckTotal";
-    public static final String CLUSTER_METRIC_HEALTH_SCORE_TOPICS                   = "HealthScore_Topics";
+
     public static final String CLUSTER_METRIC_HEALTH_CHECK_PASSED_TOPICS            = "HealthCheckPassed_Topics";
     public static final String CLUSTER_METRIC_HEALTH_CHECK_TOTAL_TOPICS             = "HealthCheckTotal_Topics";
-    public static final String CLUSTER_METRIC_HEALTH_SCORE_BROKERS                  = "HealthScore_Brokers";
+
     public static final String CLUSTER_METRIC_HEALTH_CHECK_PASSED_BROKERS           = "HealthCheckPassed_Brokers";
     public static final String CLUSTER_METRIC_HEALTH_CHECK_TOTAL_BROKERS            = "HealthCheckTotal_Brokers";
-    public static final String CLUSTER_METRIC_HEALTH_SCORE_GROUPS                   = "HealthScore_Groups";
+
     public static final String CLUSTER_METRIC_HEALTH_CHECK_PASSED_GROUPS            = "HealthCheckPassed_Groups";
     public static final String CLUSTER_METRIC_HEALTH_CHECK_TOTAL_GROUPS             = "HealthCheckTotal_Groups";
-    public static final String CLUSTER_METRIC_HEALTH_SCORE_CLUSTER                  = "HealthScore_Cluster";
+
     public static final String CLUSTER_METRIC_HEALTH_CHECK_PASSED_CLUSTER           = "HealthCheckPassed_Cluster";
     public static final String CLUSTER_METRIC_HEALTH_CHECK_TOTAL_CLUSTER            = "HealthCheckTotal_Cluster";
 
+
+
     public static final String CLUSTER_METRIC_TOTAL_REQ_QUEUE_SIZE                  = "TotalRequestQueueSize";
     public static final String CLUSTER_METRIC_TOTAL_RES_QUEUE_SIZE                  = "TotalResponseQueueSize";
     public static final String CLUSTER_METRIC_EVENT_QUEUE_SIZE                      = "EventQueueSize";