From 99d1577c2b9f2dd83caa317c0505a776b1111f03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 13 Jun 2025 17:25:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- environment.sh | 2 +- init/10.sky-oap.sh | 1 - init/11.sky-ui.sh | 2 +- start/airport.sh | 8 +++++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/environment.sh b/environment.sh index fa8c739..b1b4814 100644 --- a/environment.sh +++ b/environment.sh @@ -258,7 +258,7 @@ export SKYWALKING_OAP_MEMORY=1g export SKYWALKING_UI_MEMORY=1g # SkyWalking UI对外爆露端口 export SKYWALKING_UI_PORT=8282 -export SW_AGENT_COLLECTOR_BACKEND_SERVICES=${SKYWALKING_OAP_NAME}:12800 +export SW_AGENT_COLLECTOR_BACKEND_SERVICES=${SKYWALKING_OAP_NAME}:11800 export SKYWALKING_USERNAME=skywalking export SKYWALKING_PASSWORD=skywalking diff --git a/init/10.sky-oap.sh b/init/10.sky-oap.sh index adedb0e..983e95a 100755 --- a/init/10.sky-oap.sh +++ b/init/10.sky-oap.sh @@ -51,7 +51,6 @@ docker run -d \ -p 12800:11800 \ --memory $SKYWALKING_OAP_MEMORY \ --restart unless-stopped \ - -e "discovery.type=single-node" \ -e TZ=Asia/Shanghai \ -e SW_STORAGE=elasticsearch7 \ -e SW_STORAGE_ES_CLUSTER_NODES=${ES_NAME}:9200 \ diff --git a/init/11.sky-ui.sh b/init/11.sky-ui.sh index 580b2f9..fea8d52 100755 --- a/init/11.sky-ui.sh +++ b/init/11.sky-ui.sh @@ -50,7 +50,7 @@ docker run -d \ --restart unless-stopped \ -p ${SKYWALKING_UI_PORT}:8080 \ -e TZ=Asia/Shanghai \ - -e SW_OAP_ADDRESS=${SKYWALKING_OAP_NAME}:12800 \ + -e SW_OAP_ADDRESS=http://${SKYWALKING_OAP_NAME}:12800 \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ $SKYWALKING_UI_IMAGE diff --git a/start/airport.sh b/start/airport.sh index 9ac013a..e98ce42 100755 --- a/start/airport.sh +++ b/start/airport.sh @@ -33,6 +33,8 @@ if [ "$USEDAJIANG" = "true" ]; then --env MINIO_DAJIOSS_ENDPOINT=https://${MINIO_DOMAIN}:${NGINX_HTTPS_PORT} \ --env MINIO_OSS_ACCESSKEYID=${MINIO_ACCESS_KEY} \ --env MINIO_OSS_ACCESSKEYSECRET=${MINIO_SECRET_KEY} \ + --env SW_APP_NAME=${AIRPORT_NAME} \ + --env SW_AGENT_COLLECTOR_BACKEND_SERVICES=172.20.0.8:11800 \ --env TZ=Asia/Shanghai \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ --memory ${AIRPORT_MEMORY} \ @@ -69,6 +71,8 @@ else --env MINIO_DAJIOSS_ENDPOINT=https://${MINIO_DOMAIN}:${NGINX_HTTPS_PORT} \ --env MINIO_OSS_ACCESSKEYID=${MINIO_ACCESS_KEY} \ --env MINIO_OSS_ACCESSKEYSECRET=${MINIO_SECRET_KEY} \ + --env SW_APP_NAME=${AIRPORT_NAME} \ + --env SW_AGENT_COLLECTOR_BACKEND_SERVICES=172.20.0.8:11800 \ --env TZ=Asia/Shanghai \ --mount type=bind,source=/etc/localtime,target=/etc/localtime,readonly \ --memory ${AIRPORT_MEMORY} \ @@ -76,4 +80,6 @@ else ${AIRPORT_IMAGE} fi - \ No newline at end of file + +# echo "agent.service_name=${AIRPORT_NAME}" > /data/java/tuoheng/skywalking-agent/config/agent.config +# echo "collector.backend_service=${SKYWALKING_OAP_NAME}:11800" >> /data/java/tuoheng/skywalking-agent/config/agent.config