This is an automated email from the ASF dual-hosted git repository.
wenweihuang 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 ab88f0da29 [INLONG-10770][Agent] Delete audit proxy configuration
related code (#10771)
ab88f0da29 is described below
commit ab88f0da29f41604ad52a8ab74dc859930dc7a8b
Author: justinwwhuang <hww_jus...@163.com>
AuthorDate: Mon Aug 12 14:29:29 2024 +0800
[INLONG-10770][Agent] Delete audit proxy configuration related code (#10771)
---
inlong-agent/agent-installer/conf/installer.properties | 4 +---
inlong-agent/bin/agent-config.sh | 8 --------
inlong-agent/conf/agent.properties | 2 --
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/inlong-agent/agent-installer/conf/installer.properties
b/inlong-agent/agent-installer/conf/installer.properties
index d74e2d23e4..aed969cb09 100755
--- a/inlong-agent/agent-installer/conf/installer.properties
+++ b/inlong-agent/agent-installer/conf/installer.properties
@@ -38,6 +38,4 @@ agent.cluster.name=default_agent
# audit config
############################
# whether to enable audit
-audit.enable=true
-# Use the audit proxy address if the audit proxy address is configured;
otherwise get the proxy address from the manager
-audit.proxys=127.0.0.1:10081
\ No newline at end of file
+audit.enable=true
\ No newline at end of file
diff --git a/inlong-agent/bin/agent-config.sh b/inlong-agent/bin/agent-config.sh
index 828c4decb0..895a7d546d 100755
--- a/inlong-agent/bin/agent-config.sh
+++ b/inlong-agent/bin/agent-config.sh
@@ -25,7 +25,6 @@ clusterTag=$(cat $installerConfigFile|grep -i
'agent.cluster.tag'|awk -F = '{pri
clusterName=$(cat $installerConfigFile|grep -i 'agent.cluster.name'|awk -F =
'{print $2}')
tdwSecurityUrl=$(cat $installerConfigFile|grep -i 'tdw.security.url'|awk -F =
'{print $2}')
auditFlag=$(cat $installerConfigFile|grep -i 'audit.enable'|awk -F = '{print
$2}')
-auditProxy=$(cat $installerConfigFile|grep -i 'audit.proxys'|grep -v '#'|awk
-F = '{print $2}')
if [ ${#managerAddr} -gt 0 ]; then
sed -i "/agent.manager.addr=*/c\agent.manager.addr=$managerAddr"
$agentConfigFile
@@ -62,10 +61,3 @@ if [ ${#auditFlag} -gt 0 ]; then
else
echo "audit flag empty"
fi
-
-if [ ${#auditProxy} -gt 0 ]; then
- sed -i "/audit.proxys=*/c\audit.proxys=$auditProxy" $agentConfigFile
-else
- sed -i "/audit.proxys=*/c\# audit.proxys=$auditProxy" $agentConfigFile
- echo "audit proxy empty"
-fi
diff --git a/inlong-agent/conf/agent.properties
b/inlong-agent/conf/agent.properties
index 679b2987a5..ec5637eb08 100755
--- a/inlong-agent/conf/agent.properties
+++ b/inlong-agent/conf/agent.properties
@@ -98,5 +98,3 @@ agent.prometheus.exporter.port=9080
############################
# whether to enable audit
audit.enable=true
-# Use the audit proxy address if the audit proxy address is configured;
otherwise get the proxy address from the manager
-audit.proxys=127.0.0.1:10081
