Skip to content

[Fleet] Backport retry/logging changes #241144

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

Closed
Supplementing wants to merge 2 commits into from
Closed

[Fleet] Backport retry/logging changes #241144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35c41c1
Allow fleet-setup retries for all environments (#240342)
MichelLosier Oct 24, 2025
71e20f7
[Fleet] Fix error formatting for logger (#240316)
Supplementing Oct 23, 2025
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
2 changes: 1 addition & 1 deletion x-pack/platform/plugins/shared/fleet/server/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ export const config: PluginConfigDescriptor = {
min: 0,
})
),
retrySetupOnBoot: schema.boolean({ defaultValue: false }),
retrySetupOnBoot: schema.boolean({ defaultValue: true }),
registry: schema.object(
{
kibanaVersionCheckEnabled: schema.boolean({ defaultValue: true }),
Expand Down
9 changes: 4 additions & 5 deletions x-pack/platform/plugins/shared/fleet/server/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,6 @@ export class FleetPlugin

this.policyWatcher.start(licenseService);

// We only retry when this feature flag is enabled (Serverless)
const setupAttempts = this.configInitialValue.internal?.retrySetupOnBoot ? 25 : 1;

const fleetSetupPromise = (async () => {
Expand Down Expand Up @@ -779,7 +778,7 @@ export class FleetPlugin
jitter: 'full',
retry: (error: any, attemptCount: number) => {
const summary = `Fleet setup attempt ${attemptCount} failed, will retry after backoff`;
logger.warn(summary, { error: { message: error } });
logger.warn(summary, { error });

this.fleetStatus$.next({
level: ServiceStatusLevels.available,
Expand All @@ -803,7 +802,7 @@ export class FleetPlugin
});
} catch (error) {
logger.warn(`Fleet setup failed after ${setupAttempts} attempts`, {
error: { message: error },
error,
});

this.fleetStatus$.next({
Expand Down Expand Up @@ -921,15 +920,15 @@ export class FleetPlugin
} catch (error) {
appContextService
.getLogger()
.error('Error happened during uninstall token generation.', { error: { message: error } });
.error('Error happened during uninstall token generation.', { error });
}

try {
await this.validateUninstallTokens();
} catch (error) {
appContextService
.getLogger()
.error('Error happened during uninstall token validation.', { error: { message: error } });
.error('Error happened during uninstall token validation.', { error });
}
}

Expand Down
4 changes: 2 additions & 2 deletions x-pack/platform/plugins/shared/fleet/server/services/epm/archive/storage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ export const getEsPackage = async (
so.error
? { type: so.type, id: so.id, error: so.error }
: !so.attributes
? { type: so.type, id: so.id, error: { error: `No attributes retrieved` } }
: { type: so.type, id: so.id, error: { error: `Unknown` } }
? { type: so.type, id: so.id, error: `No attributes retrieved` }
: { type: so.type, id: so.id, error: `Unknown` }
);

logger.warn(
Expand Down
2 changes: 1 addition & 1 deletion x-pack/platform/plugins/shared/fleet/server/services/epm/packages/install.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ async function installPackageWithStateMachine(options: {
})
.catch(async (err: Error) => {
logger.warn(`Failure to install package [${pkgName}]: [${err.toString()}]`, {
error: { stack_trace: err.stack },
error: err,
});
await handleInstallPackageFailure({
savedObjectsClient,
Expand Down