dockerzhang commented on code in PR #7637:
URL: https://github.com/apache/inlong/pull/7637#discussion_r1140130077


##########
inlong-audit/audit-docker/audit-docker.sh:
##########
@@ -25,9 +25,10 @@ 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
+sed -i 
"s/manager.hosts=.*$/manager.hosts=${MANAGER_OPENAPI_IP}:${MANAGER_OPENAPI_PORT}/g"
 "${store_conf_file}"
+sed -i "s/proxy.cluster.tag=.*$/proxy.cluster.tag=${CLUSTER_TAG}/g" 
"${store_conf_file}"
 if [ "${MQ_TYPE}" = "pulsar" ]; then
   sed -i "s/audit.config.proxy.type=.*$/audit.config.proxy.type=pulsar"/g 
"${store_conf_file}"
-  sed -i 
"s/audit.pulsar.server.url=.*$/audit.pulsar.server.url=pulsar:\/\/${PULSAR_BROKER_LIST}/g"
 "${store_conf_file}"
   sed -i "s/audit.pulsar.topic = .*$/audit.pulsar.topic = 
${PULSAR_AUDIT_TOPIC}/g" "${store_conf_file}"
   sed -i "s/agent1.sinks.pulsar-sink-msg1.pulsar_server_url = 
.*$/agent1.sinks.pulsar-sink-msg1.pulsar_server_url = 
pulsar:\/\/${PULSAR_BROKER_LIST}/g" "${proxy_conf_file}"

Review Comment:
   here need to remove too?



##########
inlong-audit/audit-docker/audit-docker.sh:
##########
@@ -25,9 +25,10 @@ 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
+sed -i 
"s/manager.hosts=.*$/manager.hosts=${MANAGER_OPENAPI_IP}:${MANAGER_OPENAPI_PORT}/g"
 "${store_conf_file}"
+sed -i "s/proxy.cluster.tag=.*$/proxy.cluster.tag=${CLUSTER_TAG}/g" 
"${store_conf_file}"
 if [ "${MQ_TYPE}" = "pulsar" ]; then
   sed -i "s/audit.config.proxy.type=.*$/audit.config.proxy.type=pulsar"/g 
"${store_conf_file}"
-  sed -i 
"s/audit.pulsar.server.url=.*$/audit.pulsar.server.url=pulsar:\/\/${PULSAR_BROKER_LIST}/g"
 "${store_conf_file}"
   sed -i "s/audit.pulsar.topic = .*$/audit.pulsar.topic = 
${PULSAR_AUDIT_TOPIC}/g" "${store_conf_file}"
   sed -i "s/agent1.sinks.pulsar-sink-msg1.pulsar_server_url = 
.*$/agent1.sinks.pulsar-sink-msg1.pulsar_server_url = 
pulsar:\/\/${PULSAR_BROKER_LIST}/g" "${proxy_conf_file}"
   sed -i "s/agent1.sinks.pulsar-sink-msg2.pulsar_server_url = 
.*$/agent1.sinks.pulsar-sink-msg2.pulsar_server_url = 
pulsar:\/\/${PULSAR_BROKER_LIST}/g" "${proxy_conf_file}"

Review Comment:
   ditto



##########
inlong-audit/audit-docker/audit-docker.sh:
##########
@@ -36,13 +37,11 @@ if [ "${MQ_TYPE}" = "pulsar" ]; then
 fi
 if [ "${MQ_TYPE}" = "kafka" ]; then
   sed -i "s/audit.config.proxy.type=.*$/audit.config.proxy.type=kafka"/g 
"${store_conf_file}"
-  sed -i 
"s/audit.kafka.server.url=.*$/audit.kafka.server.url=${KAFKA_SERVER_LIST}"/g 
"${store_conf_file}"
   sed -i "s/agent1.sinks.kafka-sink-msg1.bootstrap_servers = 
.*$/agent1.sinks.kafka-sink-msg1.bootstrap_servers = ${KAFKA_SERVER_LIST}/g" 
"${proxy_conf_file}"
   sed -i "s/agent1.sinks.kafka-sink-msg2.bootstrap_servers = 
.*$/agent1.sinks.kafka-sink-msg2.bootstrap_servers = ${KAFKA_SERVER_LIST}/g" 
"${proxy_conf_file}"

Review Comment:
   ditto



##########
inlong-audit/audit-docker/audit-docker.sh:
##########
@@ -36,13 +37,11 @@ if [ "${MQ_TYPE}" = "pulsar" ]; then
 fi
 if [ "${MQ_TYPE}" = "kafka" ]; then
   sed -i "s/audit.config.proxy.type=.*$/audit.config.proxy.type=kafka"/g 
"${store_conf_file}"
-  sed -i 
"s/audit.kafka.server.url=.*$/audit.kafka.server.url=${KAFKA_SERVER_LIST}"/g 
"${store_conf_file}"
   sed -i "s/agent1.sinks.kafka-sink-msg1.bootstrap_servers = 
.*$/agent1.sinks.kafka-sink-msg1.bootstrap_servers = ${KAFKA_SERVER_LIST}/g" 
"${proxy_conf_file}"
   sed -i "s/agent1.sinks.kafka-sink-msg2.bootstrap_servers = 
.*$/agent1.sinks.kafka-sink-msg2.bootstrap_servers = ${KAFKA_SERVER_LIST}/g" 
"${proxy_conf_file}"
 fi
 if [ "${MQ_TYPE}" = "tubemq" ]; then
   sed -i "s/audit.config.proxy.type=.*$/audit.config.proxy.type=tube"/g 
"${store_conf_file}"
-  sed -i 
"s/audit.tube.masterlist=.*$/audit.tube.masterlist=${TUBE_MASTER_LIST}/g" 
"${store_conf_file}"
   sed -i "s/audit.tube.topic = .*$/audit.tube.topic = ${TUBE_AUDIT_TOPIC}/g" 
"${store_conf_file}"
   sed -i "s/agent1.sinks.tube-sink-msg1.master-host-port-list = 
.*$/agent1.sinks.tube-sink-msg1.master-host-port-list = ${TUBE_MASTER_LIST}/g" 
"${proxy_conf_file}"

Review Comment:
   ditto



##########
inlong-audit/audit-docker/audit-docker.sh:
##########
@@ -36,13 +37,11 @@ if [ "${MQ_TYPE}" = "pulsar" ]; then
 fi
 if [ "${MQ_TYPE}" = "kafka" ]; then
   sed -i "s/audit.config.proxy.type=.*$/audit.config.proxy.type=kafka"/g 
"${store_conf_file}"
-  sed -i 
"s/audit.kafka.server.url=.*$/audit.kafka.server.url=${KAFKA_SERVER_LIST}"/g 
"${store_conf_file}"
   sed -i "s/agent1.sinks.kafka-sink-msg1.bootstrap_servers = 
.*$/agent1.sinks.kafka-sink-msg1.bootstrap_servers = ${KAFKA_SERVER_LIST}/g" 
"${proxy_conf_file}"
   sed -i "s/agent1.sinks.kafka-sink-msg2.bootstrap_servers = 
.*$/agent1.sinks.kafka-sink-msg2.bootstrap_servers = ${KAFKA_SERVER_LIST}/g" 
"${proxy_conf_file}"
 fi
 if [ "${MQ_TYPE}" = "tubemq" ]; then
   sed -i "s/audit.config.proxy.type=.*$/audit.config.proxy.type=tube"/g 
"${store_conf_file}"
-  sed -i 
"s/audit.tube.masterlist=.*$/audit.tube.masterlist=${TUBE_MASTER_LIST}/g" 
"${store_conf_file}"
   sed -i "s/audit.tube.topic = .*$/audit.tube.topic = ${TUBE_AUDIT_TOPIC}/g" 
"${store_conf_file}"
   sed -i "s/agent1.sinks.tube-sink-msg1.master-host-port-list = 
.*$/agent1.sinks.tube-sink-msg1.master-host-port-list = ${TUBE_MASTER_LIST}/g" 
"${proxy_conf_file}"
   sed -i "s/agent1.sinks.tube-sink-msg2.master-host-port-list = 
.*$/agent1.sinks.tube-sink-msg2.master-host-port-list = ${TUBE_MASTER_LIST}/g" 
"${proxy_conf_file}"

Review Comment:
   ditto



##########
inlong-audit/audit-docker/audit-docker.sh:
##########
@@ -36,13 +37,11 @@ if [ "${MQ_TYPE}" = "pulsar" ]; then
 fi
 if [ "${MQ_TYPE}" = "kafka" ]; then
   sed -i "s/audit.config.proxy.type=.*$/audit.config.proxy.type=kafka"/g 
"${store_conf_file}"
-  sed -i 
"s/audit.kafka.server.url=.*$/audit.kafka.server.url=${KAFKA_SERVER_LIST}"/g 
"${store_conf_file}"
   sed -i "s/agent1.sinks.kafka-sink-msg1.bootstrap_servers = 
.*$/agent1.sinks.kafka-sink-msg1.bootstrap_servers = ${KAFKA_SERVER_LIST}/g" 
"${proxy_conf_file}"

Review Comment:
   ditto



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to