diff --git a/docker/thirdparties/docker-compose/kafka/kafka.yaml.tpl b/docker/thirdparties/docker-compose/kafka/kafka.yaml.tpl index 41b721938ffb73..b9d0abce17f41e 100644 --- a/docker/thirdparties/docker-compose/kafka/kafka.yaml.tpl +++ b/docker/thirdparties/docker-compose/kafka/kafka.yaml.tpl @@ -22,19 +22,21 @@ networks: ipam: driver: default config: - - subnet: 168.45.0.0/24 - + - subnet: 168.51.0.0/24 services: doris--zookeeper: - image: wurstmeister/zookeeper + image: bitnami/zookeeper restart: always container_name: doris--zookeeper ports: - ${DOCKER_ZOOKEEPER_EXTERNAL_PORT}:2181 + environment: + - ZOO_CFG_LISTEN_PORT=2181 + - ALLOW_ANONYMOUS_LOGIN=yes networks: - doris--kafka--network doris--kafka: - image: wurstmeister/kafka + image: bitnami/kafka:2 restart: always container_name: doris--kafka depends_on: @@ -42,11 +44,12 @@ services: ports: - ${DOCKER_KAFKA_EXTERNAL_PORT}:19193 environment: - KAFKA_ZOOKEEPER_CONNECT: doris--zookeeper:2181/kafka - KAFKA_LISTENERS: PLAINTEXT://:19193 - KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:19193 - KAFKA_BROKER_ID: 1 + - KAFKA_BROKER_ID=1 + - KAFKA_LISTENERS=PLAINTEXT://:19193 + - KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://localhost:19193 + - KAFKA_ZOOKEEPER_CONNECT=doris--zookeeper:2181 + - ALLOW_PLAINTEXT_LISTENER=yes volumes: - /var/run/docker.sock:/var/run/docker.sock networks: - - doris--kafka--network + - doris--kafka--network \ No newline at end of file diff --git a/docker/thirdparties/run-thirdparties-docker.sh b/docker/thirdparties/run-thirdparties-docker.sh index 64f630ae09a57a..01671bc95ec84f 100755 --- a/docker/thirdparties/run-thirdparties-docker.sh +++ b/docker/thirdparties/run-thirdparties-docker.sh @@ -255,23 +255,23 @@ fi if [[ "${RUN_KAFKA}" -eq 1 ]]; then # kafka KAFKA_CONTAINER_ID="${CONTAINER_UID}kafka" - eth0_num=$(ifconfig -a|grep flags=|grep -n ^eth0|awk -F ':' '{print $1}') - IP_HOST=$(ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $2}'|tr -d "addr:"|tail -n +${eth0_num}|head -n 1) + eth_name=$(ifconfig -a | grep -E "^eth[0-9]" | sort -k1.4n | awk -F ':' '{print $1}' | head -n 1) + IP_HOST=$(ifconfig "${eth_name}" | grep inet | grep -v 127.0.0.1 | grep -v inet6 | awk '{print $2}' | tr -d "addr:" | head -n 1) cp "${ROOT}"/docker-compose/kafka/kafka.yaml.tpl "${ROOT}"/docker-compose/kafka/kafka.yaml sed -i "s/doris--/${CONTAINER_UID}/g" "${ROOT}"/docker-compose/kafka/kafka.yaml sed -i "s/localhost/${IP_HOST}/g" "${ROOT}"/docker-compose/kafka/kafka.yaml sudo docker compose -f "${ROOT}"/docker-compose/kafka/kafka.yaml --env-file "${ROOT}"/docker-compose/kafka/kafka.env down create_kafka_topics() { - local container_id="$1" - local ip_host="$2" - local backup_dir=/home/work/pipline/backup_center + local container_id="$1" + local ip_host="$2" + local backup_dir=/home/work/pipline/backup_center - declare -a topics=("basic_data" "basic_array_data" "basic_data_with_errors" "basic_array_data_with_errors" "basic_data_timezone" "basic_array_data_timezone") + declare -a topics=("basic_data" "basic_array_data" "basic_data_with_errors" "basic_array_data_with_errors" "basic_data_timezone" "basic_array_data_timezone" "trino_kafka_basic_data") for topic in "${topics[@]}"; do - echo "docker exec "${container_id}" bash -c echo '/opt/kafka/bin/kafka-topics.sh --create --broker-list '${ip_host}:19193' --partitions 10' --topic '${topic}'" - docker exec "${container_id}" bash -c "/opt/kafka/bin/kafka-topics.sh --create --broker-list '${ip_host}:19193' --partitions 10' --topic '${topic}'" + echo "docker exec "${container_id}" bash -c echo '/opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server '${ip_host}:19193' --topic '${topic}'" + docker exec "${container_id}" bash -c "/opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server '${ip_host}:19193' --topic '${topic}'" done } diff --git a/ui/package.json b/ui/package.json index abf65d58e73809..0888a4483b774d 100644 --- a/ui/package.json +++ b/ui/package.json @@ -34,11 +34,13 @@ "classnames": "^2.2.6", "i18next": "^19.7.0", "i18next-browser-languagedetector": "^6.0.1", + "json-bigint": "^1.0.0", "lodash-decorators": "^6.0.1", "path-to-regexp": "^2.2.0", "react": "^16.13.1", "react-codemirror2": "^7.1.0", "react-dom": "^16.13.1", + "react-draggable": "4.4.6", "react-i18next": "^11.7.2", "react-resizable": "^1.10.1", "react-router": "^5.2.0", @@ -77,5 +79,8 @@ "webpack-cli": "^3.3.3", "webpack-dev-server": "^3.7.1", "webpack-merge": "^4.2.1" + }, + "resolutions": { + "react-draggable": "4.4.6" } }