(inlong) branch master updated: [INLONG-10689][Manager] Support querying metric information (#10690)

[aloyszhang]

This is an automated email from the ASF dual-hosted git repository.

aloyszhang 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 63df4f59bc [INLONG-10689][Manager] Support querying metric information 
(#10690)
63df4f59bc is described below

commit 63df4f59bcfe60fa97a36735aa9bc6613948847e
Author: fuweng11 <76141879+fuwen...@users.noreply.github.com>
AuthorDate: Tue Jul 23 09:56:59 2024 +0800

    [INLONG-10689][Manager] Support querying metric information (#10690)
---
 .../org/apache/inlong/manager/service/core/AuditService.java |  2 +-
 .../inlong/manager/service/core/impl/AuditServiceImpl.java   | 12 +++++++++---
 .../inlong/manager/web/controller/AuditController.java       |  5 +++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AuditService.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AuditService.java
index 7a5cdf378d..2bac8df24f 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AuditService.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/AuditService.java
@@ -46,7 +46,7 @@ public interface AuditService {
      */
     List<AuditVO> listAll(AuditRequest request) throws Exception;
 
-    List<AuditInformation> getAuditBases();
+    List<AuditInformation> getAuditBases(Boolean isMetric);
 
     /**
      * Get audit id by type and indicator type.
diff --git 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
index 60e5c84835..6644d2ef36 100644
--- 
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
+++ 
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/AuditServiceImpl.java
@@ -115,9 +115,13 @@ public class AuditServiceImpl implements AuditService {
         try {
             auditIndicatorMap.clear();
             List<AuditInformation> auditInformationList = 
AuditOperator.getInstance().getAllAuditInformation();
+            List<AuditInformation> metricInformationList = 
AuditOperator.getInstance().getAllMetricInformation();
             auditInformationList.forEach(v -> {
                 auditItemMap.put(String.valueOf(v.getAuditId()), 
v.getNameInChinese());
             });
+            metricInformationList.forEach(v -> {
+                auditItemMap.put(String.valueOf(v.getAuditId()), 
v.getNameInChinese());
+            });
         } catch (Throwable t) {
             LOGGER.error("failed to reload audit base item info", t);
             return false;
@@ -226,9 +230,11 @@ public class AuditServiceImpl implements AuditService {
     }
 
     @Override
-    public List<AuditInformation> getAuditBases() {
-        List<AuditInformation> auditInformations = 
AuditOperator.getInstance().getAllAuditInformation();
-        return auditInformations;
+    public List<AuditInformation> getAuditBases(Boolean isMetric) {
+        if (isMetric) {
+            return AuditOperator.getInstance().getAllMetricInformation();
+        }
+        return AuditOperator.getInstance().getAllAuditInformation();
     }
 
     private List<String> getAuditIds(String groupId, String streamId, String 
sourceNodeType, String sinkNodeType) {
diff --git 
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AuditController.java
 
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AuditController.java
index 06db520c52..c2e6f0f4a8 100644
--- 
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AuditController.java
+++ 
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/AuditController.java
@@ -72,8 +72,9 @@ public class AuditController {
 
     @ApiOperation(value = "Get the audit base info")
     @GetMapping("/audit/getAuditBases")
-    public Response<List<AuditInformation>> getAuditBases() {
-        return Response.success(auditService.getAuditBases());
+    public Response<List<AuditInformation>> getAuditBases(
+            @RequestParam(required = false, defaultValue = "false") boolean 
isMetric) {
+        return Response.success(auditService.getAuditBases(isMetric));
     }
 
     @GetMapping(value = "/audit/getAuditProxy")