Commit 5bd12759 authored by Xiaowu Zhang's avatar Xiaowu Zhang

x

parent a3e43caf
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
Name cpu Name cpu
[output] [output]
Name http Name gstdout
Match * Match *
Host softinst143538.host.vifib.net Host softinst143538.host.vifib.net
URI /erp5/fluentbit_upload_test URI /erp5/fluentbit_upload_test
...@@ -14,5 +14,6 @@ install() { ...@@ -14,5 +14,6 @@ install() {
inst "$moddir"/metadata-collect-agent "/sbin/metadata-collect-agent" inst "$moddir"/metadata-collect-agent "/sbin/metadata-collect-agent"
inst "$moddir"/fluent-bit "/sbin/fluent-bit" inst "$moddir"/fluent-bit "/sbin/fluent-bit"
inst "$moddir"/flb.conf "/etc/flb.conf" inst "$moddir"/flb.conf "/etc/flb.conf"
inst "$moddir"/out_gstdout.so "/etc/out_gstdout.so"
inst_hook pre-pivot 10 "$moddir"/collect.sh inst_hook pre-pivot 10 "$moddir"/collect.sh
} }
...@@ -18,7 +18,7 @@ include collect-sh-template.mk ...@@ -18,7 +18,7 @@ include collect-sh-template.mk
echo "$${collect_sh}" >> 90metadata-collect/collect.sh echo "$${collect_sh}" >> 90metadata-collect/collect.sh
90metadata-collect/metadata-collect-agent: 90metadata-collect/metadata-collect-agent:
cd ../ && ./rust-build-static.bash && ./fluent-bit-install.sh cd ../ && ./rust-build-static.bash && ./fluent-bit-install.sh && ./src/go_plugin/install.sh
.PHONY: clean .PHONY: clean
clean: clean:
......
...@@ -13,7 +13,7 @@ ERP5_PASS="$(ERP5_PASS)" ...@@ -13,7 +13,7 @@ ERP5_PASS="$(ERP5_PASS)"
REFERENCE="COMP-MAC-$$(echo "$$DEFAULT_IF_MAC" | sed s/:/-/g).Metadata.Snapshot" REFERENCE="COMP-MAC-$$(echo "$$DEFAULT_IF_MAC" | sed s/:/-/g).Metadata.Snapshot"
/sbin/metadata-collect-agent "$$NEWROOT" "$$ERP5_USER" "$$ERP5_PASS" "$$REFERENCE" "$$ERP5_BASE_URL" /sbin/metadata-collect-agent "$$NEWROOT" "$$ERP5_USER" "$$ERP5_PASS" "$$REFERENCE" "$$ERP5_BASE_URL"
/sbin/fluent-bit -c /etc/flb.conf /sbin/fluent-bit -e /etc/out_gstdout.so -c /etc/flb.conf
endef endef
export collect_sh export collect_sh
rm -rf *.so *.h *~ fluent-bit-go rm -rf *.so *.h *~ fluent-bit-go
git clone https://github.com/fluent/fluent-bit-go.git git clone https://github.com/fluent/fluent-bit-go.git
go build -buildmode=c-shared -o out_gstdout.so go build -buildmode=c-shared -o out_gstdout.so
cp out_gstdout.so dracut.module/90metadata-collect
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment