[9.0] [Fleet] show --install-servers in Add agent flyout if certain inputs are in agent policy (#214136) (#214219)

# Backport This will backport the following commits from `main` to `9.0`: - [[Fleet] show `--install-servers` in Add agent flyout if certain inputs are in agent policy (#214136)](https://github.com/elastic/kibana/pull/214136)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport)  Co-authored-by: Julia Bardi <90178898+juliaElastic@users.noreply.github.com>
2025-04-23 09:19:04 -04:00 · 2025-03-13 05:20:42 +11:00 · 2025-03-13 05:20:42 +11:00 · 81d8624c4c
commit 81d8624c4c
parent 9e48d505ea
5 changed files with 74 additions and 5 deletions
--- a/x-pack/platform/plugins/shared/fleet/common/services/package_helpers.test.ts
+++ b/x-pack/platform/plugins/shared/fleet/common/services/package_helpers.test.ts
@ -8,6 +8,7 @@
 import {
  getRootIntegrations,
  getRootPrivilegedDataStreams,
+  hasInstallServersInputs,
  isRootPrivilegesRequired,
 } from './package_helpers';

@ -119,3 +120,41 @@ describe('getRootIntegrations', () => {
    expect(res).toEqual([]);
  });
 });
+
+describe('hasInstallServersInputs', () => {
+  it('should return true if any package policy has fleet-server input', () => {
+    const res = hasInstallServersInputs([
+      {
+        inputs: [{ type: 'fleet-server' }],
+      } as any,
+    ]);
+    expect(res).toBe(true);
+  });
+
+  it('should return true if any package policy has apm input', () => {
+    const res = hasInstallServersInputs([
+      {
+        inputs: [{ type: 'apm' }],
+      } as any,
+    ]);
+    expect(res).toBe(true);
+  });
+
+  it('should return true if any package policy has cloudbeat input', () => {
+    const res = hasInstallServersInputs([
+      {
+        inputs: [{ type: 'cloudbeat/cis_aws' }],
+      } as any,
+    ]);
+    expect(res).toBe(true);
+  });
+
+  it('should return false if no package policy has install servers inputs', () => {
+    const res = hasInstallServersInputs([
+      {
+        inputs: [{ type: 'system' }],
+      } as any,
+    ]);
+    expect(res).toBe(false);
+  });
+});
--- a/x-pack/platform/plugins/shared/fleet/common/services/package_helpers.ts
+++ b/x-pack/platform/plugins/shared/fleet/common/services/package_helpers.ts
@ -42,3 +42,13 @@ export function getRootIntegrations(
    (pkg) => pkg!.name
  ).map((pkg) => ({ name: pkg!.name, title: pkg!.title }));
 }
+
+const INSTALL_SERVERS_INPUTS = ['cloudbeat', 'apm', 'fleet-server'];
+
+export function hasInstallServersInputs(packagePolicies: PackagePolicy[]): boolean {
+  return packagePolicies.some((policy) =>
+    policy.inputs.some(
+      (input) => INSTALL_SERVERS_INPUTS.includes(input.type) || input.type.startsWith('cloudbeat')
+    )
+  );
+}
--- a/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/page_steps/install_agent/install_agent_managed.tsx
+++ b/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/multi_page_layout/components/page_steps/install_agent/install_agent_managed.tsx
@ -21,7 +21,10 @@ import { ManualInstructions } from '../../../../../../../../../components/enroll

 import { KubernetesManifestApplyStep } from '../../../../../../../../../components/agent_enrollment_flyout/steps/run_k8s_apply_command_step';

-import { getRootIntegrations } from '../../../../../../../../../../common/services';
+import {
+  getRootIntegrations,
+  hasInstallServersInputs,
+} from '../../../../../../../../../../common/services';

 import type { InstallAgentPageProps } from './types';

@ -64,11 +67,14 @@ export const InstallElasticAgentManagedPageStep: React.FC<InstallAgentPageProps>
  const isK8s =
    props.packageInfo.name === 'kubernetes' ? 'IS_KUBERNETES_MULTIPAGE' : 'IS_NOT_KUBERNETES';

+  const showInstallServers = hasInstallServersInputs(agentPolicy?.package_policies ?? []);
+
  const installManagedCommands = ManualInstructions({
    apiKey: enrollmentAPIKey.api_key,
    fleetProxy,
    fleetServerHost,
    agentVersion: agentVersion || '',
+    showInstallServers,
  });

  const steps = [
--- a/x-pack/platform/plugins/shared/fleet/public/components/agent_enrollment_flyout/steps/compute_steps.tsx
+++ b/x-pack/platform/plugins/shared/fleet/public/components/agent_enrollment_flyout/steps/compute_steps.tsx
@ -11,7 +11,7 @@ import { EuiSteps, EuiLoadingSpinner } from '@elastic/eui';

 import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';

-import { getRootIntegrations } from '../../../../common/services';
+import { getRootIntegrations, hasInstallServersInputs } from '../../../../common/services';

 import { getGcpIntegrationDetailsFromAgentPolicy } from '../../cloud_security_posture/services';

@ -177,6 +177,8 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
  const { gcpProjectId, gcpOrganizationId, gcpAccountType } =
    getGcpIntegrationDetailsFromAgentPolicy(selectedPolicy);

+  const showInstallServers = hasInstallServersInputs(agentPolicy?.package_policies ?? []);
+
  const installManagedCommands = ManualInstructions({
    apiKey: enrollToken,
    fleetServerHost,
@ -187,6 +189,7 @@ export const ManagedSteps: React.FunctionComponent<InstructionProps> = ({
    gcpProjectId,
    gcpOrganizationId,
    gcpAccountType,
+    showInstallServers,
  });

  const instructionsSteps = useMemo(() => {
--- a/x-pack/platform/plugins/shared/fleet/public/components/enrollment_instructions/manual/index.tsx
+++ b/x-pack/platform/plugins/shared/fleet/public/components/enrollment_instructions/manual/index.tsx
@ -11,7 +11,8 @@ import type { DownloadSource, FleetProxy } from '../../../types';
 function getfleetServerHostsEnrollArgs(
  apiKey: string,
  fleetServerHost: string,
-  fleetProxy?: FleetProxy
+  fleetProxy?: FleetProxy,
+  showInstallServers: boolean = false
 ) {
  const proxyHeadersArgs = fleetProxy?.proxy_headers
    ? Object.entries(fleetProxy.proxy_headers).reduce((acc, [proxyKey, proyVal]) => {
@ -21,7 +22,10 @@ function getfleetServerHostsEnrollArgs(
      }, '')
    : '';
  const proxyArgs = fleetProxy ? ` --proxy-url=${fleetProxy.url}${proxyHeadersArgs}` : '';
-  return `--url=${fleetServerHost || `FLEET_SERVER_HOST`} --enrollment-token=${apiKey}${proxyArgs}`;
+  const showInstallServersArgs = showInstallServers ? ' --install-servers' : '';
+  return `--url=${
+    fleetServerHost || `FLEET_SERVER_HOST`
+  } --enrollment-token=${apiKey}${proxyArgs}${showInstallServersArgs}`;
 }

 export const getDownloadBaseUrl = (downloadSource?: DownloadSource) => {
@ -67,6 +71,7 @@ export const ManualInstructions = ({
  gcpProjectId = '<PROJECT_ID>',
  gcpOrganizationId = '<ORGANIZATION_ID>',
  gcpAccountType,
+  showInstallServers,
 }: {
  apiKey: string;
  fleetServerHost: string;
@ -77,8 +82,14 @@ export const ManualInstructions = ({
  gcpProjectId?: string;
  gcpOrganizationId?: string;
  gcpAccountType?: string;
+  showInstallServers?: boolean;
 }) => {
-  const enrollArgs = getfleetServerHostsEnrollArgs(apiKey, fleetServerHost, fleetProxy);
+  const enrollArgs = getfleetServerHostsEnrollArgs(
+    apiKey,
+    fleetServerHost,
+    fleetProxy,
+    showInstallServers
+  );
  const downloadBaseUrl = getDownloadBaseUrl(downloadSource);

  const fleetServerUrl = enrollArgs?.split('--url=')?.pop()?.split('--enrollment')[0];