You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/09/20 07:48:05 UTC
[inlong] branch master updated: [INLONG-5948][Audit] Add the enable audit environment (#5949)
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 b3b43bb6e [INLONG-5948][Audit] Add the enable audit environment (#5949)
b3b43bb6e is described below
commit b3b43bb6e3fed38223e28cdd78c94e856e8673b8
Author: Charles Zhang <do...@apache.org>
AuthorDate: Tue Sep 20 15:48:00 2022 +0800
[INLONG-5948][Audit] Add the enable audit environment (#5949)
---
.../src/main/java/org/apache/inlong/agent/constant/AgentConstants.java | 2 +-
inlong-agent/agent-docker/Dockerfile | 2 ++
inlong-agent/agent-docker/agent-docker.sh | 1 +
inlong-agent/conf/agent.properties | 2 +-
inlong-dataproxy/dataproxy-docker/Dockerfile | 2 ++
inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh | 1 +
6 files changed, 8 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 6af336097..843bb7bea 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
@@ -183,7 +183,7 @@ public class AgentConstants {
public static final String PROMETHEUS_EXPORTER_PORT = "agent.prometheus.exporter.port";
public static final int DEFAULT_PROMETHEUS_EXPORTER_PORT = 8080;
- public static final String AUDIT_ENABLE = "agent.audit.enable";
+ public static final String AUDIT_ENABLE = "audit.enable";
public static final boolean DEFAULT_AUDIT_ENABLE = true;
public static final String AUDIT_KEY_PROXYS = "audit.proxys";
diff --git a/inlong-agent/agent-docker/Dockerfile b/inlong-agent/agent-docker/Dockerfile
index d37562ded..d28a04f60 100644
--- a/inlong-agent/agent-docker/Dockerfile
+++ b/inlong-agent/agent-docker/Dockerfile
@@ -33,6 +33,8 @@ ENV MANAGER_OPENAPI_PORT=8082
ENV DATAPROXY_IP=127.0.0.1
ENV DATAPROXY_PORT=46801
ENV AUDIT_PROXY_URL=127.0.0.1:10081
+# enable audit, true or false
+ENV AUDIT_ENABLE=true
ENV ETH_NETWORK=eth0
ENV AGENT_FETCH_INTERVAL=10
ENV AGENT_HEARTBEAT_INTERVAL=10
diff --git a/inlong-agent/agent-docker/agent-docker.sh b/inlong-agent/agent-docker/agent-docker.sh
index bffb369e2..864232787 100644
--- a/inlong-agent/agent-docker/agent-docker.sh
+++ b/inlong-agent/agent-docker/agent-docker.sh
@@ -27,6 +27,7 @@ sed -i "s/agent.manager.vip.http.host=.*$/agent.manager.vip.http.host=$MANAGER_O
sed -i "s/agent.manager.vip.http.port=.*$/agent.manager.vip.http.port=$MANAGER_OPENAPI_PORT/g" "${file_path}/conf/agent.properties"
sed -i "s/agent.dataproxy.http.host=.*$/agent.dataproxy.http.host=$DATAPROXY_IP/g" "${file_path}/conf/agent.properties"
sed -i "s/agent.dataproxy.http.port=.*$/agent.dataproxy.http.port=$DATAPROXY_PORT/g" "${file_path}/conf/agent.properties"
+sed -i "s/audit.enable=.*$/audit.enable=$AUDIT_ENABLE/g" "${file_path}/conf/agent.properties"
sed -i "s/audit.proxys=.*$/audit.proxys=$AUDIT_PROXY_URL/g" "${file_path}/conf/agent.properties"
sed -i "s/agent.cluster.tag=.*$/agent.cluster.tag=$CLUSTER_TAG/g" "${file_path}/conf/agent.properties"
sed -i "s/agent.cluster.name=.*$/agent.cluster.name=$CLUSTER_NAME/g" "${file_path}/conf/agent.properties"
diff --git a/inlong-agent/conf/agent.properties b/inlong-agent/conf/agent.properties
index dc6785f32..7483384c5 100755
--- a/inlong-agent/conf/agent.properties
+++ b/inlong-agent/conf/agent.properties
@@ -125,6 +125,6 @@ agent.prometheus.exporter.port=9080
# audit config
############################
# whether to enable audit
-agent.audit.enable=true
+audit.enable=true
# audit proxy address
audit.proxys=127.0.0.1:10081
diff --git a/inlong-dataproxy/dataproxy-docker/Dockerfile b/inlong-dataproxy/dataproxy-docker/Dockerfile
index 5b61f1b08..526948d69 100644
--- a/inlong-dataproxy/dataproxy-docker/Dockerfile
+++ b/inlong-dataproxy/dataproxy-docker/Dockerfile
@@ -26,6 +26,8 @@ ADD ${DATAPROXY_TARBALL} /opt/inlong-dataproxy
EXPOSE 46801
ENV MANAGER_OPENAPI_IP=127.0.0.1
ENV MANAGER_OPENAPI_PORT=8083
+# enable audit, true or false
+ENV AUDIT_ENABLE=true
ENV AUDIT_PROXY_URL=127.0.0.1:10081
# pulsar or tubemq
ENV MQ_TYPE=pulsar
diff --git a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
index 6fdf37926..e8ab8a2b3 100644
--- a/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
+++ b/inlong-dataproxy/dataproxy-docker/dataproxy-docker.sh
@@ -22,6 +22,7 @@ local_ip=$(ifconfig | grep inet | grep -v inet6 | grep -v "127.0.0.1" | awk '{pr
cd "${file_path}/"
common_conf_file=./conf/common.properties
sed -i "s/manager.hosts=.*$/manager.hosts=${MANAGER_OPENAPI_IP}:${MANAGER_OPENAPI_PORT}/g" "${common_conf_file}"
+sed -i "s/audit.enable=.*$/audit.enable=${AUDIT_ENABLE}/g" "${common_conf_file}"
sed -i "s/audit.proxys=.*$/audit.proxys=${AUDIT_PROXY_URL}/g" "${common_conf_file}"
sed -i "s/proxy.report.ip=.*$/proxy.report.ip=${local_ip}/g" "${common_conf_file}"
sed -i "s/proxy.cluster.tag=.*$/proxy.cluster.tag=${CLUSTER_TAG}/g" "${common_conf_file}"