引入lumberjack和fluentbit自动分发

EdgeAdmin/build/build.sh

@@ -34,7 +34,7 @@ function build() {
 	done
 
 	VERSION=$(lookup-version "$ROOT"/../internal/const/const.go)
-	# 生成 zip 文件名时不包含 plus 标记
+	# 鐢熸垚 zip 鏂囦欢鍚嶆椂涓嶅寘鍚?plus 鏍囪
 	if [ "${TAG}" = "plus" ]; then
 		ZIP="${NAME}-${OS}-${ARCH}-v${VERSION}.zip"
 	else
@@ -97,7 +97,7 @@ function build() {
 		done
 	fi
 
-	# 查找 EdgeAPI zip 文件时不包含 plus 标记
+	# 鏌ユ壘 EdgeAPI zip 鏂囦欢鏃朵笉鍖呭惈 plus 鏍囪
 	if [ "${TAG}" = "plus" ]; then
 		EDGE_API_ZIP_FILE=$ROOT"/../../EdgeAPI/dist/edge-api-${OS}-${ARCH}-v${APINodeVersion}.zip"
 	else
@@ -107,7 +107,44 @@ function build() {
 	cd "$DIST"/ || exit
 	unzip -q "$(basename "$EDGE_API_ZIP_FILE")"
 	rm -f "$(basename "$EDGE_API_ZIP_FILE")"
-	# 删除 MaxMind 数据库文件（使用嵌入的数据库，不需要外部文件）
+
+	# ensure edge-api package always contains fluent-bit templates/packages
+	FLUENT_ROOT="$ROOT/../../deploy/fluent-bit"
+	FLUENT_DIST="$DIST/edge-api/deploy/fluent-bit"
+	if [ -d "$FLUENT_ROOT" ]; then
+		verify_fluent_bit_package_matrix "$FLUENT_ROOT" "$ARCH" || exit 1
+		rm -rf "$FLUENT_DIST"
+		mkdir -p "$FLUENT_DIST"
+
+		FLUENT_FILES=(
+			"fluent-bit.conf"
+			"fluent-bit-dns.conf"
+			"fluent-bit-https.conf"
+			"fluent-bit-dns-https.conf"
+			"fluent-bit-windows.conf"
+			"fluent-bit-windows-https.conf"
+			"parsers.conf"
+			"clickhouse-upstream.conf"
+			"clickhouse-upstream-windows.conf"
+			"logrotate.conf"
+			"README.md"
+		)
+		for file in "${FLUENT_FILES[@]}"; do
+			if [ -f "$FLUENT_ROOT/$file" ]; then
+				cp "$FLUENT_ROOT/$file" "$FLUENT_DIST/"
+			fi
+		done
+
+		if [ -d "$FLUENT_ROOT/packages" ]; then
+			cp -R "$FLUENT_ROOT/packages" "$FLUENT_DIST/"
+		fi
+
+		rm -f "$FLUENT_DIST/.gitignore"
+		rm -f "$FLUENT_DIST"/logs.db*
+		rm -rf "$FLUENT_DIST/storage"
+	fi
+
+	# 鍒犻櫎 MaxMind 鏁版嵁搴撴枃浠讹紙浣跨敤宓屽叆鐨勬暟鎹簱锛屼笉闇€瑕佸閮ㄦ枃浠讹級
 	find . -name "*.mmdb" -type f -delete
 	find . -type d -name "iplibrary" -empty -delete
 	cd - || exit
@@ -150,7 +187,7 @@ function build() {
 	#find "$DIST" -name "*.css.map" -delete
 	#find "$DIST" -name "*.js.map" -delete
 	
-	# 删除 MaxMind 数据库文件（使用嵌入的数据库，不需要外部文件）
+	# 鍒犻櫎 MaxMind 鏁版嵁搴撴枃浠讹紙浣跨敤宓屽叆鐨勬暟鎹簱锛屼笉闇€瑕佸閮ㄦ枃浠讹級
 	find "$DIST" -name "*.mmdb" -type f -delete
 	find "$DIST" -type d -name "iplibrary" -empty -delete
 
@@ -167,6 +204,39 @@ function build() {
 	echo "[done]"
 }
 
+function verify_fluent_bit_package_matrix() {
+	FLUENT_ROOT=$1
+	ARCH=$2
+	REQUIRED_FILES=()
+	if [ "$ARCH" = "amd64" ]; then
+		REQUIRED_FILES=(
+			"packages/linux-amd64/fluent-bit_4.2.2_amd64.deb"
+			"packages/linux-amd64/fluent-bit-4.2.2-1.x86_64.rpm"
+		)
+	elif [ "$ARCH" = "arm64" ]; then
+		REQUIRED_FILES=(
+			"packages/linux-arm64/fluent-bit_4.2.2_arm64.deb"
+			"packages/linux-arm64/fluent-bit-4.2.2-1.aarch64.rpm"
+		)
+	else
+		echo "[error] unsupported arch for fluent-bit package validation: $ARCH"
+		return 1
+	fi
+
+	MISSING=0
+	for FILE in "${REQUIRED_FILES[@]}"; do
+		if [ ! -f "$FLUENT_ROOT/$FILE" ]; then
+			echo "[error] fluent-bit matrix package missing: $FLUENT_ROOT/$FILE"
+			MISSING=1
+		fi
+	done
+
+	if [ "$MISSING" -ne 0 ]; then
+		return 1
+	fi
+	return 0
+}
+
 function lookup-version() {
 	FILE=$1
 	VERSION_DATA=$(cat "$FILE")