Skip to content

[Cloud Security] [Bug] Fix Cloud Asset Discovery not showing cloud template instructions for AWS, GCP and Azure #227461

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
seanrathier merged 1 commit into from
Jul 11, 2025
Merged

[Cloud Security] [Bug] Fix Cloud Asset Discovery not showing cloud template instructions for AWS, GCP and Azure #227461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions x-pack/platform/plugins/shared/fleet/common/constants/epm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ export const FLEET_KUBERNETES_PACKAGE = 'kubernetes';
export const FLEET_UNIVERSAL_PROFILING_SYMBOLIZER_PACKAGE = 'profiler_symbolizer';
export const FLEET_UNIVERSAL_PROFILING_COLLECTOR_PACKAGE = 'profiler_collector';
export const FLEET_CLOUD_SECURITY_POSTURE_PACKAGE = 'cloud_security_posture';
export const FLEET_CLOUD_SECURITY_ASSET_PACKAGE = 'cloud_asset_inventory';
export const FLEET_CLOUD_SECURITY_POSTURE_KSPM_POLICY_TEMPLATE = 'kspm';
export const FLEET_CLOUD_SECURITY_POSTURE_CSPM_POLICY_TEMPLATE = 'cspm';
export const FLEET_CLOUD_SECURITY_POSTURE_ASSET_INVENTORY_POLICY_TEMPLATE = 'asset_inventory';
export const FLEET_CLOUD_SECURITY_POSTURE_CNVM_POLICY_TEMPLATE = 'vuln_mgmt';
export const FLEET_CLOUD_BEAT_PACKAGE = 'cloudbeat';
export const FLEET_CONNECTORS_PACKAGE = 'elastic_connectors';
Expand Down
2 changes: 2 additions & 0 deletions x-pack/platform/plugins/shared/fleet/common/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ export {
FLEET_ELASTIC_AGENT_PACKAGE,
FLEET_KUBERNETES_PACKAGE,
FLEET_CLOUD_SECURITY_POSTURE_PACKAGE,
FLEET_CLOUD_SECURITY_ASSET_PACKAGE,
FLEET_CLOUD_SECURITY_POSTURE_KSPM_POLICY_TEMPLATE,
FLEET_CLOUD_SECURITY_POSTURE_CSPM_POLICY_TEMPLATE,
FLEET_CLOUD_SECURITY_POSTURE_ASSET_INVENTORY_POLICY_TEMPLATE,
FLEET_CLOUD_SECURITY_POSTURE_CNVM_POLICY_TEMPLATE,
FLEET_ENDPOINT_PACKAGE,
SEARCH_AI_LAKE_PACKAGES,
Expand Down
16 changes: 13 additions & 3 deletions x-pack/platform/plugins/shared/fleet/public/components/agent_enrollment_flyout/hooks.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ import {
useGetPackageInfoByKeyQuery,
useStartServices,
} from '../../hooks';
import { FLEET_KUBERNETES_PACKAGE, FLEET_CLOUD_SECURITY_POSTURE_PACKAGE } from '../../../common';
import {
FLEET_KUBERNETES_PACKAGE,
FLEET_CLOUD_SECURITY_POSTURE_PACKAGE,
FLEET_CLOUD_SECURITY_ASSET_PACKAGE,
} from '../../../common';

import {
getTemplateUrlFromAgentPolicy,
Expand Down Expand Up @@ -103,11 +107,15 @@ export function useCloudSecurityIntegration(agentPolicy?: AgentPolicy) {
}, [agentPolicy]);

const integrationVersion = cloudSecurityPackagePolicy?.package?.version;
const packageName =
cloudSecurityPackagePolicy?.package?.name === FLEET_CLOUD_SECURITY_POSTURE_PACKAGE
? FLEET_CLOUD_SECURITY_POSTURE_PACKAGE
: FLEET_CLOUD_SECURITY_ASSET_PACKAGE;

// Fetch the package info to get the CloudFormation template URL only
// if the package policy is a Cloud Security policy
const { data: packageInfoData, isLoading } = useGetPackageInfoByKeyQuery(
FLEET_CLOUD_SECURITY_POSTURE_PACKAGE,
packageName,
integrationVersion,
{ full: true },
{ enabled: Boolean(cloudSecurityPackagePolicy) }
Expand Down Expand Up @@ -198,7 +206,9 @@ const getCloudSecurityPackagePolicyFromAgentPolicy = (
agentPolicy?: AgentPolicy
): PackagePolicy | undefined => {
return agentPolicy?.package_policies?.find(
(input) => input.package?.name === FLEET_CLOUD_SECURITY_POSTURE_PACKAGE
(input) =>
input.package?.name === FLEET_CLOUD_SECURITY_POSTURE_PACKAGE ||
input.package?.name === FLEET_CLOUD_SECURITY_ASSET_PACKAGE
);
};

Expand Down
Loading