Skip to content
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.

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

[8.15](backport #2591) [Asset Inventory][AWS & Azure] Support organization account deployment type #2641

Merged
merged 4 commits into from
Oct 24, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 24, 2024

Backport reasoning

Cloudbeat utilizes latest released branch (8.15) as a source for some of the CI deployment files.

Summary of your changes

AWS: Clones CloudFormation templates for Asset Inventory and enables it to work in Organization mode.
Azure: Clones ARM templates.

Screenshot/Data

image
Kibana showing data from multiple accounts in the organization; Please note the absence of "Sandbox" account from "test-organization" OU

Related Issues

Fixes https://github.com/elastic/security-team/issues/10606

Checklist

…t type (#2591)

(cherry picked from commit a1294f0)

# Conflicts:
#	internal/flavors/assetinventory/strategy.go
#	scripts/bump_integration.sh
@mergify mergify bot requested a review from a team as a code owner October 24, 2024 13:54
Copy link
Author

mergify bot commented Oct 24, 2024

Cherry-pick of a1294f0 has failed:

On branch mergify/bp/8.15/pr-2591
Your branch is up to date with 'origin/8.15'.

You are currently cherry-picking commit a1294f0d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/ci-pull_request.yml
	modified:   .github/workflows/publish-cloudformation.yml
	new file:   deploy/asset-inventory-arm/.gitignore
	new file:   deploy/asset-inventory-arm/ARM-for-organization-account.dev.json
	new file:   deploy/asset-inventory-arm/ARM-for-organization-account.json
	new file:   deploy/asset-inventory-arm/ARM-for-single-account.dev.json
	new file:   deploy/asset-inventory-arm/ARM-for-single-account.json
	new file:   deploy/asset-inventory-arm/README.md
	new file:   deploy/asset-inventory-arm/generate_dev_template.py
	new file:   deploy/asset-inventory-arm/install-agent-dev.sh
	new file:   deploy/asset-inventory-arm/install-agent.sh
	new file:   deploy/asset-inventory-arm/install_agent_az_cli.sh
	new file:   deploy/asset-inventory-cloudformation/.gitignore
	new file:   deploy/asset-inventory-cloudformation/README.md
	new file:   deploy/asset-inventory-cloudformation/config.go
	new file:   deploy/asset-inventory-cloudformation/ec2-types.yml
	new file:   deploy/asset-inventory-cloudformation/elastic-agent-ec2-organization.yml
	new file:   deploy/asset-inventory-cloudformation/elastic-agent-ec2.yml
	new file:   deploy/asset-inventory-cloudformation/gomain.go
	new file:   internal/flavors/assetinventory/strategy_aws.go
	modified:   justfile
	modified:   scripts/publish_cft.sh

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   internal/flavors/assetinventory/strategy.go
	both modified:   scripts/bump_integration.sh

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@kubasobon kubasobon enabled auto-merge (squash) October 24, 2024 13:55
@kubasobon
Copy link
Member

Required to make deployment work, since CI uses last releases's branch.

@kubasobon kubasobon self-requested a review October 24, 2024 13:57
Copy link

github-actions bot commented Oct 24, 2024

📊 Allure Report - 💚 No failures were reported.

Result Count
🟥 Failed 0
🟩 Passed 325
⬜ Skipped 33

@kubasobon kubasobon merged commit 238d407 into 8.15 Oct 24, 2024
22 checks passed
@kubasobon kubasobon deleted the mergify/bp/8.15/pr-2591 branch October 24, 2024 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant