[Cloud Security] Add support for GCP org #7403

orouz · 2023-08-16T11:39:55Z

What does this PR do?

Adds 2 new input vars: organization_id and account_type

closes #7398

Checklist

I have reviewed tips for building integrations and this pull request is aligned with them.
I have verified that all data streams collect metrics or logs.
I have added an entry to my package's changelog.yml file.
I have verified that Kibana version constraints are current according to guidelines.

Author's Checklist

[ ]

How to test this PR locally

Related issues

orouz · 2023-08-16T11:41:10Z

packages/cloud_security_posture/data_stream/findings/manifest.yml

+      - name: organization_id
+        type: text
+        title: Organization Id
+        multi: false
+        required: false
+        show_user: true
      - name: project_id


the UI should indicate we support project_id or organization_id, not both.

The project_id might be needed as well to decide in which project the deployment should reside.

elasticmachine · 2023-08-16T11:55:52Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Start Time: 2023-09-07T10:45:07.875+0000
Duration: 15 min 44 sec

Test stats 🧪

Test	Results
Failed	0
Passed	4
Skipped	0
Total	4

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

/test : Re-trigger the build.

elasticmachine · 2023-08-16T11:56:03Z

🌐 Coverage report

Name	Metrics % (`covered/total`)	Diff
Packages	100.0% (`0/0`)	💚
Files	100.0% (`0/0`)	💚
Classes	100.0% (`0/0`)	💚
Methods	25.0% (`2/8`)	👎 -75.0
Lines	100.0% (`0/0`)	💚 7.769
Conditionals	100.0% (`0/0`)	💚

oren-zohar

@orouz do we need to update the changelog and manifest version? this is for 8.11, right?

oren-zohar

@orouz do we need to update the changelog and manifest version? this is for 8.11, right?

packages/cloud_security_posture/data_stream/findings/agent/stream/gcp.yml.hbs

orouz · 2023-08-30T13:01:17Z

packages/cloud_security_posture/data_stream/findings/agent/stream/gcp.yml.hbs

+      {{#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}}


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

@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

packages/cloud_security_posture/changelog.yml

orestisfl · 2023-08-31T09:01:03Z

packages/cloud_security_posture/data_stream/findings/manifest.yml

+        type: text
+        title: Account Type
+        multi: false
+        required: false


isn't this required?

i thought our custom ui required us to not use it but this isn't the case for this var.

packages/cloud_security_posture/data_stream/findings/manifest.yml

Co-authored-by: Uri Weisman <68195305+uri-weisman@users.noreply.github.com>

elasticmachine · 2023-09-10T08:04:53Z

Package cloud_security_posture - 1.6.0-preview1 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-09-10T10:06:14Z

Package cloud_security_posture - 1.6.0-preview11 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-09-14T11:46:29Z

Package cloud_security_posture - 1.6.0-preview12 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-09-21T09:36:28Z

Package cloud_security_posture - 1.6.0-preview13 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-10-02T17:36:35Z

Package cloud_security_posture - 1.6.0-preview14 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-10-03T12:33:01Z

Package cloud_security_posture - 1.6.0-preview15 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-10-04T08:38:53Z

Package cloud_security_posture - 1.6.0-preview16 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

elasticmachine · 2023-10-04T09:03:56Z

Package cloud_security_posture - 1.6.0 containing this change is available at https://epr.elastic.co/search?package=cloud_security_posture

orouz added enhancement New feature or request Team:Cloud Security Label for the Cloud Security team labels Aug 16, 2023

orouz commented Aug 16, 2023

View reviewed changes

orouz linked an issue Aug 21, 2023 that may be closed by this pull request

[Cloud Security] [CIS GCP] Add organization id input var to GCP's manifest #7398

Closed

orouz marked this pull request as ready for review August 21, 2023 07:39

orouz requested a review from a team as a code owner August 21, 2023 07:39

maxcold approved these changes Aug 21, 2023

View reviewed changes

oren-zohar reviewed Aug 21, 2023

View reviewed changes

oren-zohar requested changes Aug 21, 2023

View reviewed changes

oren-zohar requested changes Aug 29, 2023

View reviewed changes

packages/cloud_security_posture/data_stream/findings/agent/stream/gcp.yml.hbs Outdated Show resolved Hide resolved

packages/cloud_security_posture/data_stream/findings/agent/stream/gcp.yml.hbs Outdated Show resolved Hide resolved

orouz marked this pull request as draft August 29, 2023 13:19

orouz changed the title ~~[Cloud Security] Add org id input var~~ [Cloud Security] Add support for GCP org Aug 29, 2023

orouz force-pushed the cis_gcp_org branch from e03215c to 069acba Compare August 29, 2023 14:45

orouz added 3 commits August 30, 2023 15:59

update files

4baecb9

resolve conflicts

59a1b15

update version

fca0c38

orouz force-pushed the cis_gcp_org branch from e065b7f to fca0c38 Compare August 30, 2023 13:00

orouz commented Aug 30, 2023

View reviewed changes

orouz marked this pull request as ready for review August 30, 2023 13:01

orouz commented Aug 30, 2023

View reviewed changes

packages/cloud_security_posture/changelog.yml Outdated Show resolved Hide resolved

orouz requested a review from oren-zohar August 31, 2023 07:17

orestisfl reviewed Aug 31, 2023

View reviewed changes

preview version fixes

8c5d172

orouz force-pushed the cis_gcp_org branch from fc7e56e to 8c5d172 Compare August 31, 2023 12:12

orouz mentioned this pull request Sep 3, 2023

[Cloud Security] [CIS GCP] Onboarding (GCP organization step) elastic/kibana#165175

Closed

6 tasks

orouz requested review from maxcold, uri-weisman and orestisfl September 3, 2023 10:59

uri-weisman requested changes Sep 7, 2023

View reviewed changes

packages/cloud_security_posture/data_stream/findings/manifest.yml Outdated Show resolved Hide resolved

Update packages/cloud_security_posture/data_stream/findings/manifest.yml

9f710c1

Co-authored-by: Uri Weisman <68195305+uri-weisman@users.noreply.github.com>

uri-weisman approved these changes Sep 7, 2023

View reviewed changes

oren-zohar approved these changes Sep 7, 2023

View reviewed changes

Update manifest.yml

5a2ab3e

orouz merged commit d18ce21 into elastic:main Sep 10, 2023
4 checks passed

uri-weisman linked an issue Sep 14, 2023 that may be closed by this pull request

[Cloud Security] Map the findings fields that were added as part of CIS GCP #6245

Closed

oren-zohar mentioned this pull request Oct 17, 2023

[Cloud Security] CSPM GCP migration to multi-account config is broken elastic/kibana#169098

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Cloud Security] Add support for GCP org #7403

[Cloud Security] Add support for GCP org #7403

orouz commented Aug 16, 2023 •

edited

orouz Aug 16, 2023

uri-weisman Aug 23, 2023

elasticmachine commented Aug 16, 2023 •

edited

Build stats

Test stats 🧪

elasticmachine commented Aug 16, 2023 •

edited

oren-zohar left a comment

oren-zohar left a comment •

edited

orouz Aug 30, 2023

kfirpeled Sep 10, 2023

orestisfl Aug 31, 2023

orouz Aug 31, 2023

elasticmachine commented Sep 10, 2023

elasticmachine commented Sep 10, 2023

elasticmachine commented Sep 14, 2023

elasticmachine commented Sep 21, 2023

elasticmachine commented Oct 2, 2023

elasticmachine commented Oct 3, 2023

elasticmachine commented Oct 4, 2023

elasticmachine commented Oct 4, 2023

[Cloud Security] Add support for GCP org #7403

[Cloud Security] Add support for GCP org #7403

Conversation

orouz commented Aug 16, 2023 • edited

What does this PR do?

Checklist

Author's Checklist

How to test this PR locally

Related issues

orouz Aug 16, 2023

Choose a reason for hiding this comment

uri-weisman Aug 23, 2023

Choose a reason for hiding this comment

elasticmachine commented Aug 16, 2023 • edited

💚 Build Succeeded

Build stats

Test stats 🧪

🤖 GitHub comments

elasticmachine commented Aug 16, 2023 • edited

🌐 Coverage report

oren-zohar left a comment

Choose a reason for hiding this comment

oren-zohar left a comment • edited

Choose a reason for hiding this comment

orouz Aug 30, 2023

Choose a reason for hiding this comment

kfirpeled Sep 10, 2023

Choose a reason for hiding this comment

orestisfl Aug 31, 2023

Choose a reason for hiding this comment

orouz Aug 31, 2023

Choose a reason for hiding this comment

elasticmachine commented Sep 10, 2023

elasticmachine commented Sep 10, 2023

elasticmachine commented Sep 14, 2023

elasticmachine commented Sep 21, 2023

elasticmachine commented Oct 2, 2023

elasticmachine commented Oct 3, 2023

elasticmachine commented Oct 4, 2023

elasticmachine commented Oct 4, 2023

orouz commented Aug 16, 2023 •

edited

elasticmachine commented Aug 16, 2023 •

edited

elasticmachine commented Aug 16, 2023 •

edited

oren-zohar left a comment •

edited