Skip to content

[Cloud Security] Add support for GCP org #7403

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
orouz merged 6 commits into from
Sep 10, 2023
Merged

[Cloud Security] Add support for GCP org #7403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4baecb9
update files
orouz Aug 29, 2023
59a1b15
resolve conflicts
orouz Aug 29, 2023
fca0c38
update version
orouz Aug 30, 2023
8c5d172
preview version fixes
orouz Aug 31, 2023
9f710c1
Update packages/cloud_security_posture/data_stream/findings/manifest.yml
orouz Sep 7, 2023
5a2ab3e
Update manifest.yml
orouz Sep 7, 2023
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
5 changes: 5 additions & 0 deletions packages/cloud_security_posture/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@
# 1.4.x - 8.9.x
# 1.3.x - 8.8.x
# 1.2.x - 8.7.x
- version: "1.6.0-preview1"
changes:
- description: Add support for GCP organizations
type: enhancement
link: https://github.com/elastic/integrations/pull/7403
- version: "1.5.2"
changes:
- description: Refactor GCP credentials
Expand Down
6 changes: 6 additions & 0 deletions packages/cloud_security_posture/data_stream/findings/agent/stream/gcp.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ config:
deployment: gcp
benchmark: cis_gcp
gcp:
{{#if gcp.project_id}}
project_id: {{gcp.project_id}}
{{/if}}
{{#if gcp.organization_id}}
organization_id: {{gcp.organization_id}}
{{/if}}
account_type: {{gcp.account_type}}
Comment on lines +7 to +13
Copy link
Contributor Author

@orouz orouz Aug 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

project_id and organization_id depend on the value of account_type, so they may be missing. account_type is required.

Copy link
Contributor

@kfirpeled kfirpeled Sep 10, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@animehart we would need to have a migration here on fleet to add account_type when missing

Reference to fleet migrations that work on variable
https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/saved_objects/migrations/security_solution

credentials:
{{#if gcp.credentials.file}}
credentials_file_path: {{gcp.credentials.file}}
Expand Down
12 changes: 12 additions & 0 deletions packages/cloud_security_posture/data_stream/findings/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,18 @@ streams:
template_path: gcp.yml.hbs
enabled: false
vars:
- name: gcp.account_type
type: text
title: Account Type
multi: false
required: true
show_user: false
- name: gcp.organization_id
type: text
title: Organization Id
multi: false
required: false
show_user: false
- name: gcp.project_id
type: text
title: Project Id
Expand Down
4 changes: 2 additions & 2 deletions packages/cloud_security_posture/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 2.3.0
name: cloud_security_posture
title: "Security Posture Management"
version: "1.5.2"
version: "1.6.0-preview1"
source:
license: "Elastic-2.0"
description: "Identify & remediate configuration risks in your Cloud infrastructure"
Expand All @@ -11,7 +11,7 @@ categories:
- kubernetes
- security
conditions:
kibana.version: "^8.10.0"
kibana.version: "^8.11.0"
elastic.subscription: basic
screenshots:
- src: /img/dashboard.png
Expand Down