[INLONG-7636][Docker] Modify the Kafka config for Audit docker deploy…

…ment (#7637)
apache · Mar 18, 2023 · 86e744c · 86e744c
1 parent 01dfd9d
commit 86e744c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/docker/docker-compose/docker-compose.yml b/docker/docker-compose/docker-compose.yml
@@ -115,11 +115,10 @@ services:
       - JDBC_URL=mysql:3306
       - USERNAME=root
       - PASSWORD=inlong
+      - MANAGER_OPENAPI_IP=manager
+      - MANAGER_OPENAPI_PORT=8083
       # pulsar or kafka
       - MQ_TYPE=pulsar
-      - PULSAR_BROKER_LIST=pulsar:6650
-      # for kafka
-      # - KAFKA_SERVER_LIST=kafka:9092
     ports:
       - "10081:10081"
 

diff --git a/docker/kubernetes/templates/audit-statefulset.yaml b/docker/kubernetes/templates/audit-statefulset.yaml
@@ -119,22 +119,16 @@ spec:
             {{ if eq .Values.dataproxy.mqType "pulsar" }}
             - name: MQ_TYPE
               value: "pulsar"
-            - name: PULSAR_BROKER_LIST
-              value: {{ .Values.external.pulsar.serviceUrl }}
             - name: PULSAR_AUDIT_TOPIC
               value: "{{ .Values.external.pulsar.auditTopicName }}"
             {{- end }}
             {{ if eq .Values.dataproxy.mqType "kafka" }}
             - name: MQ_TYPE
               value: "kafka"
-            - name: KAFKA_SERVER_LIST
-              value: {{ .Values.external.kafka.bootstrap_server_url }}
             {{- end }}
             {{ if eq .Values.dataproxy.mqType "tubemq" }}
             - name: MQ_TYPE
               value: "tubemq"
-            - name: TUBE_MASTER_LIST
-              value: "{{ template "inlong.tubemqMaster.hostname" . }}:{{ .Values.tubemqMaster.ports.rpcPort }}"
             {{- end }}
             - name: MANAGER_OPENAPI_IP
               value: {{ include "inlong.manager.hostname" . | quote }}

diff --git a/inlong-audit/audit-docker/Dockerfile b/inlong-audit/audit-docker/Dockerfile
@@ -26,7 +26,9 @@ ADD ${AUDIT_TARBALL} /opt/inlong-audit
 EXPOSE 10081
 # pulsar or tubemq or kafka
 ENV MQ_TYPE=pulsar
-ENV PULSAR_BROKER_LIST="127.0.0.1:6650"
+ENV MANAGER_OPENAPI_IP=127.0.0.1
+ENV MANAGER_OPENAPI_PORT=8083
+ENV CLUSTER_TAG="default_cluster"
 ENV PULSAR_AUDIT_TOPIC="persistent:\/\/public\/default\/inlong-audit"
 ENV TUBE_MASTER_LIST="localhost:8715"
 ENV TUBE_AUDIT_TOPIC="inlong-audit"

diff --git a/inlong-audit/audit-docker/audit-docker.sh b/inlong-audit/audit-docker/audit-docker.sh
@@ -25,27 +25,20 @@ 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}"
   sed -i "s/agent1.sinks.pulsar-sink-msg1.topic = .*$/agent1.sinks.pulsar-sink-msg1.topic = ${PULSAR_AUDIT_TOPIC}/g" "${proxy_conf_file}"
   sed -i "s/agent1.sinks.pulsar-sink-msg2.topic = .*$/agent1.sinks.pulsar-sink-msg2.topic = ${PULSAR_AUDIT_TOPIC}/g" "${proxy_conf_file}"
 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}"
   sed -i "s/agent1.sinks.tube-sink-msg1.topic = .*$/agent1.sinks.tube-sink-msg1.topic = ${TUBE_AUDIT_TOPIC}/g" "${proxy_conf_file}"
   sed -i "s/agent1.sinks.tube-sink-msg2.topic = .*$/agent1.sinks.tube-sink-msg2.topic = ${TUBE_AUDIT_TOPIC}/g" "${proxy_conf_file}"
 fi