diff --git a/packages/cloud_asset_inventory/changelog.yml b/packages/cloud_asset_inventory/changelog.yml index e59d1acc823..bcaac5965b9 100644 --- a/packages/cloud_asset_inventory/changelog.yml +++ b/packages/cloud_asset_inventory/changelog.yml @@ -7,6 +7,11 @@ # 1.1.x - 9.2.x # 1.0.x - 9.1.x # 0.1.x - 8.15.x +- version: "1.5.0-preview02" + changes: + - description: Support GCP Cloud Connectors + type: enhancement + link: https://github.com/elastic/integrations/pull/17305 - version: "1.5.0-preview01" changes: - description: GCP infra manager link diff --git a/packages/cloud_asset_inventory/data_stream/asset_inventory/agent/stream/gcp.yml.hbs b/packages/cloud_asset_inventory/data_stream/asset_inventory/agent/stream/gcp.yml.hbs index f0d3cb330fa..7114f5f2a61 100644 --- a/packages/cloud_asset_inventory/data_stream/asset_inventory/agent/stream/gcp.yml.hbs +++ b/packages/cloud_asset_inventory/data_stream/asset_inventory/agent/stream/gcp.yml.hbs @@ -15,6 +15,9 @@ config: {{else}} account_type: single-account {{/if}} + {{#if gcp.supports_cloud_connectors}} + supports_cloud_connectors: {{gcp.supports_cloud_connectors}} + {{/if}} credentials: {{#if gcp.credentials.file}} credentials_file_path: {{gcp.credentials.file}} @@ -22,3 +25,12 @@ config: {{#if gcp.credentials.json}} credentials_json: '{{gcp.credentials.json}}' {{/if}} + {{#if gcp.credentials.service_account_email}} + service_account_email: {{gcp.credentials.service_account_email}} + {{/if}} + {{#if gcp.credentials.audience}} + audience: {{gcp.credentials.audience}} + {{/if}} + {{#if gcp_credentials_cloud_connector_id}} + cloud_connector_id: {{gcp_credentials_cloud_connector_id}} + {{/if}} diff --git a/packages/cloud_asset_inventory/data_stream/asset_inventory/manifest.yml b/packages/cloud_asset_inventory/data_stream/asset_inventory/manifest.yml index 081c2ecd64d..cab2ad7b18d 100644 --- a/packages/cloud_asset_inventory/data_stream/asset_inventory/manifest.yml +++ b/packages/cloud_asset_inventory/data_stream/asset_inventory/manifest.yml @@ -328,6 +328,14 @@ streams: - name: gcp.credentials.type value: credentials-json - name: gcp.credentials.json + organization_account_cloud_connectors: + - name: gcp.account_type + value: organization-account + - name: gcp.credentials.type + value: cloud_connectors + - name: gcp.credentials.service_account_email + - name: gcp.credentials.audience + - name: gcp_credentials_cloud_connector_id single_account_cloud_shell: - name: gcp.account_type value: single-account @@ -345,6 +353,14 @@ streams: - name: gcp.credentials.type value: credentials-json - name: gcp.credentials.json + single_account_cloud_connectors: + - name: gcp.account_type + value: single-account + - name: gcp.credentials.type + value: cloud_connectors + - name: gcp.credentials.service_account_email + - name: gcp.credentials.audience + - name: gcp_credentials_cloud_connector_id vars: - name: gcp.account_type title: Account Type @@ -393,3 +409,31 @@ streams: multi: false required: false show_user: false + - name: gcp.credentials.service_account_email + type: text + title: Service Account Email + multi: false + required: false + show_user: true + secret: true + - name: gcp.credentials.audience + type: text + title: Audience + multi: false + required: false + show_user: true + secret: true + - name: gcp_credentials_cloud_connector_id + type: text + title: Elastic Cloud Connector ID + multi: false + required: false + show_user: true + description: Required when using Cloud Connectors Managed Identity + - name: gcp.supports_cloud_connectors + type: bool + title: Supports Cloud Connectors + multi: false + required: false + show_user: false + secret: false diff --git a/packages/cloud_asset_inventory/manifest.yml b/packages/cloud_asset_inventory/manifest.yml index cb94e474c27..a8a442d8e0d 100644 --- a/packages/cloud_asset_inventory/manifest.yml +++ b/packages/cloud_asset_inventory/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.3.2 name: cloud_asset_inventory title: "Cloud Asset Discovery" -version: "1.5.0-preview01" +version: "1.5.0-preview02" source: license: "Elastic-2.0" description: "Discover and Create Cloud Assets Discovery" @@ -114,6 +114,14 @@ policy_templates: show_user: false description: A URL to CloudShell for creating a new deployment default: https://shell.cloud.google.com/cloudshell/?ephemeral=true&cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Felastic%2Fcloudbeat&cloudshell_git_branch=main&cloudshell_workspace=deploy%2Finfrastructure-manager%2Fgcp-elastic-agent&show=terminal + - name: cloud_shell_url_cloud_connectors + type: text + title: Cloud Connectors CloudShell URL + multi: false + required: true + show_user: false + description: A URL to CloudShell for creating a Cloud Connectors Service Account + default: https://shell.cloud.google.com/cloudshell/?ephemeral=true&cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Felastic%2Fcloudbeat&cloudshell_git_branch=main&cloudshell_workspace=deploy%2Finfrastructure-manager%2Fgcp-cloud-connectors&show=terminal categories: - security - cloud