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/10/20 11:04:10 UTC
[inlong] branch master updated: [INLONG-6241][Docker] Add manager and audit database name configuration (#6242)
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 055bd93dd [INLONG-6241][Docker] Add manager and audit database name configuration (#6242)
055bd93dd is described below
commit 055bd93ddbce0398861c6c54170923924889826c
Author: Lucas <10...@users.noreply.github.com>
AuthorDate: Thu Oct 20 19:04:03 2022 +0800
[INLONG-6241][Docker] Add manager and audit database name configuration (#6242)
---
inlong-audit/audit-docker/Dockerfile | 2 ++
inlong-audit/audit-docker/audit-docker.sh | 10 ++++++++--
inlong-manager/manager-docker/Dockerfile | 2 ++
inlong-manager/manager-docker/manager-docker.sh | 7 ++++++-
4 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/inlong-audit/audit-docker/Dockerfile b/inlong-audit/audit-docker/Dockerfile
index 091830fed..0a1042f3e 100644
--- a/inlong-audit/audit-docker/Dockerfile
+++ b/inlong-audit/audit-docker/Dockerfile
@@ -30,6 +30,7 @@ ENV PULSAR_BROKER_LIST="127.0.0.1:6650"
ENV PULSAR_AUDIT_TOPIC="persistent:\/\/public\/default\/inlong-audit"
ENV TUBE_MASTER_LIST="localhost:8715"
ENV TUBE_AUDIT_TOPIC="inlong-audit"
+ENV AUDIT_DBNAME="apache_inlong_audit"
# mysql / clickhouse / elasticsearch
ENV STORE_MODE=mysql
# mysql
@@ -40,6 +41,7 @@ ENV PASSWORD=inlong
ENV STORE_CK_URL=127.0.0.1:8123
ENV STORE_CK_USERNAME=default
ENV STORE_CK_PASSWD=default
+ENV STORE_CK_DBNAME="apache_inlong_audit"
# elasticsearch
ENV STORE_ES_HOST=127.0.0.1
ENV STORE_ES_PORT=9200
diff --git a/inlong-audit/audit-docker/audit-docker.sh b/inlong-audit/audit-docker/audit-docker.sh
index 6a76fa670..474f68934 100755
--- a/inlong-audit/audit-docker/audit-docker.sh
+++ b/inlong-audit/audit-docker/audit-docker.sh
@@ -21,6 +21,8 @@ file_path=$(cd "$(dirname "$0")"/../;pwd)
store_conf_file=${file_path}/conf/application.properties
# proxy config
proxy_conf_file=${file_path}/conf/audit-proxy-${MQ_TYPE}.conf
+sql_file="${file_path}"/sql/apache_inlong_audit.sql
+sql_ck_file="${file_path}"/sql/apache_inlong_audit_clickhouse.sql
# replace the configuration for audit proxy
if [ "${MQ_TYPE}" = "pulsar" ]; then
@@ -45,13 +47,17 @@ if [ -n "${STORE_MODE}" ]; then
sed -i "s/audit.config.store.mode=.*$/audit.config.store.mode=${STORE_MODE}/g" "${store_conf_file}"
fi
# DB
-sed -i "s/127.0.0.1:3306/${JDBC_URL}/g" "${store_conf_file}"
+sed -i "s/127.0.0.1:3306\/apache_inlong_audit/${JDBC_URL}\/${AUDIT_DBNAME}/g" "${store_conf_file}"
sed -i "s/spring.datasource.druid.username=.*$/spring.datasource.druid.username=${USERNAME}/g" "${store_conf_file}"
sed -i "s/spring.datasource.druid.password=.*$/spring.datasource.druid.password=${PASSWORD}/g" "${store_conf_file}"
+# mysql file for audit
+sed -i "s/apache_inlong_audit/${AUDIT_DBNAME}/g" "${sql_file}"
# clickhouse
-sed -i "s/clickhouse.url=.*$/clickhouse.url=jdbc:clickhouse:\/\/${STORE_CK_URL}\/apache_inlong_audit/g" "${store_conf_file}"
+sed -i "s/clickhouse.url=.*$/clickhouse.url=jdbc:clickhouse:\/\/${STORE_CK_URL}\/${STORE_CK_DBNAME}/g" "${store_conf_file}"
sed -i "s/clickhouse.username=.*$/clickhouse.username=${STORE_CK_USERNAME}/g" "${store_conf_file}"
sed -i "s/clickhouse.password=.*$/clickhouse.password=${STORE_CK_PASSWD}/g" "${store_conf_file}"
+# mysql file for clickhouse
+sed -i "s/apache_inlong_audit/${STORE_CK_DBNAME}/g" "${sql_ck_file}"
# elasticsearch
sed -i "s/elasticsearch.host=.*$/elasticsearch.host=${STORE_ES_HOST}/g" "${store_conf_file}"
sed -i "s/elasticsearch.port=.*$/elasticsearch.port=${STORE_ES_PORT}/g" "${store_conf_file}"
diff --git a/inlong-manager/manager-docker/Dockerfile b/inlong-manager/manager-docker/Dockerfile
index 405b3e533..a97ed4248 100644
--- a/inlong-manager/manager-docker/Dockerfile
+++ b/inlong-manager/manager-docker/Dockerfile
@@ -28,6 +28,7 @@ ENV USERNAME=root
ENV PASSWORD=inlong
ENV ZK_URL=127.0.0.1:2181
ENV CLEANSING_ENABLE=false
+ENV MANAGER_DBNAME=apache_inlong_manager
# support download plugins from remote address.
ENV PLUGINS_URL=default
# for flink-sort-plugin.properties
@@ -50,6 +51,7 @@ ADD target/sort-connector-hive-${VERSION}.jar /opt/inlong-sort/connectors/
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"
# add mysql connector
RUN wget -P lib/ https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.27/mysql-connector-java-8.0.27.jar
ADD manager-docker.sh bin/
diff --git a/inlong-manager/manager-docker/manager-docker.sh b/inlong-manager/manager-docker/manager-docker.sh
index 924f07ea9..478e5b280 100644
--- a/inlong-manager/manager-docker/manager-docker.sh
+++ b/inlong-manager/manager-docker/manager-docker.sh
@@ -27,26 +27,31 @@ fi
conf_file="${file_path}"/conf/application-"${ACTIVE_PROFILE}".properties
flink_conf_file="${file_path}"/plugins/flink-sort-plugin.properties
+sql_file="${file_path}"/sql/apache_inlong_manager.sql
# application-prod/dev.properties
sed -i "s/spring.profiles.active=.*$/spring.profiles.active=${ACTIVE_PROFILE}/g" "${file_path}"/conf/application.properties
sed -i "s/127.0.0.1:3306/${JDBC_URL}/g" "${conf_file}"
sed -i "s/datasource.druid.username=.*$/datasource.druid.username=${USERNAME}/g" "${conf_file}"
sed -i "s/datasource.druid.password=.*$/datasource.druid.password=${PASSWORD}/g" "${conf_file}"
+sed -i "s/apache_inlong_manager/${MANAGER_DBNAME}/g" "${conf_file}"
# for data cleansing
sed -i "s/data.cleansing.enabled=.*$/data.cleansing.enabled=${CLEANSING_ENABLE}/g" "${conf_file}"
sed -i "s/data.cleansing.interval.seconds=.*$/data.cleansing.interval.seconds=${CLEANSING_INTERVAL}/g" "${conf_file}"
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.ck.jdbcUrl=.*$/audit.ck.jdbcUrl=${AUDIT_CK_URL}/g" "${conf_file}"
+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}"
# 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}"
sed -i "s/flink.parallelism=.*$/flink.parallelism=${FLINK_PARALLELISM}/g" "${flink_conf_file}"
sed -i "s/metrics.audit.proxy.hosts=.*$/metrics.audit.proxy.hosts=${AUDIT_PROXY_URL}/g" "${flink_conf_file}"
+# for db sql
+sed -i "s/apache_inlong_manager/${MANAGER_DBNAME}/g" "${sql_file}"
# startup the application
JAVA_OPTS="-Dspring.profiles.active=${ACTIVE_PROFILE}"