8x48/KnowStreaming
1
0
Fork 0
mirror of https://github.com/didi/KnowStreaming.git synced 2025-12-24 03:42:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bugfix]修复Broker列表LogSize指标存储时名称错误的问题(#759)

Browse Source
This commit is contained in:
zengqiao
2022-11-16 10:31:29 +08:00
committed by EricZeng
parent 8ffe7e7101
commit 898a55c703
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/broker/impl/BrokerMetricServiceImpl.java
View File

@@ -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);
}

8
km-core/src/main/java/com/xiaojukeji/know/streaming/km/core/service/version/metrics/kafka/BrokerMetricVersionItems.java
View File

@@ -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)