diff --git a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/common/entry/N9eResult.java b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/common/entry/N9eResult.java new file mode 100644 index 0000000000000000000000000000000000000000..5988d654fe8a0568e232273c490aabeede7e6873 --- /dev/null +++ b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/common/entry/N9eResult.java @@ -0,0 +1,35 @@ +package com.xiaojukeji.kafka.manager.account.common.entry; + +/** + * @author zengqiao + * @date 20/9/7 + */ +public class N9eResult { + private T dat; + + private String err; + + public T getDat() { + return dat; + } + + public void setDat(T dat) { + this.dat = dat; + } + + public String getErr() { + return err; + } + + public void setErr(String err) { + this.err = err; + } + + @Override + public String toString() { + return "N9eResult{" + + "dat=" + dat + + ", err='" + err + '\'' + + '}'; + } +} \ No newline at end of file diff --git a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/common/entry/N9eUserData.java b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/common/entry/N9eUserData.java new file mode 100644 index 0000000000000000000000000000000000000000..f952b55d3987680809854cf86c1b4ecae698a303 --- /dev/null +++ b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/common/entry/N9eUserData.java @@ -0,0 +1,134 @@ +package com.xiaojukeji.kafka.manager.account.common.entry; + +/** + * @author zengqiao + * @date 20/9/7 + */ +public class N9eUserData { + private Long id; + + private String uuid; + + private String username; + + private String dispname; + + private String phone; + + private String email; + + private String im; + + private String portrait; + + private Integer is_root; + + private Integer leader_id; + + private String leader_name; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getDispname() { + return dispname; + } + + public void setDispname(String dispname) { + this.dispname = dispname; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getIm() { + return im; + } + + public void setIm(String im) { + this.im = im; + } + + public String getPortrait() { + return portrait; + } + + public void setPortrait(String portrait) { + this.portrait = portrait; + } + + public Integer getIs_root() { + return is_root; + } + + public void setIs_root(Integer is_root) { + this.is_root = is_root; + } + + public Integer getLeader_id() { + return leader_id; + } + + public void setLeader_id(Integer leader_id) { + this.leader_id = leader_id; + } + + public String getLeader_name() { + return leader_name; + } + + public void setLeader_name(String leader_name) { + this.leader_name = leader_name; + } + + @Override + public String toString() { + return "EPRIResult{" + + "id=" + id + + ", uuid='" + uuid + '\'' + + ", username='" + username + '\'' + + ", dispname='" + dispname + '\'' + + ", phone='" + phone + '\'' + + ", email='" + email + '\'' + + ", im='" + im + '\'' + + ", portrait='" + portrait + '\'' + + ", is_root=" + is_root + + ", leader_id=" + leader_id + + ", leader_name='" + leader_name + '\'' + + '}'; + } +} \ No newline at end of file diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/MonitorSinkConstant.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/MonitorSinkConstant.java index 1a5feca6254bc2d4af58a54b89bbcfae1f4b569c..419c066eb759bf19609344940cb372950c8585b6 100644 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/MonitorSinkConstant.java +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/MonitorSinkConstant.java @@ -5,8 +5,6 @@ package com.xiaojukeji.kafka.manager.monitor.common; * @date 17/5/24. */ public class MonitorSinkConstant { - public static final String MONITOR_SYSTEM_TAG_DEFAULT_HOST = "kafka-manager-ser01.ys01"; - /** * 指标名前缀 */ diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/MetricSinkPoint.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/MetricSinkPoint.java index bdd4282b69a3ade0691747bf90713f64e8fe72cb..a8ca98ba8e02ec8f3800cc49eff622b4eb819cda 100644 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/MetricSinkPoint.java +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/MetricSinkPoint.java @@ -1,8 +1,6 @@ package com.xiaojukeji.kafka.manager.monitor.common.entry; -import com.xiaojukeji.kafka.manager.monitor.common.entry.sink.MonitorBaseSinkTag; - -import java.text.DecimalFormat; +import com.xiaojukeji.kafka.manager.monitor.common.entry.sink.AbstractMonitorSinkTag; /** * @author huangjw @@ -17,7 +15,7 @@ public class MetricSinkPoint { /** * 指标值 */ - private String value; + private Double value; /** * 上报周期 @@ -32,16 +30,11 @@ public class MetricSinkPoint { /** * tags */ - private MonitorBaseSinkTag tags; - - private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("0.00"); + private AbstractMonitorSinkTag tags; - public MetricSinkPoint(String name, double value, int step, long timestamp, MonitorBaseSinkTag tags) { - if (value <= 0.001) { - value = 0.0; - } + public MetricSinkPoint(String name, double value, int step, long timestamp, AbstractMonitorSinkTag tags) { this.name = name; - this.value = DECIMAL_FORMAT.format(value); + this.value = value; this.step = step; this.timestamp = timestamp; this.tags = tags; @@ -51,25 +44,45 @@ public class MetricSinkPoint { return name; } - public String getValue() { + public void setName(String name) { + this.name = name; + } + + public Double getValue() { return value; } + public void setValue(Double value) { + this.value = value; + } + + public int getStep() { + return step; + } + + public void setStep(int step) { + this.step = step; + } + public long getTimestamp() { return timestamp; } - public MonitorBaseSinkTag getTags() { + public void setTimestamp(long timestamp) { + this.timestamp = timestamp; + } + + public AbstractMonitorSinkTag getTags() { return tags; } - public int getStep() { - return step; + public void setTags(AbstractMonitorSinkTag tags) { + this.tags = tags; } @Override public String toString() { - return "MetricPoint{" + + return "MetricSinkPoint{" + "name='" + name + '\'' + ", value='" + value + '\'' + ", timestamp=" + timestamp + diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/AbstractMonitorKafkaSinkTag.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/AbstractMonitorKafkaSinkTag.java new file mode 100644 index 0000000000000000000000000000000000000000..a741c1354cddb78b83b160c545324410c6bcb1d6 --- /dev/null +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/AbstractMonitorKafkaSinkTag.java @@ -0,0 +1,13 @@ +package com.xiaojukeji.kafka.manager.monitor.common.entry.sink; + +/** + * @author zengqiao + * @date 20/5/24 + */ +public abstract class AbstractMonitorKafkaSinkTag extends AbstractMonitorSinkTag { + protected String cluster; + + public AbstractMonitorKafkaSinkTag(String cluster) { + this.cluster = cluster; + } +} \ No newline at end of file diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/AbstractMonitorSinkTag.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/AbstractMonitorSinkTag.java new file mode 100644 index 0000000000000000000000000000000000000000..ec15a64e883d8b1ac0aac5be8ff0ba724f8a3004 --- /dev/null +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/AbstractMonitorSinkTag.java @@ -0,0 +1,9 @@ +package com.xiaojukeji.kafka.manager.monitor.common.entry.sink; + +/** + * @author zengqiao + * @date 20/5/24 + */ +public abstract class AbstractMonitorSinkTag { + public abstract String convert2Tags(); +} \ No newline at end of file diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorBaseSinkTag.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorBaseSinkTag.java deleted file mode 100644 index 37f498d5e1762d23671c9726b9fa6d2ae017a07a..0000000000000000000000000000000000000000 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorBaseSinkTag.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.xiaojukeji.kafka.manager.monitor.common.entry.sink; - -/** - * @author zengqiao - * @date 20/5/24 - */ -public class MonitorBaseSinkTag { - /** - * 主机名 - */ - protected String host; - - public MonitorBaseSinkTag(String host) { - this.host = host; - } - - public String getHost() { - return host; - } - - public void setHost(String host) { - this.host = host; - } - - @Override - public String toString() { - return "BaseTag{" + - "host='" + host + '\'' + - '}'; - } -} \ No newline at end of file diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorConsumePartitionSinkTag.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorConsumePartitionSinkTag.java index f9c19409769e16b10a52c34961c72be0f1b24994..a39490ce9f3d61274fac613df00bfad9ab203631 100644 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorConsumePartitionSinkTag.java +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorConsumePartitionSinkTag.java @@ -4,19 +4,11 @@ package com.xiaojukeji.kafka.manager.monitor.common.entry.sink; * @author zengqiao * @date 20/09/02 */ -public class MonitorConsumePartitionSinkTag extends MonitorTopicPartitionSinkTag { +public class MonitorConsumePartitionSinkTag extends MonitorPartitionSinkTag { private String consumerGroup; - public MonitorConsumePartitionSinkTag(String host, String cluster, String topic, Integer partition, String consumerGroup) { - super(host, cluster, topic, partition); - this.consumerGroup = consumerGroup; - } - - public String getConsumerGroup() { - return consumerGroup; - } - - public void setConsumerGroup(String consumerGroup) { + public MonitorConsumePartitionSinkTag(String cluster, String topic, Integer partition, String consumerGroup) { + super(cluster, topic, partition); this.consumerGroup = consumerGroup; } @@ -27,7 +19,11 @@ public class MonitorConsumePartitionSinkTag extends MonitorTopicPartitionSinkTag ", topic='" + topic + '\'' + ", partition='" + partition + '\'' + ", cluster='" + cluster + '\'' + - ", host='" + host + '\'' + '}'; } + + @Override + public String convert2Tags() { + return String.format("cluster=%s,topic=%s,partition=%s,consumerGroup=%s", cluster, topic, partition, consumerGroup); + } } diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorConsumeTopicSinkTag.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorConsumeTopicSinkTag.java new file mode 100644 index 0000000000000000000000000000000000000000..74aa46a5e1696cc85532778d1e27ea71ec58425d --- /dev/null +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorConsumeTopicSinkTag.java @@ -0,0 +1,28 @@ +package com.xiaojukeji.kafka.manager.monitor.common.entry.sink; + +/** + * @author huangjw + * @date 17/5/25. + */ +public class MonitorConsumeTopicSinkTag extends MonitorTopicSinkTag { + private String consumerGroup; + + public MonitorConsumeTopicSinkTag(String cluster, String topic, String consumerGroup) { + super(cluster, topic); + this.consumerGroup = consumerGroup; + } + + @Override + public String toString() { + return "MonitorConsumeTopicSinkTag{" + + "consumerGroup='" + consumerGroup + '\'' + + ", topic='" + topic + '\'' + + ", cluster='" + cluster + '\'' + + '}'; + } + + @Override + public String convert2Tags() { + return String.format("cluster=%s,topic=%s,consumerGroup=%s", cluster, topic, consumerGroup); + } +} diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorConsumerSinkTag.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorConsumerSinkTag.java deleted file mode 100644 index ba48e4a767b84b1f6110a317df33099dae7919e4..0000000000000000000000000000000000000000 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorConsumerSinkTag.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.xiaojukeji.kafka.manager.monitor.common.entry.sink; - -/** - * @author huangjw - * @date 17/5/25. - */ -public class MonitorConsumerSinkTag extends MonitorKafkaBaseSinkTag { - private String topic; - - private String consumerGroup; - - public MonitorConsumerSinkTag(String host, String cluster, String topic, String consumerGroup) { - super(host, cluster); - this.topic = topic; - this.consumerGroup = consumerGroup; - } - - public String getTopic() { - return topic; - } - - public void setTopic(String topic) { - this.topic = topic; - } - - public String getConsumerGroup() { - return consumerGroup; - } - - public void setConsumerGroup(String consumerGroup) { - this.consumerGroup = consumerGroup; - } - - @Override - public String toString() { - return "MonitorConsumerSinkTag{" + - "topic='" + topic + '\'' + - ", consumerGroup='" + consumerGroup + '\'' + - ", cluster='" + cluster + '\'' + - ", host='" + host + '\'' + - '}'; - } -} diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorKafkaBaseSinkTag.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorKafkaBaseSinkTag.java deleted file mode 100644 index 317b0f0fd91d1d1870b6f38d245d018d574ef2f4..0000000000000000000000000000000000000000 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorKafkaBaseSinkTag.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.xiaojukeji.kafka.manager.monitor.common.entry.sink; - -/** - * @author zengqiao - * @date 20/5/24 - */ -public class MonitorKafkaBaseSinkTag extends MonitorBaseSinkTag { - protected String cluster; - - public MonitorKafkaBaseSinkTag(String host, String cluster) { - super(host); - this.cluster = cluster; - } - - public String getCluster() { - return cluster; - } - - public void setCluster(String cluster) { - this.cluster = cluster; - } - - @Override - public String toString() { - return "MonitorKafkaBaseSinkTag{" + - "cluster='" + cluster + '\'' + - ", host='" + host + '\'' + - '}'; - } -} \ No newline at end of file diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorPartitionSinkTag.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorPartitionSinkTag.java new file mode 100644 index 0000000000000000000000000000000000000000..20c5a3e785307e1e6f2067c5c7f99ecbbeead9e9 --- /dev/null +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorPartitionSinkTag.java @@ -0,0 +1,29 @@ +package com.xiaojukeji.kafka.manager.monitor.common.entry.sink; + +/** + * @author zengqiao + * @date 20/9/3 + */ +public class MonitorPartitionSinkTag extends MonitorTopicSinkTag { + protected String partition; + + public MonitorPartitionSinkTag(String cluster, String topic, Integer partition) { + super(cluster, topic); + this.topic = topic; + this.partition = String.valueOf(partition); + } + + @Override + public String toString() { + return "MonitorPartitionSinkTag{" + + "topic='" + topic + '\'' + + ", partition='" + partition + '\'' + + ", cluster='" + cluster + '\'' + + '}'; + } + + @Override + public String convert2Tags() { + return String.format("cluster=%s,topic=%s,partition=%s", cluster, topic, partition); + } +} diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorTopicPartitionSinkTag.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorTopicPartitionSinkTag.java deleted file mode 100644 index 7e65287a3b3148c23a38e52efd704eff480c7259..0000000000000000000000000000000000000000 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorTopicPartitionSinkTag.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.xiaojukeji.kafka.manager.monitor.common.entry.sink; - -/** - * @author zengqiao - * @date 20/9/3 - */ -public class MonitorTopicPartitionSinkTag extends MonitorKafkaBaseSinkTag { - protected String topic; - - protected String partition; - - public MonitorTopicPartitionSinkTag(String host, String cluster, String topic, Integer partition) { - super(host, cluster); - this.topic = topic; - this.partition = String.valueOf(partition); - } - - public String getTopic() { - return topic; - } - - public void setTopic(String topic) { - this.topic = topic; - } - - public String getPartition() { - return partition; - } - - public void setPartition(String partition) { - this.partition = partition; - } - - @Override - public String toString() { - return "MonitorTopicPartitionSinkTag{" + - "topic='" + topic + '\'' + - ", partition='" + partition + '\'' + - ", cluster='" + cluster + '\'' + - ", host='" + host + '\'' + - '}'; - } -} diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorTopicSinkTag.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorTopicSinkTag.java index 5f796103f849731c8dc985373858defb315df6e3..7d9d89101c6cf73b56d6718c0a7730c2f7410541 100644 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorTopicSinkTag.java +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorTopicSinkTag.java @@ -4,20 +4,11 @@ package com.xiaojukeji.kafka.manager.monitor.common.entry.sink; * @author huangjw * @date 17/5/24. */ -public class MonitorTopicSinkTag extends MonitorKafkaBaseSinkTag { +public class MonitorTopicSinkTag extends AbstractMonitorKafkaSinkTag { + protected String topic; - private String topic; - - public MonitorTopicSinkTag(String host, String cluster, String topic) { - super(host, cluster); - this.topic = topic; - } - - public String getTopic() { - return topic; - } - - public void setTopic(String topic) { + public MonitorTopicSinkTag(String cluster, String topic) { + super(cluster); this.topic = topic; } @@ -26,7 +17,11 @@ public class MonitorTopicSinkTag extends MonitorKafkaBaseSinkTag { return "MonitorTopicSinkTag{" + "topic='" + topic + '\'' + ", cluster='" + cluster + '\'' + - ", host='" + host + '\'' + '}'; } + + @Override + public String convert2Tags() { + return String.format("cluster=%s,topic=%s", cluster, topic); + } } diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorTopicThrottledSinkTag.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorTopicThrottledSinkTag.java index 2d1ccda4347f2f0675de0534d2e4ef23b3fbe1a7..db590638a48f6fb9bfc79c30d1d9b86ec0b95597 100644 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorTopicThrottledSinkTag.java +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/common/entry/sink/MonitorTopicThrottledSinkTag.java @@ -4,40 +4,16 @@ package com.xiaojukeji.kafka.manager.monitor.common.entry.sink; * @author crius * @date 19/5/21. */ -public class MonitorTopicThrottledSinkTag extends MonitorKafkaBaseSinkTag { - private String topic; - +public class MonitorTopicThrottledSinkTag extends MonitorTopicSinkTag { private String appId; - public MonitorTopicThrottledSinkTag(String host, String cluster, String topic, String appId) { - super(host, cluster); - this.topic = topic; - this.appId = appId; - } - - public String getTopic() { - return topic; - } - - public void setTopic(String topic) { - this.topic = topic; - } - - public String getAppId() { - return appId; - } - - public void setAppId(String appId) { + public MonitorTopicThrottledSinkTag(String cluster, String topic, String appId) { + super(cluster, topic); this.appId = appId; } @Override - public String toString() { - return "MonitorTopicThrottledSinkTag{" + - "topic='" + topic + '\'' + - ", appId='" + appId + '\'' + - ", cluster='" + cluster + '\'' + - ", host='" + host + '\'' + - '}'; + public String convert2Tags() { + return String.format("cluster=%s,topic=%s,appId=%s", cluster, topic, appId); } } diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/N9eConverter.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/N9eConverter.java index d7691a85df7a80404363ccfdfcb9c70089133f73..543af302fe8005fc3a8ebd116fc51dd54bc63eeb 100644 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/N9eConverter.java +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/N9eConverter.java @@ -13,13 +13,14 @@ import java.util.List; * @date 20/8/26 */ public class N9eConverter { - public static List convert2N9eMetricSinkPointList(List pointList) { + public static List convert2N9eMetricSinkPointList(String nid, List pointList) { if (pointList == null || pointList.isEmpty()) { return new ArrayList<>(); } List n9ePointList = new ArrayList<>(); for (MetricSinkPoint sinkPoint: pointList) { n9ePointList.add(new N9eMetricSinkPoint( + nid, sinkPoint.getName(), sinkPoint.getValue(), sinkPoint.getStep(), diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/N9eService.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/N9eService.java index 2b963c090fddda845b277ef27057f7e1d98fc7f4..9dc8d4e575773afa31b19b0554341769989ceddc 100644 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/N9eService.java +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/N9eService.java @@ -28,10 +28,13 @@ public class N9eService extends AbstractMonitorService { private Integer monitorN9eNid; @Value("${monitor.n9e.user-token}") - private String monitorN9eToken; + private String monitorN9eUserToken; - @Value("${monitor.n9e.base-url}") - private String monitorN9eBaseUrl; + @Value("${monitor.n9e.mon.base-url}") + private String monitorN9eMonBaseUrl; + + @Value("${monitor.n9e.sink.base-url}") + private String monitorN9eSinkBaseUrl; /** * 告警策略 @@ -82,7 +85,7 @@ public class N9eService extends AbstractMonitorService { String response = null; try { response = HttpUtils.postForString( - monitorN9eBaseUrl + STRATEGY_ADD_URL, + monitorN9eMonBaseUrl + STRATEGY_ADD_URL, JSON.toJSONString(N9eConverter.convert2N9eStrategy(strategy, monitorN9eNid)), buildHeader() ); @@ -106,7 +109,7 @@ public class N9eService extends AbstractMonitorService { String response = null; try { response = HttpUtils.deleteForString( - monitorN9eBaseUrl + STRATEGY_DEL_URL, + monitorN9eMonBaseUrl + STRATEGY_DEL_URL, JSON.toJSONString(params), buildHeader() ); @@ -127,7 +130,7 @@ public class N9eService extends AbstractMonitorService { String response = null; try { response = HttpUtils.putForString( - monitorN9eBaseUrl + STRATEGY_MODIFY_URL, + monitorN9eMonBaseUrl + STRATEGY_MODIFY_URL, JSON.toJSONString(N9eConverter.convert2N9eStrategy(strategy, monitorN9eNid)), buildHeader() ); @@ -150,7 +153,7 @@ public class N9eService extends AbstractMonitorService { String response = null; try { - response = HttpUtils.get(monitorN9eBaseUrl + STRATEGY_QUERY_BY_NS_URL, params, buildHeader()); + response = HttpUtils.get(monitorN9eMonBaseUrl + STRATEGY_QUERY_BY_NS_URL, params, buildHeader()); N9eResult n9eResult = JSON.parseObject(response, N9eResult.class); if (!ValidateUtils.isBlank(n9eResult.getErr())) { LOGGER.error("get monitor strategies failed, response:{}.", response); @@ -169,7 +172,7 @@ public class N9eService extends AbstractMonitorService { String response = null; try { - response = HttpUtils.get(monitorN9eBaseUrl + uri, new HashMap<>(0), buildHeader()); + response = HttpUtils.get(monitorN9eMonBaseUrl + uri, new HashMap<>(0), buildHeader()); N9eResult n9eResult = JSON.parseObject(response, N9eResult.class); if (!ValidateUtils.isBlank(n9eResult.getErr())) { LOGGER.error("get monitor strategy failed, response:{}.", response); @@ -221,13 +224,13 @@ public class N9eService extends AbstractMonitorService { public Boolean sinkMetrics(List pointList) { String response = null; try { - String content = JSON.toJSONString(N9eConverter.convert2N9eMetricSinkPointList(pointList)); + String content = JSON.toJSONString(N9eConverter.convert2N9eMetricSinkPointList(String.valueOf(this.monitorN9eNid), pointList)); long startTime = System.currentTimeMillis(); response = HttpUtils.postForString( - monitorN9eBaseUrl + COLLECTOR_SINK_DATA_URL, + monitorN9eSinkBaseUrl + COLLECTOR_SINK_DATA_URL, content, - null + buildHeader() ); LOGGER.info("sinkMetrics cost-time:{}.", System.currentTimeMillis() - startTime); @@ -251,7 +254,7 @@ public class N9eService extends AbstractMonitorService { public List getNotifyGroups() { String response = null; try { - response = HttpUtils.get(monitorN9eBaseUrl + ALL_NOTIFY_GROUP_URL, new HashMap<>(0), buildHeader()); + response = HttpUtils.get(monitorN9eMonBaseUrl + ALL_NOTIFY_GROUP_URL, new HashMap<>(0), buildHeader()); N9eResult n9eResult = JSON.parseObject(response, N9eResult.class); if (!ValidateUtils.isBlank(n9eResult.getErr())) { LOGGER.error("get notify group failed, response:{}.", response); @@ -267,8 +270,7 @@ public class N9eService extends AbstractMonitorService { private Map buildHeader() { Map header = new HashMap<>(2); header.put("Content-Type", "application/json"); - header.put("X-User-Token", monitorN9eToken); + header.put("X-User-Token", monitorN9eUserToken); return header; } - } diff --git a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/entry/N9eMetricSinkPoint.java b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/entry/N9eMetricSinkPoint.java index 2b35c29f39807dc2c762c14bf5a1706ac92d629a..a17ff0833a7813d68a14bf9db3906d447807c516 100644 --- a/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/entry/N9eMetricSinkPoint.java +++ b/kafka-manager-extends/kafka-manager-monitor/src/main/java/com/xiaojukeji/kafka/manager/monitor/component/n9e/entry/N9eMetricSinkPoint.java @@ -1,6 +1,6 @@ package com.xiaojukeji.kafka.manager.monitor.component.n9e.entry; -import com.xiaojukeji.kafka.manager.monitor.common.entry.sink.MonitorBaseSinkTag; +import com.xiaojukeji.kafka.manager.monitor.common.entry.sink.AbstractMonitorSinkTag; /** * 夜莺上报监控数据点 @@ -9,19 +9,19 @@ import com.xiaojukeji.kafka.manager.monitor.common.entry.sink.MonitorBaseSinkTag */ public class N9eMetricSinkPoint { /** - * 指标名 + * 节点ID */ - private String metric; + private String nid; /** - * 指标对应的机器 + * 指标名 */ - private String endpoint; + private String metric; /** * 指标值 */ - private String value; + private Double value; /** * 上报周期 @@ -36,42 +36,43 @@ public class N9eMetricSinkPoint { /** * tags */ - private MonitorBaseSinkTag tags; + private String tags; - public N9eMetricSinkPoint(String metric, - String value, + public N9eMetricSinkPoint(String nid, + String metric, + Double value, int step, long timestamp, - MonitorBaseSinkTag tags) { + AbstractMonitorSinkTag tags) { + this.nid = nid; this.metric = metric; - this.endpoint = tags.getHost(); this.value = value; this.step = step; this.timestamp = timestamp; - this.tags = tags; + this.tags = tags.convert2Tags(); } - public String getMetric() { - return metric; + public String getNid() { + return nid; } - public void setMetric(String metric) { - this.metric = metric; + public void setNid(String nid) { + this.nid = nid; } - public String getEndpoint() { - return endpoint; + public String getMetric() { + return metric; } - public void setEndpoint(String endpoint) { - this.endpoint = endpoint; + public void setMetric(String metric) { + this.metric = metric; } - public String getValue() { + public Double getValue() { return value; } - public void setValue(String value) { + public void setValue(Double value) { this.value = value; } @@ -91,23 +92,23 @@ public class N9eMetricSinkPoint { this.timestamp = timestamp; } - public MonitorBaseSinkTag getTags() { + public String getTags() { return tags; } - public void setTags(MonitorBaseSinkTag tags) { + public void setTags(String tags) { this.tags = tags; } @Override public String toString() { return "N9eMetricSinkPoint{" + - "metric='" + metric + '\'' + - ", endpoint='" + endpoint + '\'' + - ", value='" + value + '\'' + + "nid=" + nid + + ", metric='" + metric + '\'' + + ", value=" + value + ", step=" + step + ", timestamp=" + timestamp + - ", tags=" + tags + + ", tags='" + tags + '\'' + '}'; } } \ No newline at end of file diff --git a/kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/metrics/store/SinkCommunityTopicMetrics2Monitor.java b/kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/metrics/store/SinkCommunityTopicMetrics2Monitor.java index e412d5259696001ac16ac12ef1a91900528035fc..2256cc704f72e1da9b28da4872a7e0f201bb2213 100644 --- a/kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/metrics/store/SinkCommunityTopicMetrics2Monitor.java +++ b/kafka-manager-task/src/main/java/com/xiaojukeji/kafka/manager/task/dispatch/metrics/store/SinkCommunityTopicMetrics2Monitor.java @@ -100,7 +100,6 @@ public class SinkCommunityTopicMetrics2Monitor extends AbstractScheduledTask