From e9f0387022fdbc82b97f83357adad98e93e023e8 Mon Sep 17 00:00:00 2001 From: wenweihuang Date: Thu, 14 Nov 2024 16:33:29 +0800 Subject: [PATCH] [INLONG-11499][Agent] By default, use the locally configured audit address --- .../inlong/agent/constant/AgentConstants.java | 1 + .../inlong/agent/metrics/audit/AuditUtils.java | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/AgentConstants.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/AgentConstants.java index ec5831973be..6b9b802be27 100755 --- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/AgentConstants.java +++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/constant/AgentConstants.java @@ -68,6 +68,7 @@ public class AgentConstants { public static final String AUDIT_ENABLE = "audit.enable"; public static final boolean DEFAULT_AUDIT_ENABLE = true; + public static final String AUDIT_PROXY_ADDRESS = "audit.proxy.address"; public static final String AGENT_HISTORY_PATH = "agent.history.path"; public static final String DEFAULT_AGENT_HISTORY_PATH = ".history"; diff --git a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java index fa425d7782b..b4f74bfc63c 100644 --- a/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java +++ b/inlong-agent/agent-common/src/main/java/org/apache/inlong/agent/metrics/audit/AuditUtils.java @@ -22,7 +22,10 @@ import org.apache.inlong.audit.AuditOperator; import org.apache.inlong.audit.entity.AuditComponent; +import java.util.HashSet; + import static org.apache.inlong.agent.constant.AgentConstants.AUDIT_ENABLE; +import static org.apache.inlong.agent.constant.AgentConstants.AUDIT_PROXY_ADDRESS; import static org.apache.inlong.agent.constant.AgentConstants.DEFAULT_AUDIT_ENABLE; import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_ADDR; import static org.apache.inlong.agent.constant.FetcherConstants.AGENT_MANAGER_AUTH_SECRET_ID; @@ -67,8 +70,14 @@ public class AuditUtils { public static void initAudit(AbstractConfiguration conf) { IS_AUDIT = conf.getBoolean(AUDIT_ENABLE, DEFAULT_AUDIT_ENABLE); if (IS_AUDIT) { - AuditOperator.getInstance().setAuditProxy(AuditComponent.AGENT, conf.get(AGENT_MANAGER_ADDR), - conf.get(AGENT_MANAGER_AUTH_SECRET_ID), conf.get(AGENT_MANAGER_AUTH_SECRET_KEY)); + if (conf.hasKey(AUDIT_PROXY_ADDRESS)) { + HashSet address = new HashSet<>(); + address.add(conf.get(AUDIT_PROXY_ADDRESS)); + AuditOperator.getInstance().setAuditProxy(address); + } else { + AuditOperator.getInstance().setAuditProxy(AuditComponent.AGENT, conf.get(AGENT_MANAGER_ADDR), + conf.get(AGENT_MANAGER_AUTH_SECRET_ID), conf.get(AGENT_MANAGER_AUTH_SECRET_KEY)); + } AuditOperator.getInstance().setLocalIP(conf.get(AgentConstants.AGENT_LOCAL_IP)); } }