[9.4](backport #6991) [Cloud Asset Inventory] Add extra resource fields #1#7187
Open
mergify[bot] wants to merge 2 commits into
Open
[9.4](backport #6991) [Cloud Asset Inventory] Add extra resource fields #1#7187mergify[bot] wants to merge 2 commits into
mergify[bot] wants to merge 2 commits into
Conversation
## Summary Follow-up to InfoSec's review of #6991. Adds the remaining EC2 and ELB fields InfoSec needs to retire their custom AWS CLI scripts for the FedRAMP asset inventory. All new fields land in `entity.attributes.*` (non-ECS, UpperCamelCase) — no ECS mapping change required. Tracking: https://github.com/elastic/security-team/issues/17750 ## Changes **EC2** (`entity.attributes`): - `ImageId`, `Platform`, `VpcId`, `SubnetId`, `State`, `RoleArn` - `Owner`, `CostCenter` — resolved case-insensitively from instance tags **ELB v1 + v2** (`entity.attributes`): - `LoadBalancerType` — v2 reports the real type; v1 reports `classic` - `AccountID` - `State` — v2 only (`State.Code`); classic ELB exposes no state field - `IPAddresses` — NLB static IPs; ALB/classic are DNS-only (empty) - `OwnerTag` — required adding `DescribeTags` to both ELB `Client` interfaces and providers (batched to the 20-item AWS limit) ## Notes - No `elastic/integrations` change: `entity.attributes` is `flattened`, so new keys need no mapping and there's no migration. - No new asset classifications, so `ASSETS.md` is unchanged. Route53 and EKS (also requested in the review) are separate follow-up PRs. - Mocks regenerated; unit tests cover EC2 attributes and the ELB Type/State/IPAddresses/OwnerTag flow end-to-end. --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com> (cherry picked from commit a25d3cb)
Contributor
Author
|
This pull request has not been merged yet. Could you please review and merge it @kubasobon? 🙏 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Follow-up to InfoSec's review of #6991. Adds the remaining EC2 and ELB
fields InfoSec needs to retire their custom AWS CLI scripts for the FedRAMP
asset inventory. All new fields land in
entity.attributes.*(non-ECS,UpperCamelCase) — no ECS mapping change required.
Tracking: https://github.com/elastic/security-team/issues/17750
Changes
EC2 (
entity.attributes):ImageId,Platform,VpcId,SubnetId,State,RoleArnOwner,CostCenter— resolved case-insensitively from instance tagsELB v1 + v2 (
entity.attributes):LoadBalancerType— v2 reports the real type; v1 reportsclassicAccountIDState— v2 only (State.Code); classic ELB exposes no state fieldIPAddresses— NLB static IPs; ALB/classic are DNS-only (empty)OwnerTag— required addingDescribeTagsto both ELBClientinterfaces and providers (batched to the 20-item AWS limit)
Notes
elastic/integrationschange:entity.attributesisflattened, sonew keys need no mapping and there's no migration.
ASSETS.mdis unchanged. Route53 andEKS (also requested in the review) are separate follow-up PRs.
Type/State/IPAddresses/OwnerTag flow end-to-end.
This is an automatic backport of pull request #6991 done by [Mergify](https://mergify.com).