From 898a55c703f2f094c8842d097757937e7daf020f Mon Sep 17 00:00:00 2001 From: zengqiao Date: Wed, 16 Nov 2022 10:31:29 +0800 Subject: [PATCH] =?UTF-8?q?[Bugfix]=E4=BF=AE=E5=A4=8DBroker=E5=88=97?= =?UTF-8?q?=E8=A1=A8LogSize=E6=8C=87=E6=A0=87=E5=AD=98=E5=82=A8=E6=97=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?(#759)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/service/broker/impl/BrokerMetricServiceImpl.java | 7 ++++--- .../version/metrics/kafka/BrokerMetricVersionItems.java | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerMetricServiceImpl.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerMetricServiceImpl.java index 2f358d8e..50bf69d4 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerMetricServiceImpl.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerMetricServiceImpl.java @@ -66,7 +66,8 @@ public class BrokerMetricServiceImpl extends BaseMetricService implements Broker public static final String BROKER_METHOD_GET_HEALTH_SCORE = "getMetricHealthScore"; public static final String BROKER_METHOD_GET_PARTITIONS_SKEW = "getPartitionsSkew"; public static final String BROKER_METHOD_GET_LEADERS_SKEW = "getLeadersSkew"; - public static final String BROKER_METHOD_GET_LOG_SIZE = "getLogSize"; + public static final String BROKER_METHOD_GET_LOG_SIZE_FROM_CLIENT = "getLogSizeFromClient"; + public static final String BROKER_METHOD_GET_LOG_SIZE_FROM_JMX = "getLogSizeFromJmx"; public static final String BROKER_METHOD_IS_BROKER_ALIVE = "isBrokerAlive"; @Autowired @@ -109,8 +110,8 @@ public class BrokerMetricServiceImpl extends BaseMetricService implements Broker registerVCHandler( BROKER_METHOD_GET_PARTITIONS_SKEW, this::getPartitionsSkew); registerVCHandler( BROKER_METHOD_GET_LEADERS_SKEW, this::getLeadersSkew); - registerVCHandler( BROKER_METHOD_GET_LOG_SIZE, V_0_10_0_0, V_1_0_0, "getLogSizeFromJmx", this::getLogSizeFromJmx); - registerVCHandler( BROKER_METHOD_GET_LOG_SIZE, V_1_0_0, V_MAX, "getLogSizeFromClient", this::getLogSizeFromClient); + registerVCHandler( BROKER_METHOD_GET_LOG_SIZE_FROM_JMX, this::getLogSizeFromJmx); + registerVCHandler( BROKER_METHOD_GET_LOG_SIZE_FROM_CLIENT, this::getLogSizeFromClient); registerVCHandler( BROKER_METHOD_IS_BROKER_ALIVE, this::isBrokerAlive); } diff --git a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/version/metrics/kafka/BrokerMetricVersionItems.java b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/version/metrics/kafka/BrokerMetricVersionItems.java index 0fc46d92..948d4d7f 100644 --- a/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/version/metrics/kafka/BrokerMetricVersionItems.java +++ b/km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/version/metrics/kafka/BrokerMetricVersionItems.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.List; import static com.xiaojukeji.know.streaming.km.common.bean.entity.version.VersionMetricControlItem.*; +import static com.xiaojukeji.know.streaming.km.common.enums.version.VersionEnum.*; import static com.xiaojukeji.know.streaming.km.common.enums.version.VersionItemTypeEnum.METRIC_BROKER; import static com.xiaojukeji.know.streaming.km.common.jmx.JmxAttribute.*; import static com.xiaojukeji.know.streaming.km.common.jmx.JmxName.*; @@ -186,9 +187,12 @@ public class BrokerMetricVersionItems extends BaseMetricVersionMetric { .jmxObjectName( JMX_SERVER_PARTITIONS ).jmxAttribute(VALUE))); // LogSize 指标 - items.add(buildAllVersionsItem() + items.add(buildItem().minVersion(V_0_10_0_0).maxVersion(V_1_0_0) .name(BROKER_METRIC_LOG_SIZE).unit("byte").desc("Broker上的消息容量大小").category(CATEGORY_PARTITION) - .extendMethod(BROKER_METHOD_GET_LOG_SIZE)); + .extendMethod(BROKER_METHOD_GET_LOG_SIZE_FROM_JMX)); + items.add(buildItem().minVersion(V_1_0_0).maxVersion(V_MAX) + .name(BROKER_METRIC_LOG_SIZE).unit("byte").desc("Broker上的消息容量大小").category(CATEGORY_PARTITION) + .extendMethod(BROKER_METHOD_GET_LOG_SIZE_FROM_CLIENT)); // ActiveControllerCount 指标 items.add(buildAllVersionsItem(BROKER_METRIC_ACTIVE_CONTROLLER_COUNT, "个").desc("Broker是否为controller").category(CATEGORY_PERFORMANCE)