Skip to content

fix(endpoint): restore Vector forwarders during package update #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shukieshah merged 2 commits into from
Jun 26, 2026
Merged

fix(endpoint): restore Vector forwarders during package update #264

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74c24bb
fix(endpoint): fail loudly when forwarders cannot be restored
shukieshah Jun 26, 2026
2fb71be
fix(endpoint): recover loaded forwarders during postinstall
shukieshah Jun 26, 2026
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
47 changes: 39 additions & 8 deletions packaging/macos/scripts/postinstall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,60 @@ BEACON_SPLUNK_CA_FILE="${BEACON_SPLUNK_CA_FILE:-}" \
BEACON_NO_START=1 \
/opt/beacon/scripts/install-endpoint.sh

restart_optional_forwarder() {
forwarder_running() {
label="$1"

launchctl print "system/$label" 2>/dev/null | grep -Eq 'state = running|pid ='
}

restore_existing_forwarder() {
label="$1"
plist_path="$2"
target="system/$label"

# No plist means the customer has not installed this optional forwarder.
if [ ! -f "$plist_path" ]; then
return 0
fi

launchctl bootout "system/$label" >/dev/null 2>&1 || true
launchctl bootstrap system "$plist_path" >/dev/null 2>&1 || {
if ! launchctl print "system/$label" >/dev/null 2>&1; then
echo "Warning: could not restart optional forwarder $label" >&2
if forwarder_running "$label"; then
out="$(launchctl kickstart -k "$target" 2>&1)" || {
echo "Warning: launchctl kickstart failed for $label: $out" >&2
}
if forwarder_running "$label"; then
return 0
fi
}
fi

for delay in 1 2 4 8 16; do
out="$(launchctl bootstrap system "$plist_path" 2>&1)" || {
echo "Warning: launchctl bootstrap failed for $label: $out" >&2
}
if forwarder_running "$label"; then
return 0
fi

out="$(launchctl kickstart -k "$target" 2>&1)" || {
echo "Warning: launchctl kickstart retry failed for $label: $out" >&2
}
if forwarder_running "$label"; then
return 0
fi
sleep "$delay"
done
Comment thread
cursor[bot] marked this conversation as resolved.

out="$(launchctl print "$target" 2>&1)" || true
echo "Error: could not restore existing forwarder $label after package install. launchctl print: $out" >&2
return 1
}

if command -v launchctl >/dev/null 2>&1; then
launchctl bootout system/com.beacon.endpoint.collector >/dev/null 2>&1 || true
launchctl bootstrap system /Library/LaunchDaemons/com.beacon.endpoint.collector.plist >/dev/null 2>&1 || {
launchctl print system/com.beacon.endpoint.collector >/dev/null 2>&1 || exit 1
}
restart_optional_forwarder "com.beacon.endpoint.falcon-forwarder" "/Library/LaunchDaemons/com.beacon.endpoint.falcon-forwarder.plist"
restart_optional_forwarder "com.beacon.endpoint.s3-forwarder" "/Library/LaunchDaemons/com.beacon.endpoint.s3-forwarder.plist"
restore_existing_forwarder "com.beacon.endpoint.falcon-forwarder" "/Library/LaunchDaemons/com.beacon.endpoint.falcon-forwarder.plist"
restore_existing_forwarder "com.beacon.endpoint.s3-forwarder" "/Library/LaunchDaemons/com.beacon.endpoint.s3-forwarder.plist"
"${BEACON_BIN:-/opt/beacon/bin/beacon}" endpoint update install-daemon || {
echo "Error: could not reconcile Beacon endpoint updater daemon" >&2
exit 1
Expand Down
16 changes: 16 additions & 0 deletions packaging/macos/test-endpoint-scripts.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,22 @@ if ! grep -q 'INVENTORY_STATE' "$ROOT_DIR/packaging/macos/jamf/claude/common/rep
echo "repair-hooks should prepare inventory heartbeat state files" >&2
exit 1
fi
if ! grep -q 'restore_existing_forwarder' "$ROOT_DIR/packaging/macos/scripts/postinstall"; then
echo "postinstall should restore existing optional forwarders" >&2
exit 1
fi
if ! grep -q 'launchctl kickstart -k' "$ROOT_DIR/packaging/macos/scripts/postinstall"; then
echo "postinstall should kickstart already-loaded forwarders" >&2
exit 1
fi
if ! grep -q 'could not restore existing forwarder' "$ROOT_DIR/packaging/macos/scripts/postinstall"; then
echo "postinstall should fail loudly when an existing forwarder cannot be restored" >&2
exit 1
fi
if ! grep -q 'launchctl bootstrap failed' "$ROOT_DIR/packaging/macos/scripts/postinstall"; then
echo "postinstall should preserve launchctl bootstrap diagnostics" >&2
exit 1
fi

PKG_TEST_BIN="$TMP_DIR/pkg-bin"
PKG_TEST_ROOT="$TMP_DIR/pkg-root"
Expand Down
Loading