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 df192c4407 [INLONG-10461][Docker] Update the way to configure audice
service info (#10462)
df192c4407 is described below
commit df192c44076e849ba3455f4f4064eb2e395ae414
Author: Charles Zhang <[email protected]>
AuthorDate: Thu Jun 20 09:44:03 2024 +0800
[INLONG-10461][Docker] Update the way to configure audice service info
(#10462)
---
docker/docker-compose/docker-compose.yml | 7 ++++---
inlong-manager/manager-docker/Dockerfile | 9 +++------
inlong-manager/manager-docker/manager-docker.sh | 1 +
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/docker/docker-compose/docker-compose.yml
b/docker/docker-compose/docker-compose.yml
index 1cff746abe..a63cb0b0d0 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_QUERY_URL=audit:10080
- AUDIT_PROXY_URL=audit:10081
dashboard:
@@ -111,9 +112,9 @@ services:
mysql:
condition: service_healthy
environment:
- - JDBC_URL=mysql:3306
- - USERNAME=root
- - PASSWORD=inlong
+ - AUDIT_JDBC_URL=mysql:3306
+ - AUDIT_JDBC_USERNAME=root
+ - AUDIT_JDBC_PASSWORD=inlong
- MANAGER_OPENAPI_IP=manager
- MANAGER_OPENAPI_PORT=8083
# pulsar or kafka
diff --git a/inlong-manager/manager-docker/Dockerfile
b/inlong-manager/manager-docker/Dockerfile
index 05fda7b120..4bebbc1848 100644
--- a/inlong-manager/manager-docker/Dockerfile
+++ b/inlong-manager/manager-docker/Dockerfile
@@ -29,7 +29,6 @@ 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
@@ -51,11 +50,9 @@ RUN wget -P /opt/inlong-sort/connectors/
${default_jdbc_connector_url}
ADD target/sort-connector-pulsar-v1.15-${VERSION}.jar
/opt/inlong-sort/connectors/
ADD target/sort-connector-kafka-v1.15-${VERSION}.jar
/opt/inlong-sort/connectors/
ADD target/sort-connector-mysql-cdc-v1.15-${VERSION}.jar
/opt/inlong-sort/connectors/
-# audit clickhouse
-ENV AUDIT_CK_URL=127.0.0.1:8123
-ENV AUDIT_CK_USERNAME=default
-ENV AUDIT_CK_PASSWD=default
-ENV AUDIT_CK_DBNAME="apache_inlong_audit"
+# audit
+ENV AUDIT_QUERY_URL=127.0.0.1:10080
+ENV AUDIT_PROXY_URL=127.0.0.1:10081
ADD manager-docker.sh bin/
RUN chmod +x bin/manager-docker.sh
CMD ["bin/manager-docker.sh"]
diff --git a/inlong-manager/manager-docker/manager-docker.sh
b/inlong-manager/manager-docker/manager-docker.sh
index aebd4322b2..360f239fd4 100644
--- a/inlong-manager/manager-docker/manager-docker.sh
+++ b/inlong-manager/manager-docker/manager-docker.sh
@@ -41,6 +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/audit.query.url=.*$/audit.query.url=${AUDIT_QUERY_URL}/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}"
