This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 6273f5c87b [INLONG-11415][Manager] Support querying cluster node
operation records (#11418)
6273f5c87b is described below
commit 6273f5c87bb9b4959aa48e823874f4a52d31556c
Author: fuweng11 <[email protected]>
AuthorDate: Mon Oct 28 18:50:32 2024 +0800
[INLONG-11415][Manager] Support querying cluster node operation records
(#11418)
---
.../inlong/manager/common/enums/OperationTarget.java | 4 ++++
.../resources/mappers/OperationLogEntityMapper.xml | 6 ++++++
.../manager/pojo/operationLog/OperationLogRequest.java | 6 ++++++
.../web/controller/InlongClusterController.java | 18 +++++++++---------
4 files changed, 25 insertions(+), 9 deletions(-)
diff --git
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/OperationTarget.java
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/OperationTarget.java
index cb9e1638be..78f97646f0 100644
---
a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/OperationTarget.java
+++
b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/enums/OperationTarget.java
@@ -40,6 +40,10 @@ public enum OperationTarget {
CLUSTER,
+ CLUSTER_NODE,
+
+ CLUSTER_TAG,
+
TRANSFORM,
INLONG_ROLE,
diff --git
a/inlong-manager/manager-dao/src/main/resources/mappers/OperationLogEntityMapper.xml
b/inlong-manager/manager-dao/src/main/resources/mappers/OperationLogEntityMapper.xml
index 12d8506600..152b9312ea 100644
---
a/inlong-manager/manager-dao/src/main/resources/mappers/OperationLogEntityMapper.xml
+++
b/inlong-manager/manager-dao/src/main/resources/mappers/OperationLogEntityMapper.xml
@@ -69,6 +69,12 @@
<if test="request.operationTarget != null and
request.operationTarget != ''">
and operation_target = #{request.operationTarget,
jdbcType=VARCHAR}
</if>
+ <if test="request.ip != null and request.ip != ''">
+ and body -> '$[0].ip' = #{request.ip, jdbcType=VARCHAR}
+ </if>
+ <if test="request.port != null and request.port != ''">
+ and body -> '$[0].port' = #{request.port, jdbcType=VARCHAR}
+ </if>
<if test="request.keyword != null and request.keyword != ''">
and (
inlong_group_id like CONCAT('%', #{request.keyword}, '%')
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/operationLog/OperationLogRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/operationLog/OperationLogRequest.java
index 4c5b305913..6ea48ab61c 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/operationLog/OperationLogRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/operationLog/OperationLogRequest.java
@@ -44,6 +44,12 @@ public class OperationLogRequest extends PageRequest {
@ApiModelProperty("Operation target")
private String operationTarget;
+ @ApiModelProperty("Ip")
+ private String ip;
+
+ @ApiModelProperty("Port")
+ private String port;
+
@ApiModelProperty(value = "keyword")
private String keyword;
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
index e66d4fb833..025c61f01f 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
@@ -79,7 +79,7 @@ public class InlongClusterController {
@PostMapping(value = "/cluster/tag/save")
@ApiOperation(value = "Save cluster tag")
- @OperationLog(operation = OperationType.CREATE, operationTarget =
OperationTarget.CLUSTER)
+ @OperationLog(operation = OperationType.CREATE, operationTarget =
OperationTarget.CLUSTER_TAG)
@RequiresRoles(value = UserRoleCode.INLONG_ADMIN)
public Response<Integer> saveTag(@Validated(SaveValidation.class)
@RequestBody ClusterTagRequest request) {
String currentUser = LoginUserUtils.getLoginUser().getName();
@@ -103,7 +103,7 @@ public class InlongClusterController {
}
@PostMapping(value = "/cluster/tag/update")
- @OperationLog(operation = OperationType.UPDATE, operationTarget =
OperationTarget.CLUSTER)
+ @OperationLog(operation = OperationType.UPDATE, operationTarget =
OperationTarget.CLUSTER_TAG)
@ApiOperation(value = "Update cluster tag")
@RequiresRoles(value = UserRoleCode.INLONG_ADMIN)
public Response<Boolean> updateTag(@Validated(UpdateValidation.class)
@RequestBody ClusterTagRequest request) {
@@ -113,7 +113,7 @@ public class InlongClusterController {
@DeleteMapping(value = "/cluster/tag/delete/{id}")
@ApiOperation(value = "Delete cluster tag by id")
- @OperationLog(operation = OperationType.DELETE, operationTarget =
OperationTarget.CLUSTER)
+ @OperationLog(operation = OperationType.DELETE, operationTarget =
OperationTarget.CLUSTER_TAG)
@ApiImplicitParam(name = "id", value = "Cluster tag ID", dataTypeClass =
Integer.class, required = true)
@RequiresRoles(value = UserRoleCode.INLONG_ADMIN)
public Response<Boolean> deleteTag(@PathVariable Integer id) {
@@ -122,7 +122,7 @@ public class InlongClusterController {
@PostMapping(value = "/cluster/tenant/tag/save")
@ApiOperation(value = "Save tenant cluster tag")
- @OperationLog(operation = OperationType.CREATE, operationTarget =
OperationTarget.CLUSTER)
+ @OperationLog(operation = OperationType.CREATE, operationTarget =
OperationTarget.CLUSTER_TAG)
@RequiresRoles(value = UserRoleCode.INLONG_ADMIN)
public Response<Integer> saveTenantTag(
@Validated(SaveValidation.class) @RequestBody
TenantClusterTagRequest request) {
@@ -152,7 +152,7 @@ public class InlongClusterController {
@DeleteMapping(value = "/cluster/tenant/tag/delete/{id}")
@ApiOperation(value = "Delete tenant cluster tag by id")
- @OperationLog(operation = OperationType.DELETE, operationTarget =
OperationTarget.CLUSTER)
+ @OperationLog(operation = OperationType.DELETE, operationTarget =
OperationTarget.CLUSTER_TAG)
@ApiImplicitParam(name = "id", value = "Cluster tag ID", dataTypeClass =
Integer.class, required = true)
@RequiresRoles(value = UserRoleCode.INLONG_ADMIN)
public Response<Boolean> deleteTenantTag(@PathVariable Integer id) {
@@ -237,7 +237,7 @@ public class InlongClusterController {
@PostMapping(value = "/cluster/node/save")
@ApiOperation(value = "Save cluster node")
- @OperationLog(operation = OperationType.CREATE, operationTarget =
OperationTarget.CLUSTER)
+ @OperationLog(operation = OperationType.CREATE, operationTarget =
OperationTarget.CLUSTER_NODE)
public Response<Integer> saveNode(@Validated @RequestBody
ClusterNodeRequest request) {
String currentUser = LoginUserUtils.getLoginUser().getName();
request.setCurrentUser(currentUser);
@@ -273,7 +273,7 @@ public class InlongClusterController {
}
@RequestMapping(value = "/cluster/node/update", method =
RequestMethod.POST)
- @OperationLog(operation = OperationType.UPDATE, operationTarget =
OperationTarget.CLUSTER)
+ @OperationLog(operation = OperationType.UPDATE, operationTarget =
OperationTarget.CLUSTER_NODE)
@ApiOperation(value = "Update cluster node")
public Response<Boolean> updateNode(@Validated(UpdateValidation.class)
@RequestBody ClusterNodeRequest request) {
String username = LoginUserUtils.getLoginUser().getName();
@@ -283,7 +283,7 @@ public class InlongClusterController {
@RequestMapping(value = "/cluster/node/delete/{id}", method =
RequestMethod.DELETE)
@ApiOperation(value = "Delete cluster node")
- @OperationLog(operation = OperationType.DELETE, operationTarget =
OperationTarget.CLUSTER)
+ @OperationLog(operation = OperationType.DELETE, operationTarget =
OperationTarget.CLUSTER_NODE)
@ApiImplicitParam(name = "id", value = "Cluster node ID", dataTypeClass =
Integer.class, required = true)
public Response<Boolean> deleteNode(@PathVariable Integer id) {
return Response.success(clusterService.deleteNode(id,
LoginUserUtils.getLoginUser().getName()));
@@ -291,7 +291,7 @@ public class InlongClusterController {
@RequestMapping(value = "/cluster/node/unload/{id}", method =
RequestMethod.DELETE)
@ApiOperation(value = "Delete cluster node")
- @OperationLog(operation = OperationType.DELETE, operationTarget =
OperationTarget.CLUSTER)
+ @OperationLog(operation = OperationType.DELETE, operationTarget =
OperationTarget.CLUSTER_NODE)
@ApiImplicitParam(name = "id", value = "Cluster node ID", dataTypeClass =
Integer.class, required = true)
public Response<Boolean> unloadNode(@PathVariable Integer id) {
return Response.success(clusterService.unloadNode(id,
LoginUserUtils.getLoginUser().getName()));
