fix(audit): add intsance migrate audit meta data

* add audit log

* fix

* fix

* fix

* fix

Author: ungreat

server/integration-test/src/test/java/com/oceanbase/odc/service/audit/AuditEventMapperTest.java

@@ -52,7 +52,9 @@ public void test_EntityToModel_Success() {
                 .organizationId(1L)
                 .taskId("1")
                 .action(AuditEventAction.UPDATE_PERSONAL_CONFIGURATION)
+                .actionName(AuditEventAction.UPDATE_PERSONAL_CONFIGURATION.getLocalizedMessage())
                 .type(AuditEventType.PERSONAL_CONFIGURATION)
+                .typeName(AuditEventType.PERSONAL_CONFIGURATION.getLocalizedMessage())
                 .userId(1L)
                 .username("account")
                 .result(AuditEventResult.SUCCESS)

server/integration-test/src/test/java/com/oceanbase/odc/service/audit/AuditEventMetaMapperTest.java

@@ -39,7 +39,9 @@ public void test_EntityToModel_Success() {
 
         AuditEventMeta expected = AuditEventMeta.builder()
                 .action(AuditEventAction.UPDATE_PERSONAL_CONFIGURATION)
+                .actionName(AuditEventAction.UPDATE_PERSONAL_CONFIGURATION.getLocalizedMessage())
                 .type(AuditEventType.PERSONAL_CONFIGURATION)
+                .typeName(AuditEventType.PERSONAL_CONFIGURATION.getLocalizedMessage())
                 .enabled(true)
                 .inConnection(true)
                 .methodSignature("controller")

server/odc-core/src/main/java/com/oceanbase/odc/core/shared/constant/AuditEventAction.java

@@ -422,6 +422,10 @@ public enum AuditEventAction implements Translatable {
 
     DELETE_DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE,
 
+    BATCH_TERMINAL_TASKS,
+
+    BATCH_EXPORT_TASKS
+
     ;
 
     @Override

server/odc-core/src/main/java/com/oceanbase/odc/core/shared/constant/AuditEventType.java

@@ -100,7 +100,7 @@ public enum AuditEventType implements Translatable {
 
     DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE_MANAGEMENT,
 
-    ;
+    INSTANCE_MIGRATION;
 
 
     @Override

server/odc-core/src/main/resources/i18n/BusinessMessages.properties

@@ -333,6 +333,8 @@ com.oceanbase.odc.AuditEventAction.DISABLE_SENSITIVE_COLUMN=Disable sensitive co
 com.oceanbase.odc.AuditEventAction.CREATE_DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE=Create database change order template
 com.oceanbase.odc.AuditEventAction.UPDATE_DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE=Update database change order template
 com.oceanbase.odc.AuditEventAction.DELETE_DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE=Delete database change order template
+com.oceanbase.odc.AuditEventAction.BATCH_TERMINAL_TASKS=Batch terminal tasks
+com.oceanbase.odc.AuditEventAction.BATCH_EXPORT_TASKS=Batch export tasks
 
 
 #
@@ -377,6 +379,7 @@ com.oceanbase.odc.AuditEventType.NOTIFICATION_MANAGEMENT=Notification management
 com.oceanbase.odc.AuditEventType.SENSITIVE_COLUMN_MANAGEMENT=Sensitive column management
 com.oceanbase.odc.AuditEventType.STRUCTURE_COMPARISON=Structure comparison
 com.oceanbase.odc.AuditEventType.DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE_MANAGEMENT=Database change order template management
+com.oceanbase.odc.AuditEventType.INSTANCE_MIGRATION=Instance migration
 
 
 #

server/odc-core/src/main/resources/i18n/BusinessMessages_zh_CN.properties

@@ -338,7 +338,8 @@ com.oceanbase.odc.AuditEventAction.DISABLE_SENSITIVE_COLUMN=禁用敏感列
 com.oceanbase.odc.AuditEventAction.CREATE_DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE=创建数据库变更顺序模板
 com.oceanbase.odc.AuditEventAction.UPDATE_DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE=更新数据库变更顺序模板
 com.oceanbase.odc.AuditEventAction.DELETE_DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE=删除数据库变更顺序模板
-
+com.oceanbase.odc.AuditEventAction.BATCH_TERMINAL_TASKS=批量终止任务
+com.oceanbase.odc.AuditEventAction.BATCH_EXPORT_TASKS=批量导出任务
 
 #
 # AuditEventType
@@ -382,6 +383,7 @@ com.oceanbase.odc.AuditEventType.AUTOMATION_RULE_MANAGEMENT=自动授权规则
 com.oceanbase.odc.AuditEventType.NOTIFICATION_MANAGEMENT=消息推送管理
 com.oceanbase.odc.AuditEventType.SENSITIVE_COLUMN_MANAGEMENT=敏感列管理
 com.oceanbase.odc.AuditEventType.DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE_MANAGEMENT=数据库变更顺序模板管理
+com.oceanbase.odc.AuditEventType.INSTANCE_MIGRATION=实例迁移
 
 #
 # AuditEventResult result type

server/odc-core/src/main/resources/i18n/BusinessMessages_zh_TW.properties

@@ -338,7 +338,8 @@ com.oceanbase.odc.AuditEventAction.DISABLE_SENSITIVE_COLUMN=禁用敏感列
 com.oceanbase.odc.AuditEventAction.CREATE_DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE=創建數據庫變更順序模板
 com.oceanbase.odc.AuditEventAction.UPDATE_DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE=更新數據庫變更順序模板
 com.oceanbase.odc.AuditEventAction.DELETE_DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE=刪除數據庫變更順序模板
-
+com.oceanbase.odc.AuditEventAction.BATCH_TERMINAL_TASKS=批量終止任務
+com.oceanbase.odc.AuditEventAction.BATCH_EXPORT_TASKS=批量導出任務
 #
 # AuditEventType
 #
@@ -381,6 +382,7 @@ com.oceanbase.odc.AuditEventType.AUTOMATION_RULE_MANAGEMENT=自動授權規則
 com.oceanbase.odc.AuditEventType.NOTIFICATION_MANAGEMENT=消息推送管理
 com.oceanbase.odc.AuditEventType.SENSITIVE_COLUMN_MANAGEMENT=敏感列管理
 com.oceanbase.odc.AuditEventType.DATABASE_CHANGE_CHANGING_ORDER_TEMPLATE_MANAGEMENT=數據庫變更順序模板管理
+com.oceanbase.odc.AuditEventType.INSTANCE_MIGRATION=實例遷移
 
 #
 # AuditEventResult result type

server/odc-migrate/src/main/resources/init-config/default-audit-event-meta.yml

@@ -571,3 +571,20 @@
   in_connection: 0
   enabled: 1
   id: 102
+
+
+- type: "INSTANCE_MIGRATION"
+  action: "BATCH_TERMINAL_TASKS"
+  method_signature: "com.oceanbase.odc.server.web.controller.cloud.OcpConsoleController.terminateTask"
+  sid_extract_expression: ""
+  in_connection: 0
+  enabled: 1
+  id: 103
+
+- type: "INSTANCE_MIGRATION"
+  action: "BATCH_EXPORT_TASKS"
+  method_signature: "com.oceanbase.odc.server.web.controller.cloud.OcpConsoleController.export"
+  sid_extract_expression: ""
+  in_connection: 0
+  enabled: 1
+  id: 104

server/odc-service/src/main/java/com/oceanbase/odc/service/audit/AuditEventService.java

@@ -124,15 +124,9 @@ public Page<AuditEvent> listOrganizationAuditEvents(@NotNull QueryAuditEventPara
 
     private Page<AuditEvent> list(Specification<AuditEventEntity> specs, Pageable pageable) {
         return auditEventRepository.findAll(specs, pageable)
-                .map(entity -> {
-                    AuditEvent event = mapper.entityToModel(entity);
-                    event.setActionName(entity.getAction().getLocalizedMessage());
-                    event.setTypeName(entity.getType().getLocalizedMessage());
-                    return event;
-                });
+                .map(entity -> mapper.entityToModel(entity));
     }
 
-
     @PreAuthenticate(actions = "read", resourceType = "ODC_AUDIT_EVENT", isForAll = true)
     public Stats stats(@NotNull QueryAuditEventParams params) {
         return new Stats().andDistinct("userIds",

server/odc-service/src/main/java/com/oceanbase/odc/service/audit/model/AuditEventMeta.java

@@ -45,11 +45,21 @@ public class AuditEventMeta {
      */
     private AuditEventType type;
 
+    /**
+     * Audit event name
+     */
+    private String typeName;
+
     /**
      * Audit event action
      */
     private AuditEventAction action;
 
+    /**
+     * Audit event action name
+     */
+    private String actionName;
+
     /**
      * sid extract expression which is an SpEL
      */