修复上报夜莺功能

This commit is contained in:
zengqiao
2020-11-22 16:56:22 +08:00
parent fb20cf6069
commit 36e3d6c18a
22 changed files with 361 additions and 284 deletions

View File

@@ -100,7 +100,6 @@ public class SinkCommunityTopicMetrics2Monitor extends AbstractScheduledTask<Clu
MonitorSinkConstant.MONITOR_SYSTEM_SINK_STEP,
timestamp,
new MonitorTopicSinkTag(
MonitorSinkConstant.MONITOR_SYSTEM_TAG_DEFAULT_HOST,
logicalClusterName,
metrics.getTopicName()
)
@@ -112,7 +111,6 @@ public class SinkCommunityTopicMetrics2Monitor extends AbstractScheduledTask<Clu
MonitorSinkConstant.MONITOR_SYSTEM_SINK_STEP,
timestamp,
new MonitorTopicSinkTag(
MonitorSinkConstant.MONITOR_SYSTEM_TAG_DEFAULT_HOST,
logicalClusterName,
metrics.getTopicName()
)
@@ -124,7 +122,6 @@ public class SinkCommunityTopicMetrics2Monitor extends AbstractScheduledTask<Clu
MonitorSinkConstant.MONITOR_SYSTEM_SINK_STEP,
timestamp,
new MonitorTopicSinkTag(
MonitorSinkConstant.MONITOR_SYSTEM_TAG_DEFAULT_HOST,
logicalClusterName,
metrics.getTopicName()
)

View File

@@ -11,7 +11,7 @@ import com.xiaojukeji.kafka.manager.common.utils.ValidateUtils;
import com.xiaojukeji.kafka.manager.common.zookeeper.znode.brokers.TopicMetadata;
import com.xiaojukeji.kafka.manager.monitor.common.entry.MetricSinkPoint;
import com.xiaojukeji.kafka.manager.monitor.common.entry.sink.MonitorConsumePartitionSinkTag;
import com.xiaojukeji.kafka.manager.monitor.common.entry.sink.MonitorConsumerSinkTag;
import com.xiaojukeji.kafka.manager.monitor.common.entry.sink.MonitorConsumeTopicSinkTag;
import com.xiaojukeji.kafka.manager.monitor.component.AbstractMonitorService;
import com.xiaojukeji.kafka.manager.service.cache.KafkaMetricsCache;
import com.xiaojukeji.kafka.manager.service.cache.LogicalClusterMetadataManager;
@@ -99,7 +99,6 @@ public class SinkConsumerMetrics2Monitor implements ApplicationListener<Consumer
MonitorSinkConstant.MONITOR_SYSTEM_SINK_STEP,
timestamp,
new MonitorConsumePartitionSinkTag(
MonitorSinkConstant.MONITOR_SYSTEM_TAG_DEFAULT_HOST,
logicalClusterName,
metrics.getTopicName(),
partitionId,
@@ -115,8 +114,7 @@ public class SinkConsumerMetrics2Monitor implements ApplicationListener<Consumer
maxLag,
MonitorSinkConstant.MONITOR_SYSTEM_SINK_STEP,
timestamp,
new MonitorConsumerSinkTag(
MonitorSinkConstant.MONITOR_SYSTEM_TAG_DEFAULT_HOST,
new MonitorConsumeTopicSinkTag(
logicalClusterName,
metrics.getTopicName(),
metrics.getConsumerGroup()
@@ -139,8 +137,7 @@ public class SinkConsumerMetrics2Monitor implements ApplicationListener<Consumer
maxDelayTime,
MonitorSinkConstant.MONITOR_SYSTEM_SINK_STEP,
timestamp,
new MonitorConsumerSinkTag(
MonitorSinkConstant.MONITOR_SYSTEM_TAG_DEFAULT_HOST,
new MonitorConsumeTopicSinkTag(
logicalClusterName,
metrics.getTopicName(),
metrics.getConsumerGroup()

View File

@@ -85,7 +85,6 @@ public class SinkTopicThrottledMetrics2Monitor implements ApplicationListener<To
MonitorSinkConstant.MONITOR_SYSTEM_SINK_STEP,
startTime / 1000,
new MonitorTopicThrottledSinkTag(
MonitorSinkConstant.MONITOR_SYSTEM_TAG_DEFAULT_HOST,
logicalClusterName,
metrics.getTopicName(),
metrics.getAppId()
@@ -100,7 +99,6 @@ public class SinkTopicThrottledMetrics2Monitor implements ApplicationListener<To
MonitorSinkConstant.MONITOR_SYSTEM_SINK_STEP,
startTime / 1000,
new MonitorTopicThrottledSinkTag(
MonitorSinkConstant.MONITOR_SYSTEM_TAG_DEFAULT_HOST,
logicalClusterName,
metrics.getTopicName(),
metrics.getAppId()