(inlong) branch master updated: [INLONG-10252][Docker] Fix the bug can not get the real audit address (#10253)

[dockerzhang]

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 6eeec6ee61 [INLONG-10252][Docker] Fix the bug can not get the real 
audit address (#10253)
6eeec6ee61 is described below

commit 6eeec6ee619889e9efa8b6b52fd1ae265d45f936
Author: Charles Zhang <dockerzh...@apache.org>
AuthorDate: Wed May 22 17:33:27 2024 +0800

    [INLONG-10252][Docker] Fix the bug can not get the real audit address 
(#10253)
---
 docker/docker-compose/docker-compose.yml        | 1 +
 inlong-manager/manager-docker/Dockerfile        | 1 +
 inlong-manager/manager-docker/manager-docker.sh | 5 +----
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docker/docker-compose/docker-compose.yml 
b/docker/docker-compose/docker-compose.yml
index 9434fdb6aa..6140e13c02 100644
--- a/docker/docker-compose/docker-compose.yml
+++ b/docker/docker-compose/docker-compose.yml
@@ -60,6 +60,7 @@ services:
       - ZK_URL=tubemq-server:2181
       - FLINK_HOST=jobmanager
       - FLINK_PORT=8081
+      - AUDIT_PROXY_URL=audit:10081
 
   dashboard:
     image: inlong/dashboard:${VERSION_TAG}
diff --git a/inlong-manager/manager-docker/Dockerfile 
b/inlong-manager/manager-docker/Dockerfile
index cb48550a6d..2345581f7c 100644
--- a/inlong-manager/manager-docker/Dockerfile
+++ b/inlong-manager/manager-docker/Dockerfile
@@ -29,6 +29,7 @@ ENV PASSWORD=inlong
 ENV ZK_URL=127.0.0.1:2181
 ENV CLEANSING_ENABLE=false
 ENV MANAGER_DBNAME=apache_inlong_manager
+ENV AUDIT_PROXY_URL=127.0.0.1:10081
 # support download plugins from remote address.
 ENV PLUGINS_URL=default
 # for flink-sort-plugin.properties
diff --git a/inlong-manager/manager-docker/manager-docker.sh 
b/inlong-manager/manager-docker/manager-docker.sh
index db647239a4..aebd4322b2 100644
--- a/inlong-manager/manager-docker/manager-docker.sh
+++ b/inlong-manager/manager-docker/manager-docker.sh
@@ -41,10 +41,7 @@ sed -i 
"s/data.cleansing.interval.seconds=.*$/data.cleansing.interval.seconds=${
 sed -i 
"s/data.cleansing.before.days=.*$/data.cleansing.before.days=${CLEANSING_BEFORE_DAYS}/g"
 "${conf_file}"
 sed -i 
"s/data.cleansing.batchSize=.*$/data.cleansing.batchSize=${CLEANSING_BATCHSIZE}/g"
 "${conf_file}"
 # for audit data
-sed -i "s/127.0.0.1:8123/${AUDIT_CK_URL}/g" "${conf_file}"
-sed -i "s/audit.ck.username=.*$/audit.ck.username=${AUDIT_CK_USERNAME}/g" 
"${conf_file}"
-sed -i "s/audit.ck.password=.*$/audit.ck.password=${AUDIT_CK_PASSWD}/g" 
"${conf_file}"
-sed -i "s/apache_inlong_audit/${AUDIT_CK_DBNAME}/g" "${conf_file}"
+sed -i 
"s/metrics.audit.proxy.hosts=.*$/metrics.audit.proxy.hosts=${AUDIT_PROXY_URL}/g"
 "${conf_file}"
 # flink-sort-plugin.properties
 sed -i "s/flink.rest.address=.*$/flink.rest.address=${FLINK_HOST}/g" 
"${flink_conf_file}"
 sed -i "s/flink.rest.port=.*$/flink.rest.port=${FLINK_PORT}/g" 
"${flink_conf_file}"