Revert "fix: revert away from official fluent-bit build"

This reverts commit cf2f4b2.

Author: alexhulbert

l2/mkosi.build

@@ -35,19 +35,7 @@ chmod +x $DESTDIR/usr/bin/vault
 cd "$BUILDROOT"
 IMPORT_PATH="github.com/GoogleCloudPlatform/ops-agent"
 BUILD_CMD="
-    # Install cmake 3.28 to fix build issues on Apple Silicon hosts
-    # See https://gitlab.kitware.com/cmake/cmake/-/issues/25562
-    curl -L -o cmake.sh https://cmake.org/files/v3.28/cmake-3.28.6-linux-x86_64.sh
-    chmod +x cmake.sh
-    ./cmake.sh --prefix=/usr --skip-license
-
-    # Fluentbit
-    export SOURCE_DATE_EPOCH=0 PATH=/usr/local/go/bin:\$PATH
-    export CFLAGS='-fno-ident -Wno-date-time' CXXFLAGS='-fno-ident -Wno-date-time'
-    git submodule update --init --depth 1 submodules/fluent-bit
-    ./builds/fluent_bit.sh \$(pwd)/out
-
-    # Main gcp ops agent binaries
+    # Main gcs agent binaries
     mkdir -p out/libexec
     LDFLAGS='-s -w -buildid='
     go build -buildvcs=false -trimpath -ldflags \"\$LDFLAGS \\
@@ -66,7 +54,8 @@ make_git_package \
     "https://github.com/GoogleCloudPlatform/ops-agent" \
     "$BUILD_CMD" \
     "out/libexec:/opt/google-cloud-ops-agent/libexec" \
-    "out/opt/google-cloud-ops-agent/subagents/fluent-bit:/opt/google-cloud-ops-agent/subagents/fluent-bit" \
     "systemd/google-cloud-ops-agent-fluent-bit.service:/usr/lib/systemd/system/google-cloud-ops-agent-fluent-bit.service" \
     "systemd/google-cloud-ops-agent.service:/usr/lib/systemd/system/google-cloud-ops-agent.service"
+mkdir -p "$DESTDIR/opt/google-cloud-ops-agent/subagents"
+ln -s /opt/fluent-bit/bin/fluent-bit "$DESTDIR/opt/google-cloud-ops-agent/subagents/fluent-bit"
 sed -i 's|@PREFIX@|/opt/google-cloud-ops-agent|g; s|@SYSCONFDIR@|/etc|g' "$DESTDIR/usr/lib/systemd/system/google-cloud-ops-agent"*.service

l2/mkosi.conf

@@ -16,8 +16,10 @@ WithNetwork=true
 BuildScripts=l2/mkosi.build
 ExtraTrees=l2/mkosi.extra
 PostInstallationScripts=l2/mkosi.postinst
+SyncScripts=l2/mkosi.sync
 
 Packages=prometheus-node-exporter
+         fluent-bit
          prometheus-process-exporter
          usrmerge
          xfsprogs

l2/mkosi.sync

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [ ! -f "$SRCDIR/mkosi.packages/fluent-bit.deb" ]; then
+    curl -sSfL https://packages.fluentbit.io/debian/bookworm/fluent-bit_3.1.6_amd64.deb -o "$SRCDIR/mkosi.packages/fluent-bit.deb"
+fi