Merge branch 'dev' into dev-function

# Conflicts: # eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/constant/StoreTypeConstant.java # eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/constant/health/HealthCheckTypeConstant.java # eventmesh-dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/StoreType.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/TopicController.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/cluster/ClusterEntity.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/config/ConfigEntity.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/topic/TopicEntity.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/CheckResultCache.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4BrokerCheck.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4NameServerCheck.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/function/health/check/impl/storage/rocketmq4/Rocketmq4TopicCheck.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/cluster/ClusterMapper.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/config/ConfigMapper.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/connection/ConnectionMapper.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/connector/ConnectorMapper.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/group/OprGroupMapper.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/health/HealthCheckResultMapper.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/meta/MetaMapper.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/runtime/RuntimeMapper.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/storage/StoreMapper.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/client/ClientDataService.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/client/Impl/ClientDataServiceImpl.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/impl/ClusterServiceImpl.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/ConfigService.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/Impl/ConfigServiceImpl.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/synchronous/SyncConnectorConfigTask.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/synchronous/SyncRuntimeConfigTask.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/synchronous/SyncStoreConfigTask.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/config/synchronous/SyncTopicConfigTask.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/connection/ConnectionDataService.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/connection/impl/ConnectionDataServiceDatabaseImpl.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/connector/ConnectorDataService.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/connector/Impl/ConnectorDataServiceImpl.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/health/HealthDataService.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/health/impl/HealthDataServiceDatabaseImpl.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/registry/RegistryDataService.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/registry/impl/RegistryDataServiceImpl.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/runtime/Impl/RuntimeServiceImpl.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/runtime/RuntimeService.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/store/Impl/StoreServiceImpl.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/store/StoreService.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicService.java # eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/topic/TopicServiceImpl.java # eventmesh-dashboard-console/src/main/resources/eventmesh-dashboard.sql # eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/connection/ConnectionMapperTest.java # eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/mapper/connector/ConnectorMapperTest.java # eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/cluster/TestClusterMapper.java # eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/config/TestConfigMapper.java # eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/store/TestStoreMapper.java # eventmesh-dashboard-console/src/test/java/org/apache/eventmesh/dashboard/console/unit/topic/TopicMapperTest.java # eventmesh-dashboard-console/src/test/resources/connection-test.sql # eventmesh-dashboard-core/pom.xml
Lambert-Rao · Apr 7, 2024 · 1c3249a · 1c3249a
2 parents 04bf2ab + b65a406
commit 1c3249a
Show file tree

Hide file tree

Showing 86 changed files with 1,836 additions and 542 deletions.
diff --git a/eventmesh-dashboard-common/pom.xml b/eventmesh-dashboard-common/pom.xml
@@ -19,6 +19,7 @@
  </properties>
 
  <dependencies>
+ <!-- TODO: common module should not contains spring framework, considering remove this dependency -->
  <!-- Spring Boot Starter -->
  <dependency>
  <groupId>org.springframework.boot</groupId>

diff --git a/...ommon/src/main/java/org/apache/eventmesh/dashboard/common/constant/StoreTypeConstant.java b/...ommon/src/main/java/org/apache/eventmesh/dashboard/common/constant/StoreTypeConstant.java
@@ -23,8 +23,6 @@ public class StoreTypeConstant {
  public static final String STORE_TYPE_REDIS = "redis";
  public static final String STORE_TYPE_MYSQL = "mysql";
  public static final String STORE_TYPE_ROCKETMQ = "rocketmq4";
- public static final String STORE_SUBTYPE_ROCKETMQ_BROKER = "rocketmq4-broker";
- public static final String STORE_SUBTYPE_ROCKETMQ_NAMESERVER = "rocketmq4-nameserver";
  public static final String STORE_TYPE_KAFKA = "kafka";
  public static final String STORE_TYPE_PULSAR = "pulsar";
  public static final String STORE_TYPE_RABBITMQ = "rabbitmq";

diff --git a/...n/java/org/apache/eventmesh/dashboard/common/constant/health/HealthCheckTypeConstant.java b/...n/java/org/apache/eventmesh/dashboard/common/constant/health/HealthCheckTypeConstant.java
@@ -32,9 +32,7 @@ public class HealthCheckTypeConstant {
 
  public static final String HEALTH_CHECK_SUBTYPE_REDIS = StoreTypeConstant.STORE_TYPE_REDIS;
  public static final String HEALTH_CHECK_SUBTYPE_MYSQL = StoreTypeConstant.STORE_TYPE_MYSQL;
- public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ_BROKER = StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_BROKER;
- public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ_NAMESERVER = StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_NAMESERVER;
- public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ_TOPIC = "rocketmq4-topic";
+ public static final String HEALTH_CHECK_SUBTYPE_ROCKETMQ = StoreTypeConstant.STORE_TYPE_ROCKETMQ;
 
  public static final String HEALTH_CHECK_SUBTYPE_NACOS_CONFIG = "nacos-config";
  public static final String HEALTH_CHECK_SUBTYPE_NACOS_REGISTRY = "nacos-registry";

diff --git a/...dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/StoreType.java b/...dashboard-common/src/main/java/org/apache/eventmesh/dashboard/common/enums/StoreType.java
@@ -17,8 +17,6 @@
 
 package org.apache.eventmesh.dashboard.common.enums;
 
-import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_BROKER;
-import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_SUBTYPE_ROCKETMQ_NAMESERVER;
 import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_KAFKA;
 import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_PULSAR;
 import static org.apache.eventmesh.dashboard.common.constant.StoreTypeConstant.STORE_TYPE_RABBITMQ;
@@ -34,8 +32,6 @@ public enum StoreType {
 
  STANDALONE(0, STORE_TYPE_STANDALONE),
  ROCKETMQ(1, STORE_TYPE_ROCKETMQ),
- ROCKETMQ_BROKER(11, STORE_SUBTYPE_ROCKETMQ_BROKER),
- ROCKETMQ_NAMESERVER(12, STORE_SUBTYPE_ROCKETMQ_NAMESERVER),
  KAFKA(2, STORE_TYPE_KAFKA),
  PULSAR(3, STORE_TYPE_PULSAR),
  RABBITMQ(4, STORE_TYPE_RABBITMQ),

diff --git a/eventmesh-dashboard-console/pom.xml b/eventmesh-dashboard-console/pom.xml
@@ -19,6 +19,12 @@
  </properties>
 
  <dependencies>
+ <!-- Spring Boot Starter -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+
  <!-- EventMesh Dashboard modules -->
  <dependency>
  <groupId>org.apache.eventmesh.dashboard.common</groupId>

diff --git a/...e/src/main/java/org/apache/eventmesh/dashboard/console/EventMeshDashboardApplication.java b/...e/src/main/java/org/apache/eventmesh/dashboard/console/EventMeshDashboardApplication.java
@@ -19,13 +19,15 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 @SpringBootApplication
 @EnableTransactionManagement
+@EnableAspectJAutoProxy(exposeProxy = true)
 public class EventMeshDashboardApplication {
 
  public static void main(String[] args) {

diff --git a/...le/src/main/java/org/apache/eventmesh/dashboard/console/controller/ClusterController.java b/...le/src/main/java/org/apache/eventmesh/dashboard/console/controller/ClusterController.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console.controller;
+
+
+import org.apache.eventmesh.dashboard.console.modle.vo.cluster.GetClusterBaseMessageVO;
+import org.apache.eventmesh.dashboard.console.modle.vo.cluster.ResourceNumVO;
+import org.apache.eventmesh.dashboard.console.service.cluster.ClusterService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+
+public class ClusterController {
+
+ @Autowired
+ ClusterService clusterService;
+
+ @GetMapping("/cluster/getResourceNum")
+ public ResourceNumVO getResourceNumByClusterId(Long clusterId) {
+ return clusterService.getResourceNumByCluster(clusterId);
+ }
+
+
+ @GetMapping("/cluster/getBaseMessage")
+ public GetClusterBaseMessageVO getClusterBaseMessage(Long clusterId) {
+ return clusterService.getClusterBaseMessage(clusterId);
+ }
+}
diff --git a/...ole/src/main/java/org/apache/eventmesh/dashboard/console/controller/ConfigController.java b/...ole/src/main/java/org/apache/eventmesh/dashboard/console/controller/ConfigController.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console.controller;
+
+import org.apache.eventmesh.dashboard.console.entity.config.ConfigEntity;
+import org.apache.eventmesh.dashboard.console.modle.dto.config.DetailConfigsVO;
+import org.apache.eventmesh.dashboard.console.modle.dto.config.GetConfigsListDTO;
+import org.apache.eventmesh.dashboard.console.modle.dto.config.UpdateConfigDTO;
+import org.apache.eventmesh.dashboard.console.service.config.ConfigService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ConfigController {
+
+ @Autowired
+ private ConfigService configService;
+
+ @PostMapping("/cluster/config/updateConfigs")
+ public String updateConfigsByTypeAndId(@Validated @RequestBody UpdateConfigDTO updateConfigDTO) {
+ try {
+ configService.updateConfigsByInstanceId(updateConfigDTO.getUsername(), updateConfigDTO.getClusterId(), updateConfigDTO.getInstanceType(),
+ updateConfigDTO.getInstanceId(), updateConfigDTO.getChangeConfigDTOS());
+ } catch (Exception e) {
+ return e.getMessage();
+ }
+ return "success";
+ }
+
+
+ @PostMapping("/cluster/config/getInstanceDetailConfigs")
+ public List<DetailConfigsVO> getInstanceDetailConfigs(@Validated @RequestBody GetConfigsListDTO getConfigsListDTO) {
+ List<ConfigEntity> configEntityList = configService.selectToFront(getConfigsListDTO.getInstanceId(),
+ getConfigsListDTO.getInstanceType(), getConfigsListDTO);
+ Map<String, String> stringStringConcurrentHashMap = configService.selectDefaultConfig(getConfigsListDTO.getBusinessType(),
+ getConfigsListDTO.getInstanceId(), getConfigsListDTO.getInstanceType());
+ ArrayList<DetailConfigsVO> showDetailConfigsVOS = new ArrayList<>();
+ configEntityList.forEach(n -> {
+ DetailConfigsVO showDetailConfigsVO = new DetailConfigsVO();
+ showDetailConfigsVO.setDefaultValue(stringStringConcurrentHashMap.get(n.getConfigName()));
+ showDetailConfigsVO.setIsModify(n.getIsModify());
+ showDetailConfigsVO.setConfigName(n.getConfigName());
+ showDetailConfigsVO.setConfigValue(n.getConfigValue());
+ showDetailConfigsVO.setAlreadyUpdate(n.getAlreadyUpdate());
+ showDetailConfigsVOS.add(showDetailConfigsVO);
+ });
+ return showDetailConfigsVOS;
+ }
+
+
+}
diff --git a/...src/main/java/org/apache/eventmesh/dashboard/console/controller/ConnectionController.java b/...src/main/java/org/apache/eventmesh/dashboard/console/controller/ConnectionController.java
@@ -17,36 +17,73 @@
 
 package org.apache.eventmesh.dashboard.console.controller;
 
-import org.apache.eventmesh.dashboard.service.meta.ConnectionCore;
+import org.apache.eventmesh.dashboard.console.entity.config.ConfigEntity;
+import org.apache.eventmesh.dashboard.console.entity.connector.ConnectorEntity;
+import org.apache.eventmesh.dashboard.console.modle.dto.connection.AddConnectionDTO;
+import org.apache.eventmesh.dashboard.console.modle.dto.connection.CreateConnectionDTO;
+import org.apache.eventmesh.dashboard.console.modle.dto.connection.GetConnectionListDTO;
+import org.apache.eventmesh.dashboard.console.modle.vo.connection.ConnectionListVO;
+import org.apache.eventmesh.dashboard.console.service.connection.ConnectionDataService;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 @RestController
 public class ConnectionController {
 
- /**
- * TODO expose implement by FunctionManager
- */
- ConnectionCore connectionCore;
+ @Autowired
+ private ConnectionDataService connectionDataService;
 
  /**
- * Query Connection List
- * <p>
- * The subscription information of SourceConnector and SinkConnector reported by EventMesh Runtime to the meta,
- * containing the configuration of each connection.
+ * 'type' only can be Sink or Source
  *
- * @param page the page number
- * @param size the page size
- * @return A paged list of connection configuration and total number of pages
+ * @param type
+ * @return
  */
- @GetMapping("/connection")
- public String listConnections(@RequestParam("page") Integer page, @RequestParam("size") String size) {
- return null;
+ @GetMapping("/cluster/connection/getConnectorBusinessType")
+ public List<String> getConnectorBusinessType(String type) {
+ return connectionDataService.getConnectorBusinessType(type);
+ }
+
+ @GetMapping("/cluster/connection/getConnectorConfigs")
+ public List<ConfigEntity> getConnectorConfigsByClassAndVersion(String version, String classType) {
+ return connectionDataService.getConnectorConfigsByClassAndVersion(classType, version);
  }
 
+
+ @GetMapping("/cluster/connection/showCreateConnectionMessage")
+ public AddConnectionDTO showCreateConnectionMessage() {
+ return new AddConnectionDTO();
+ }
+
+
+ @PostMapping("/cluster/connection/createConnection")
+ public String createConnection(@Validated @RequestBody CreateConnectionDTO createConnectionDTO) {
+ try {
+ connectionDataService.createConnection(createConnectionDTO);
+
+ } catch (Exception e) {
+ return e.getMessage();
+ }
+ return "success";
+ }
+
+
+ @PostMapping("/cluster/connection/getConnectionList")
+ public List<ConnectionListVO> getConnectionList(@Validated @RequestBody GetConnectionListDTO getConnectionListDTO) {
+ return connectionDataService.getConnectionToFrontByCluster(getConnectionListDTO.getClusterId(), getConnectionListDTO);
+ }
+
+ @GetMapping("/cluster/connection/getConnectorDetail")
+ public ConnectorEntity getConnectorDetail(Long connectorId) {
+ return connectionDataService.getConnectorById(connectorId);
+ }
+
+
 }
diff --git a/...ole/src/main/java/org/apache/eventmesh/dashboard/console/controller/HealthController.java b/...ole/src/main/java/org/apache/eventmesh/dashboard/console/controller/HealthController.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console.controller;
+
+import org.apache.eventmesh.dashboard.console.entity.health.HealthCheckResultEntity;
+import org.apache.eventmesh.dashboard.console.modle.vo.health.InstanceLiveProportionVo;
+import org.apache.eventmesh.dashboard.console.service.health.HealthDataService;
+
+import java.sql.Timestamp;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class HealthController {
+
+ @Autowired
+ HealthDataService healthDataService;
+
+ @GetMapping("/cluster/health/getHistoryLiveStatus")
+ public List<HealthCheckResultEntity> getHistoryLiveStatusById(Integer type, Long instanceId, String startTime) {
+ Timestamp timestamp = Timestamp.valueOf(startTime);
+ return healthDataService.getInstanceLiveStatusHistory(type, instanceId, timestamp);
+ }
+
+ @GetMapping("/cluster/health/getInstanceLiveProportion")
+ public InstanceLiveProportionVo getInstanceLiveProportion(Integer instanceType, Long theClusterId) {
+ return healthDataService.getInstanceLiveProportion(theClusterId, instanceType);
+ }
+}
diff --git a/...onsole/src/main/java/org/apache/eventmesh/dashboard/console/controller/LogController.java b/...onsole/src/main/java/org/apache/eventmesh/dashboard/console/controller/LogController.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.eventmesh.dashboard.console.controller;
+
+import org.apache.eventmesh.dashboard.console.entity.log.LogEntity;
+import org.apache.eventmesh.dashboard.console.modle.dto.log.GetLogListDTO;
+import org.apache.eventmesh.dashboard.console.service.log.LogService;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class LogController {
+
+ @Autowired
+ private LogService logService;
+
+ @PostMapping("/cluster/log/getList")
+ public List<LogEntity> getLogLIstToFront(@Validated @RequestBody GetLogListDTO getLogListDTO) {
+ return logService.getLogListByCluster(getLogListDTO);
+ }
+
+}