Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions docker/thirdparties/docker-compose/kafka/kafka.yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,34 @@ 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:
- doris--zookeeper
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
16 changes: 8 additions & 8 deletions docker/thirdparties/run-thirdparties-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

}
Expand Down
5 changes: 5 additions & 0 deletions ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
}
Loading