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 1001f66fed [INLONG-10388][Manager] Provide an interface to obtain the
audit proxy address (#10389)
1001f66fed is described below
commit 1001f66fed79eec4f9a84b6d34da6a707985d9e5
Author: fuweng11 <[email protected]>
AuthorDate: Wed Jun 12 16:24:04 2024 +0800
[INLONG-10388][Manager] Provide an interface to obtain the audit proxy
address (#10389)
---
.../manager/pojo/audit/AuditProxyResponse.java | 41 ++++++++++++++++++++++
.../inlong/manager/service/core/AuditService.java | 8 +++++
.../service/core/impl/AuditServiceImpl.java | 28 +++++++++++++++
.../manager/web/controller/AuditController.java | 10 ++++++
.../web/controller/openapi/AuditController.java | 11 ++++++
5 files changed, 98 insertions(+)
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditProxyResponse.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditProxyResponse.java
new file mode 100644
index 0000000000..50b4a5534b
--- /dev/null
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/audit/AuditProxyResponse.java
@@ -0,0 +1,41 @@
+/*
+ * 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.inlong.manager.pojo.audit;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+public class AuditProxyResponse {
+
+ private Boolean success;
+ private String errMsg;
+ private List<AuditProxy> data;
+
+ @Data
+ @NoArgsConstructor
+ @AllArgsConstructor
+ public static class AuditProxy {
+
+ private String host;
+ private int port;
+ }
+}
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 c4b5844892..c97d74f7f9 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
@@ -19,6 +19,7 @@ package org.apache.inlong.manager.service.core;
import org.apache.inlong.audit.entity.AuditInformation;
import org.apache.inlong.common.enums.IndicatorType;
+import org.apache.inlong.manager.pojo.audit.AuditProxyResponse.AuditProxy;
import org.apache.inlong.manager.pojo.audit.AuditRequest;
import org.apache.inlong.manager.pojo.audit.AuditVO;
@@ -63,4 +64,11 @@ public interface AuditService {
*/
Boolean refreshBaseItemCache();
+ /**
+ * Get audit proxy url by component
+ *
+ * @return audit proxy list
+ */
+ List<AuditProxy> getAuditProxy(String component) throws Exception;
+
}
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 9e7ab49476..b89a2a6086 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
@@ -28,6 +28,7 @@ import org.apache.inlong.manager.common.enums.ClusterType;
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
import org.apache.inlong.manager.common.enums.TimeStaticsDim;
import org.apache.inlong.manager.common.exceptions.BusinessException;
+import org.apache.inlong.manager.common.util.HttpUtils;
import org.apache.inlong.manager.common.util.Preconditions;
import org.apache.inlong.manager.dao.entity.InlongGroupEntity;
import org.apache.inlong.manager.dao.entity.StreamSinkEntity;
@@ -37,6 +38,8 @@ import
org.apache.inlong.manager.dao.mapper.InlongGroupEntityMapper;
import org.apache.inlong.manager.dao.mapper.StreamSinkEntityMapper;
import org.apache.inlong.manager.dao.mapper.StreamSourceEntityMapper;
import org.apache.inlong.manager.pojo.audit.AuditInfo;
+import org.apache.inlong.manager.pojo.audit.AuditProxyResponse;
+import org.apache.inlong.manager.pojo.audit.AuditProxyResponse.AuditProxy;
import org.apache.inlong.manager.pojo.audit.AuditRequest;
import org.apache.inlong.manager.pojo.audit.AuditVO;
import org.apache.inlong.manager.pojo.user.LoginUserUtils;
@@ -56,6 +59,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
+import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
@@ -395,6 +399,30 @@ public class AuditServiceImpl implements AuditService {
return result;
}
+ @Override
+ public List<AuditProxy> getAuditProxy(String component) throws Exception {
+ try {
+ StringBuilder builder = new StringBuilder();
+ builder.append(auditQueryUrl)
+ .append("/audit/query/getAuditProxy?")
+ .append("component=")
+ .append(component);
+ String url = builder.toString();
+ LOGGER.info("query audit url ={}", url);
+ AuditProxyResponse result = HttpUtils.request(restTemplate,
+ url,
+ HttpMethod.GET, null,
+ null,
+ AuditProxyResponse.class);
+ LOGGER.info("success to query audit proxy url list for request url
={}", url);
+ return result.getData();
+ } catch (Exception e) {
+ String errMsg = String.format("get audit proxy url failed for %s",
component);
+ LOGGER.info(errMsg, e);
+ throw new BusinessException(errMsg);
+ }
+ }
+
/**
* Format the log time
*/
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 8291ad1ff1..8d6868ea3e 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
@@ -18,12 +18,14 @@
package org.apache.inlong.manager.web.controller;
import org.apache.inlong.audit.entity.AuditInformation;
+import org.apache.inlong.manager.pojo.audit.AuditProxyResponse.AuditProxy;
import org.apache.inlong.manager.pojo.audit.AuditRequest;
import org.apache.inlong.manager.pojo.audit.AuditVO;
import org.apache.inlong.manager.pojo.common.Response;
import org.apache.inlong.manager.service.core.AuditService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -31,6 +33,7 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
@@ -73,4 +76,11 @@ public class AuditController {
return Response.success(auditService.getAuditBases());
}
+ @GetMapping(value = "/audit/getAuditProxy")
+ @ApiOperation(value = "Get audit proxy url")
+ @ApiImplicitParam(name = "component", dataTypeClass = String.class,
required = true)
+ public Response<List<AuditProxy>> getAuditProxy(@RequestParam String
component) throws Exception {
+ return Response.success(auditService.getAuditProxy(component));
+ }
+
}
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AuditController.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AuditController.java
index c874c37bbe..46c16736a1 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AuditController.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/openapi/AuditController.java
@@ -19,6 +19,7 @@ package org.apache.inlong.manager.web.controller.openapi;
import org.apache.inlong.common.pojo.audit.AuditConfig;
import org.apache.inlong.common.pojo.audit.AuditConfigRequest;
+import org.apache.inlong.manager.pojo.audit.AuditProxyResponse.AuditProxy;
import org.apache.inlong.manager.pojo.audit.AuditRequest;
import org.apache.inlong.manager.pojo.audit.AuditVO;
import org.apache.inlong.manager.pojo.common.Response;
@@ -26,12 +27,15 @@ import
org.apache.inlong.manager.service.cluster.InlongClusterService;
import org.apache.inlong.manager.service.core.AuditService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
@@ -72,4 +76,11 @@ public class AuditController {
public Response<List<AuditVO>> listAll(@Valid @RequestBody AuditRequest
request) throws Exception {
return Response.success(auditService.listAll(request));
}
+
+ @GetMapping(value = "/audit/getAuditProxy")
+ @ApiOperation(value = "Get audit proxy url")
+ @ApiImplicitParam(name = "component", dataTypeClass = String.class,
required = true)
+ public Response<List<AuditProxy>> getAuditProxy(@RequestParam String
component) throws Exception {
+ return Response.success(auditService.getAuditProxy(component));
+ }
}
