Merge pull request #88 from xaecbd/dev

Dev

Author: TrumanDu

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.3.0 (2020-9-26)
+###Features / Enhancements
+* add new home page
+* add topic file size
+* enhance producer monitor
+* rebuilt cluster module
+### Bug Fixes
+* fix some bug
 # 2.2.0 (2020-7-31)
 ###Features / Enhancements
 * add monitor consumer lag api

KafkaCenter-Base/src/main/java/org/nesc/ec/bigdata/common/constant/Constant.java

@@ -5,22 +5,22 @@
  */
 public class Constant {
 
-    public class ELASTICSEARCH{
+    public class Elasticsearch {
         public static final String HITS ="hits";
         public static final String AGGREGATIONS = "aggregations";
         public static final String SCROLL_ID="_scroll_id";
     }
 
-    public class SEARCH{
+    public class Search {
         public static final String SEARCH_SCROLL="/_search/scroll";
         public static final String SEARCH_SCROLL_1M = "/_search?scroll=1m";
-        public static final String _SEARCH="/_search";
+        public static final String SEARCH_ ="/_search";
     }
 
-    public class ENCRYPTION{
+    public class Encryption {
         public static final String MD5 = "MD5";
     }
-    public class NUM{
+    public class Num {
         public static final String ZERO = "0";
     }
 }

KafkaCenter-Base/src/main/java/org/nesc/ec/bigdata/common/model/ConsumerTypeEnum.java

@@ -1,25 +1,33 @@
 package org.nesc.ec.bigdata.common.model;
 
-import java.util.List;
-
 import org.apache.kafka.common.ConsumerGroupState;
 
+import java.util.List;
+
 /**
  * 
  * @author jc1e
  *
  * 2019年5月14日
  */
 public class GroupTopicConsumerState {
+	private String group;
 	private String topic;
 	private String consumerMethod;
 	private List<PartitionAssignmentState> partitionAssignmentStates;
-	
+	private KafkaCenterGroupState kafkaCenterGroupState;
 	private ConsumerGroupState consumerGroupState;
 	private boolean isSimpleConsumerGroup = false ;
 
 	private boolean hasMembers;
 
+
+	public GroupTopicConsumerState(String group,String topic,String consumerMethod){
+		this.group = group;
+		this.topic = topic;
+		this.consumerMethod = consumerMethod;
+	}
+
 	public boolean isHasMembers() {
 		return hasMembers;
 	}
@@ -67,4 +75,20 @@ public String getTopic() {
 	public void setTopic(String topic) {
 		this.topic = topic;
 	}
+
+	public KafkaCenterGroupState getKafkaCenterGroupState() {
+		return kafkaCenterGroupState;
+	}
+
+	public void setKafkaCenterGroupState(KafkaCenterGroupState kafkaCenterGroupState) {
+		this.kafkaCenterGroupState = kafkaCenterGroupState;
+	}
+
+	public String getGroup() {
+		return group;
+	}
+
+	public void setGroup(String group) {
+		this.group = group;
+	}
 }

KafkaCenter-Base/src/main/java/org/nesc/ec/bigdata/common/model/GroupTopicConsumerState.java

@@ -0,0 +1,15 @@
+package org.nesc.ec.bigdata.common.model;
+
+/**
+ * @author Truman.P.Du
+ * @date 2020/08/14
+ * @description KafkaCenter 定义消费组状态，区别于 ConsumerGroupState、
+ * ConsumerGroupState 是kafka对group状态的定义
+ * KafkaCenterGroupState是KafkaCenter对group状态的定义
+ */
+public enum KafkaCenterGroupState {
+
+    ACTIVE, DEAD, UNKNOWN;
+
+
+}

KafkaCenter-Base/src/main/java/org/nesc/ec/bigdata/common/model/KafkaCenterGroupState.java

@@ -50,9 +50,16 @@ public MeterMetric(Long count, Double meanRate, Double oneMinuteRate, Double fiv
 	private String location;
     private String clusterName;
 	private String metricName;
-	
-	
-	
+	private String topic;
+
+	public String getTopic() {
+		return topic;
+	}
+
+	public void setTopic(String topic) {
+		this.topic = topic;
+	}
+
 	public String getClusterName() {
 		return clusterName;
 	}

KafkaCenter-Base/src/main/java/org/nesc/ec/bigdata/common/model/MeterMetric.java

@@ -6,7 +6,7 @@
  * @version 1.0
  */
 public class PartitionAssignmentState {
-	private String group; // groupId
+	private String group;
 	private String topic;
 	private int partition;
 	private long offset;

KafkaCenter-Base/src/main/java/org/nesc/ec/bigdata/common/model/PartitionAssignmentState.java

@@ -1,9 +1,9 @@
 package org.nesc.ec.bigdata.common.model;
 
-import java.util.List;
-
 import org.apache.kafka.common.ConsumerGroupState;
 
+import java.util.List;
+
 /**
  * @author Truman.P.Du
  * @date 2019年4月10日 下午4:12:17
@@ -16,6 +16,7 @@ public class TopicConsumerGroupState {
 	 */
 	private String consumerMethod;
 	private List<PartitionAssignmentState> partitionAssignmentStates;
+	private KafkaCenterGroupState kafkaCenterGroupState;
 	/**
 	 * Dead：组内已经没有任何成员的最终状态，组的元数据也已经被coordinator移除了。这种状态响应各种请求都是一个response：UNKNOWN_MEMBER_ID 
 	 * Empty：组内无成员，但是位移信息还没有过期。这种状态只能响应JoinGroup请求
@@ -24,11 +25,21 @@ public class TopicConsumerGroupState {
 	 * Stable：rebalance完成！可以开始消费了~
 	 */
 	private ConsumerGroupState consumerGroupState;
-	private boolean isSimpleConsumerGroup = false ;//false：api 根据member信息判断状态,true 状态直接置黄，给提示（"SimpleConsumerGroup无法判断其状态"）低级
+	/**
+	 * isSimpleConsumerGroup false：api 根据member信息判断状态,true 状态直接置黄，给提示（"SimpleConsumerGroup无法判断其状态"）低级
+	 */
+	private boolean isSimpleConsumerGroup = false ;
 
-	//组内是否有members
+	/**
+	 * 组内是否有members
+	 */
 	private boolean hasMembers = true;
 
+	public TopicConsumerGroupState(String groupId,String consumerMethod){
+		this.groupId = groupId;
+		this.consumerMethod = consumerMethod;
+	}
+
 
 	public boolean isHasMembers() {
 		return hasMembers;
@@ -77,4 +88,12 @@ public boolean isSimpleConsumerGroup() {
 	public void setSimpleConsumerGroup(boolean isSimpleConsumerGroup) {
 		this.isSimpleConsumerGroup = isSimpleConsumerGroup;
 	}
+
+	public KafkaCenterGroupState getKafkaCenterGroupState() {
+		return kafkaCenterGroupState;
+	}
+
+	public void setKafkaCenterGroupState(KafkaCenterGroupState kafkaCenterGroupState) {
+		this.kafkaCenterGroupState = kafkaCenterGroupState;
+	}
 }