From 23776ce6e2cc144e0faa36b2a730ef98e43ad63d Mon Sep 17 00:00:00 2001 From: Kavindu Dodanduwa Date: Wed, 23 Oct 2024 07:02:31 -0700 Subject: [PATCH] [AWS] Add support to configure owning account for AWS metrics integrations (#11442) * introduce owning account for AWS metrics integrations Signed-off-by: Kavindu Dodanduwa # Conflicts: # packages/aws/changelog.yml * update build docs Signed-off-by: Kavindu Dodanduwa * update compatible beats version Signed-off-by: Kavindu Dodanduwa * add missing property to agent Signed-off-by: Kavindu Dodanduwa * accept owning account as a string at agent Signed-off-by: Kavindu Dodanduwa * fix merge conflict and update changelog and version Signed-off-by: Kavindu Dodanduwa * make ownining account conditional Signed-off-by: Kavindu Dodanduwa * add ownining account support to aws bedrock Signed-off-by: Kavindu Dodanduwa # Conflicts: # packages/aws_bedrock/changelog.yml * Update packages/aws/_dev/build/docs/README.md Co-authored-by: kaiyan-sheng * Update packages/aws/_dev/build/docs/README.md Co-authored-by: kaiyan-sheng * set 0.12.0 version for aws bedrock Signed-off-by: Kavindu Dodanduwa * add newline Signed-off-by: Kavindu Dodanduwa * update build docs Signed-off-by: Kavindu Dodanduwa * review suggestion - links to aws resources Signed-off-by: Kavindu Dodanduwa --------- Signed-off-by: Kavindu Dodanduwa Co-authored-by: kaiyan-sheng --- packages/aws/_dev/build/docs/README.md | 8 +++++--- packages/aws/changelog.yml | 5 +++++ .../apigateway_metrics/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/apigateway_metrics/manifest.yml | 7 +++++++ .../aws/data_stream/awshealth/agent/stream/stream.yml.hbs | 6 ++++++ packages/aws/data_stream/awshealth/manifest.yml | 7 +++++++ .../aws/data_stream/billing/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/billing/manifest.yml | 7 +++++++ .../cloudwatch_metrics/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/cloudwatch_metrics/manifest.yml | 7 +++++++ .../aws/data_stream/dynamodb/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/dynamodb/manifest.yml | 7 +++++++ packages/aws/data_stream/ebs/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/ebs/manifest.yml | 7 +++++++ .../data_stream/ec2_metrics/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/ec2_metrics/manifest.yml | 7 +++++++ .../data_stream/ecs_metrics/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/ecs_metrics/manifest.yml | 7 +++++++ .../data_stream/elb_metrics/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/elb_metrics/manifest.yml | 7 +++++++ .../data_stream/emr_metrics/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/emr_metrics/manifest.yml | 7 +++++++ .../firewall_metrics/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/firewall_metrics/manifest.yml | 7 +++++++ .../data_stream/kafka_metrics/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/kafka_metrics/manifest.yml | 7 +++++++ .../aws/data_stream/kinesis/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/kinesis/manifest.yml | 7 +++++++ .../aws/data_stream/lambda/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/lambda/manifest.yml | 7 +++++++ .../data_stream/natgateway/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/natgateway/manifest.yml | 7 +++++++ packages/aws/data_stream/rds/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/rds/manifest.yml | 7 +++++++ .../aws/data_stream/redshift/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/redshift/manifest.yml | 7 +++++++ .../s3_daily_storage/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/s3_daily_storage/manifest.yml | 7 +++++++ .../data_stream/s3_request/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/s3_request/manifest.yml | 7 +++++++ .../s3_storage_lens/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/s3_storage_lens/manifest.yml | 7 +++++++ packages/aws/data_stream/sns/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/sns/manifest.yml | 7 +++++++ packages/aws/data_stream/sqs/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/sqs/manifest.yml | 7 +++++++ .../transitgateway/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/transitgateway/manifest.yml | 7 +++++++ .../aws/data_stream/usage/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/usage/manifest.yml | 7 +++++++ packages/aws/data_stream/vpn/agent/stream/stream.yml.hbs | 3 +++ packages/aws/data_stream/vpn/manifest.yml | 7 +++++++ packages/aws/docs/README.md | 8 +++++--- packages/aws/manifest.yml | 4 ++-- packages/aws_bedrock/changelog.yml | 5 +++++ .../data_stream/runtime/agent/stream/stream.yml.hbs | 3 +++ packages/aws_bedrock/data_stream/runtime/manifest.yml | 7 +++++++ packages/aws_bedrock/manifest.yml | 4 ++-- 58 files changed, 287 insertions(+), 10 deletions(-) diff --git a/packages/aws/_dev/build/docs/README.md b/packages/aws/_dev/build/docs/README.md index 786cb790104..3c4160d4ea8 100644 --- a/packages/aws/_dev/build/docs/README.md +++ b/packages/aws/_dev/build/docs/README.md @@ -58,9 +58,11 @@ The extra-charges generated by GetMetricData API calls are proportional to the f The `include_linked_accounts` parameter is used to enable the inclusion of metrics from different accounts linked to a main monitoring account. By setting this parameter to true, users can gather metrics from multiple AWS accounts that are linked through the [CloudWatch cross-account observability](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html). -By default, the `include_linked_accounts` parameter is set to false, meaning that only metrics from the main monitoring -account are collected. When set to true, the parameter allows the CloudWatch ListMetrics API to include metrics from -the monitoring account and all linked source accounts in the returned data, providing a comprehensive cross-account view. +Internally, the agent uses [ListMetrics](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_ListMetrics.html) API to include metrics from the monitoring account and all linked source accounts in the returned data, providing a comprehensive cross-account view. + +You can further utilize `owning_account` parameter to refine the cross account observability. This parameter accepts a valid AWS account ID which should be linked to the monitoring account. +If configured, metrics will be extracted from this specified linked/owning account. +This parameter [utilize OwningAccount](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_ListMetrics.html#API_ListMetrics_RequestParameters) parameter of the ListMetrics API request. *_Note_:* Users should ensure that the necessary IAM roles and policies are properly set up in order to link the monitoring account and source accounts together. diff --git a/packages/aws/changelog.yml b/packages/aws/changelog.yml index 2d80235be41..0965c8eec50 100644 --- a/packages/aws/changelog.yml +++ b/packages/aws/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "2.30.0" + changes: + - description: Support configuring the Owning Account + type: enhancement + link: https://github.com/elastic/integrations/pull/11442 - version: "2.29.0" changes: - description: Add mapping for the service.runtimeDetails fields in GuardDuty events. diff --git a/packages/aws/data_stream/apigateway_metrics/agent/stream/stream.yml.hbs b/packages/aws/data_stream/apigateway_metrics/agent/stream/stream.yml.hbs index 0b1a916ac72..0cfb15fcd6f 100644 --- a/packages/aws/data_stream/apigateway_metrics/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/apigateway_metrics/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/apigateway_metrics/manifest.yml b/packages/aws/data_stream/apigateway_metrics/manifest.yml index a3ded65eaa3..7b8c1789cea 100644 --- a/packages/aws/data_stream/apigateway_metrics/manifest.yml +++ b/packages/aws/data_stream/apigateway_metrics/manifest.yml @@ -39,6 +39,13 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. - name: tags_filter type: yaml title: Tags Filter diff --git a/packages/aws/data_stream/awshealth/agent/stream/stream.yml.hbs b/packages/aws/data_stream/awshealth/agent/stream/stream.yml.hbs index 6a69043cc36..1203f93a02a 100644 --- a/packages/aws/data_stream/awshealth/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/awshealth/agent/stream/stream.yml.hbs @@ -37,3 +37,9 @@ proxy_url: {{proxy_url}} processors: {{processors}} {{/if}} +{{#if include_linked_accounts}} +include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} +{{/if}} diff --git a/packages/aws/data_stream/awshealth/manifest.yml b/packages/aws/data_stream/awshealth/manifest.yml index 78990643f50..003f24a0937 100644 --- a/packages/aws/data_stream/awshealth/manifest.yml +++ b/packages/aws/data_stream/awshealth/manifest.yml @@ -39,6 +39,13 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. - name: processors type: yaml title: Processors diff --git a/packages/aws/data_stream/billing/agent/stream/stream.yml.hbs b/packages/aws/data_stream/billing/agent/stream/stream.yml.hbs index fbbfd6733a7..71d9d06b01d 100644 --- a/packages/aws/data_stream/billing/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/billing/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/billing/manifest.yml b/packages/aws/data_stream/billing/manifest.yml index 97d2c4a444a..304f0c86b43 100644 --- a/packages/aws/data_stream/billing/manifest.yml +++ b/packages/aws/data_stream/billing/manifest.yml @@ -49,6 +49,13 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. - name: leaderelection type: bool title: Leader Election diff --git a/packages/aws/data_stream/cloudwatch_metrics/agent/stream/stream.yml.hbs b/packages/aws/data_stream/cloudwatch_metrics/agent/stream/stream.yml.hbs index fbf98ab3a0a..f5fea85894d 100644 --- a/packages/aws/data_stream/cloudwatch_metrics/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/cloudwatch_metrics/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/cloudwatch_metrics/manifest.yml b/packages/aws/data_stream/cloudwatch_metrics/manifest.yml index 86617dd8455..db16c435992 100644 --- a/packages/aws/data_stream/cloudwatch_metrics/manifest.yml +++ b/packages/aws/data_stream/cloudwatch_metrics/manifest.yml @@ -27,6 +27,13 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. - name: regions type: text title: Regions diff --git a/packages/aws/data_stream/dynamodb/agent/stream/stream.yml.hbs b/packages/aws/data_stream/dynamodb/agent/stream/stream.yml.hbs index 0f40351ea3b..93bad4c28fe 100644 --- a/packages/aws/data_stream/dynamodb/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/dynamodb/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/dynamodb/manifest.yml b/packages/aws/data_stream/dynamodb/manifest.yml index 1b5a622d8f5..b54630d1c0b 100644 --- a/packages/aws/data_stream/dynamodb/manifest.yml +++ b/packages/aws/data_stream/dynamodb/manifest.yml @@ -48,5 +48,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS DynamoDB metrics description: Collect AWS DynamoDB metrics diff --git a/packages/aws/data_stream/ebs/agent/stream/stream.yml.hbs b/packages/aws/data_stream/ebs/agent/stream/stream.yml.hbs index 89615c3737a..0cc4dceb973 100644 --- a/packages/aws/data_stream/ebs/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/ebs/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/ebs/manifest.yml b/packages/aws/data_stream/ebs/manifest.yml index d738b843814..8a067be4f34 100644 --- a/packages/aws/data_stream/ebs/manifest.yml +++ b/packages/aws/data_stream/ebs/manifest.yml @@ -48,5 +48,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS EBS metrics description: Collect AWS EBS metrics diff --git a/packages/aws/data_stream/ec2_metrics/agent/stream/stream.yml.hbs b/packages/aws/data_stream/ec2_metrics/agent/stream/stream.yml.hbs index 12d3f6848f3..f9a09a84abd 100644 --- a/packages/aws/data_stream/ec2_metrics/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/ec2_metrics/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/ec2_metrics/manifest.yml b/packages/aws/data_stream/ec2_metrics/manifest.yml index 8a15fd55b2d..e6e6fd6b905 100644 --- a/packages/aws/data_stream/ec2_metrics/manifest.yml +++ b/packages/aws/data_stream/ec2_metrics/manifest.yml @@ -48,5 +48,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS EC2 metrics description: Collect AWS EC2 metrics diff --git a/packages/aws/data_stream/ecs_metrics/agent/stream/stream.yml.hbs b/packages/aws/data_stream/ecs_metrics/agent/stream/stream.yml.hbs index d8b2cf6475f..2c3e21b5dc9 100644 --- a/packages/aws/data_stream/ecs_metrics/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/ecs_metrics/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/ecs_metrics/manifest.yml b/packages/aws/data_stream/ecs_metrics/manifest.yml index 837fa3d6fb4..7e21d5a3027 100644 --- a/packages/aws/data_stream/ecs_metrics/manifest.yml +++ b/packages/aws/data_stream/ecs_metrics/manifest.yml @@ -48,5 +48,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS ECS metrics description: Collect AWS ECS metrics diff --git a/packages/aws/data_stream/elb_metrics/agent/stream/stream.yml.hbs b/packages/aws/data_stream/elb_metrics/agent/stream/stream.yml.hbs index 97eb28ec612..48c098d20be 100644 --- a/packages/aws/data_stream/elb_metrics/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/elb_metrics/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/elb_metrics/manifest.yml b/packages/aws/data_stream/elb_metrics/manifest.yml index 48bce706a5d..d81d6d116e8 100644 --- a/packages/aws/data_stream/elb_metrics/manifest.yml +++ b/packages/aws/data_stream/elb_metrics/manifest.yml @@ -48,5 +48,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS ELB metrics description: Collect AWS ELB metrics diff --git a/packages/aws/data_stream/emr_metrics/agent/stream/stream.yml.hbs b/packages/aws/data_stream/emr_metrics/agent/stream/stream.yml.hbs index 00fcc848016..bfc631a2146 100644 --- a/packages/aws/data_stream/emr_metrics/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/emr_metrics/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/emr_metrics/manifest.yml b/packages/aws/data_stream/emr_metrics/manifest.yml index 373787bc6a6..a26c1566e0b 100644 --- a/packages/aws/data_stream/emr_metrics/manifest.yml +++ b/packages/aws/data_stream/emr_metrics/manifest.yml @@ -40,6 +40,13 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. - name: tags_filter type: yaml title: Tags Filter diff --git a/packages/aws/data_stream/firewall_metrics/agent/stream/stream.yml.hbs b/packages/aws/data_stream/firewall_metrics/agent/stream/stream.yml.hbs index fbf98ab3a0a..f5fea85894d 100644 --- a/packages/aws/data_stream/firewall_metrics/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/firewall_metrics/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/firewall_metrics/manifest.yml b/packages/aws/data_stream/firewall_metrics/manifest.yml index 672815ad860..ae851122147 100644 --- a/packages/aws/data_stream/firewall_metrics/manifest.yml +++ b/packages/aws/data_stream/firewall_metrics/manifest.yml @@ -39,6 +39,13 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. - name: metrics type: yaml title: Metrics diff --git a/packages/aws/data_stream/kafka_metrics/agent/stream/stream.yml.hbs b/packages/aws/data_stream/kafka_metrics/agent/stream/stream.yml.hbs index 395ce09518d..5a31f34ad2a 100644 --- a/packages/aws/data_stream/kafka_metrics/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/kafka_metrics/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/kafka_metrics/manifest.yml b/packages/aws/data_stream/kafka_metrics/manifest.yml index 0f039c45eb0..d80941bf75a 100644 --- a/packages/aws/data_stream/kafka_metrics/manifest.yml +++ b/packages/aws/data_stream/kafka_metrics/manifest.yml @@ -48,5 +48,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS Kafka metrics description: Collect AWS Kafka metrics diff --git a/packages/aws/data_stream/kinesis/agent/stream/stream.yml.hbs b/packages/aws/data_stream/kinesis/agent/stream/stream.yml.hbs index e0ec3daefc3..1a2b72c9fe6 100644 --- a/packages/aws/data_stream/kinesis/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/kinesis/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/kinesis/manifest.yml b/packages/aws/data_stream/kinesis/manifest.yml index 97f04ab7d37..0e3d30a794b 100644 --- a/packages/aws/data_stream/kinesis/manifest.yml +++ b/packages/aws/data_stream/kinesis/manifest.yml @@ -48,5 +48,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS Kinesis Data Stream metrics description: Collect AWS Kinesis Data Stream metrics diff --git a/packages/aws/data_stream/lambda/agent/stream/stream.yml.hbs b/packages/aws/data_stream/lambda/agent/stream/stream.yml.hbs index 633fc3f698f..50f26a0e519 100644 --- a/packages/aws/data_stream/lambda/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/lambda/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/lambda/manifest.yml b/packages/aws/data_stream/lambda/manifest.yml index 00fdba14515..03eb1b17bb6 100644 --- a/packages/aws/data_stream/lambda/manifest.yml +++ b/packages/aws/data_stream/lambda/manifest.yml @@ -48,5 +48,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS Lambda metrics description: Collect AWS Lambda metrics diff --git a/packages/aws/data_stream/natgateway/agent/stream/stream.yml.hbs b/packages/aws/data_stream/natgateway/agent/stream/stream.yml.hbs index c260b3d0aa7..29cae85f6f9 100644 --- a/packages/aws/data_stream/natgateway/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/natgateway/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/natgateway/manifest.yml b/packages/aws/data_stream/natgateway/manifest.yml index 55a8853ace3..9551eb89a59 100644 --- a/packages/aws/data_stream/natgateway/manifest.yml +++ b/packages/aws/data_stream/natgateway/manifest.yml @@ -39,6 +39,13 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. - name: tags_filter type: yaml title: Tags Filter diff --git a/packages/aws/data_stream/rds/agent/stream/stream.yml.hbs b/packages/aws/data_stream/rds/agent/stream/stream.yml.hbs index a19b2b409d6..1adec82acb8 100644 --- a/packages/aws/data_stream/rds/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/rds/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/rds/manifest.yml b/packages/aws/data_stream/rds/manifest.yml index 9c6a270a38f..22aa7b9b352 100644 --- a/packages/aws/data_stream/rds/manifest.yml +++ b/packages/aws/data_stream/rds/manifest.yml @@ -48,5 +48,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS RDS metrics description: Collect AWS RDS metrics diff --git a/packages/aws/data_stream/redshift/agent/stream/stream.yml.hbs b/packages/aws/data_stream/redshift/agent/stream/stream.yml.hbs index d3d0eff8669..ec18b42d841 100644 --- a/packages/aws/data_stream/redshift/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/redshift/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/redshift/manifest.yml b/packages/aws/data_stream/redshift/manifest.yml index 39fe2a86510..916f069348c 100644 --- a/packages/aws/data_stream/redshift/manifest.yml +++ b/packages/aws/data_stream/redshift/manifest.yml @@ -39,6 +39,13 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. - name: tags_filter type: yaml title: Tags Filter diff --git a/packages/aws/data_stream/s3_daily_storage/agent/stream/stream.yml.hbs b/packages/aws/data_stream/s3_daily_storage/agent/stream/stream.yml.hbs index b072f249870..70e338926ba 100644 --- a/packages/aws/data_stream/s3_daily_storage/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/s3_daily_storage/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/s3_daily_storage/manifest.yml b/packages/aws/data_stream/s3_daily_storage/manifest.yml index 33eec16ae63..d7b60e4f429 100644 --- a/packages/aws/data_stream/s3_daily_storage/manifest.yml +++ b/packages/aws/data_stream/s3_daily_storage/manifest.yml @@ -39,5 +39,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS S3 daily storage metrics description: Collect AWS S3 daily storage metrics diff --git a/packages/aws/data_stream/s3_request/agent/stream/stream.yml.hbs b/packages/aws/data_stream/s3_request/agent/stream/stream.yml.hbs index 3cf5faaac4d..782e8c569b9 100644 --- a/packages/aws/data_stream/s3_request/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/s3_request/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/s3_request/manifest.yml b/packages/aws/data_stream/s3_request/manifest.yml index 620c188f01d..79aab2bca5a 100644 --- a/packages/aws/data_stream/s3_request/manifest.yml +++ b/packages/aws/data_stream/s3_request/manifest.yml @@ -39,5 +39,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS S3 request metrics description: Collect AWS S3 request metrics diff --git a/packages/aws/data_stream/s3_storage_lens/agent/stream/stream.yml.hbs b/packages/aws/data_stream/s3_storage_lens/agent/stream/stream.yml.hbs index d547cceb8c2..59e7ffaf926 100644 --- a/packages/aws/data_stream/s3_storage_lens/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/s3_storage_lens/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/s3_storage_lens/manifest.yml b/packages/aws/data_stream/s3_storage_lens/manifest.yml index fb5ac2ff489..8940283aa1a 100644 --- a/packages/aws/data_stream/s3_storage_lens/manifest.yml +++ b/packages/aws/data_stream/s3_storage_lens/manifest.yml @@ -39,5 +39,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS S3 Storage Lens metrics description: Collect AWS S3 Storage Lens metrics diff --git a/packages/aws/data_stream/sns/agent/stream/stream.yml.hbs b/packages/aws/data_stream/sns/agent/stream/stream.yml.hbs index 82a4266c70f..ea950b14b86 100644 --- a/packages/aws/data_stream/sns/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/sns/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/sns/manifest.yml b/packages/aws/data_stream/sns/manifest.yml index 3dcd20a1107..f358e254b55 100644 --- a/packages/aws/data_stream/sns/manifest.yml +++ b/packages/aws/data_stream/sns/manifest.yml @@ -48,5 +48,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS SNS metrics description: Collect AWS SNS metrics diff --git a/packages/aws/data_stream/sqs/agent/stream/stream.yml.hbs b/packages/aws/data_stream/sqs/agent/stream/stream.yml.hbs index 062e6f846aa..64b601c512a 100644 --- a/packages/aws/data_stream/sqs/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/sqs/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/sqs/manifest.yml b/packages/aws/data_stream/sqs/manifest.yml index 68bb5a33c43..491edb37ada 100644 --- a/packages/aws/data_stream/sqs/manifest.yml +++ b/packages/aws/data_stream/sqs/manifest.yml @@ -39,5 +39,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS SQS metrics description: Collect AWS SQS metrics diff --git a/packages/aws/data_stream/transitgateway/agent/stream/stream.yml.hbs b/packages/aws/data_stream/transitgateway/agent/stream/stream.yml.hbs index 92be4c7bdf8..1b145456b43 100644 --- a/packages/aws/data_stream/transitgateway/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/transitgateway/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/transitgateway/manifest.yml b/packages/aws/data_stream/transitgateway/manifest.yml index 323551bc096..82390c87bd6 100644 --- a/packages/aws/data_stream/transitgateway/manifest.yml +++ b/packages/aws/data_stream/transitgateway/manifest.yml @@ -39,6 +39,13 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. - name: tags_filter type: yaml title: Tags Filter diff --git a/packages/aws/data_stream/usage/agent/stream/stream.yml.hbs b/packages/aws/data_stream/usage/agent/stream/stream.yml.hbs index d20ef53b9c0..08b35087a97 100644 --- a/packages/aws/data_stream/usage/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/usage/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/usage/manifest.yml b/packages/aws/data_stream/usage/manifest.yml index f2dd2d0bf82..c294c6dd33d 100644 --- a/packages/aws/data_stream/usage/manifest.yml +++ b/packages/aws/data_stream/usage/manifest.yml @@ -39,5 +39,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS usage metrics description: Collect AWS usage metrics diff --git a/packages/aws/data_stream/vpn/agent/stream/stream.yml.hbs b/packages/aws/data_stream/vpn/agent/stream/stream.yml.hbs index 017bbefd6b8..2e13156fc73 100644 --- a/packages/aws/data_stream/vpn/agent/stream/stream.yml.hbs +++ b/packages/aws/data_stream/vpn/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws/data_stream/vpn/manifest.yml b/packages/aws/data_stream/vpn/manifest.yml index c2925432279..39252532cf1 100644 --- a/packages/aws/data_stream/vpn/manifest.yml +++ b/packages/aws/data_stream/vpn/manifest.yml @@ -48,5 +48,12 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. title: AWS VPN metrics description: Collect AWS VPN metrics diff --git a/packages/aws/docs/README.md b/packages/aws/docs/README.md index a4a67f3f5ed..a8dd0184216 100644 --- a/packages/aws/docs/README.md +++ b/packages/aws/docs/README.md @@ -58,9 +58,11 @@ The extra-charges generated by GetMetricData API calls are proportional to the f The `include_linked_accounts` parameter is used to enable the inclusion of metrics from different accounts linked to a main monitoring account. By setting this parameter to true, users can gather metrics from multiple AWS accounts that are linked through the [CloudWatch cross-account observability](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html). -By default, the `include_linked_accounts` parameter is set to false, meaning that only metrics from the main monitoring -account are collected. When set to true, the parameter allows the CloudWatch ListMetrics API to include metrics from -the monitoring account and all linked source accounts in the returned data, providing a comprehensive cross-account view. +Internally, the agent uses [ListMetrics](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_ListMetrics.html) API to include metrics from the monitoring account and all linked source accounts in the returned data, providing a comprehensive cross-account view. + +You can further utilize `owning_account` parameter to refine the cross account observability. This parameter accepts a valid AWS account ID which should be linked to the monitoring account. +If configured, metrics will be extracted from this specified linked/owning account. +This parameter [utilize OwningAccount](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_ListMetrics.html#API_ListMetrics_RequestParameters) parameter of the ListMetrics API request. *_Note_:* Users should ensure that the necessary IAM roles and policies are properly set up in order to link the monitoring account and source accounts together. diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml index ec337d1d4d3..716b060e8b2 100644 --- a/packages/aws/manifest.yml +++ b/packages/aws/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.0.0 name: aws title: AWS -version: 2.29.0 +version: 2.30.0 description: Collect logs and metrics from Amazon Web Services (AWS) with Elastic Agent. type: integration categories: @@ -10,7 +10,7 @@ conditions: elastic: subscription: basic kibana: - version: "^8.15.0" + version: "^8.15.2" screenshots: - src: /img/metricbeat-aws-overview.png title: metricbeat aws overview diff --git a/packages/aws_bedrock/changelog.yml b/packages/aws_bedrock/changelog.yml index 2238abc07f9..2bf1126aa85 100644 --- a/packages/aws_bedrock/changelog.yml +++ b/packages/aws_bedrock/changelog.yml @@ -1,3 +1,8 @@ +- version: "0.12.0" + changes: + - description: Support configuring the Owning Account + type: enhancement + link: https://github.com/elastic/integrations/pull/11442 - version: "0.11.3" changes: - description: Ignore non-policy data under ...trace.guardrail. diff --git a/packages/aws_bedrock/data_stream/runtime/agent/stream/stream.yml.hbs b/packages/aws_bedrock/data_stream/runtime/agent/stream/stream.yml.hbs index 2b860471dd2..9fe8962ecaf 100644 --- a/packages/aws_bedrock/data_stream/runtime/agent/stream/stream.yml.hbs +++ b/packages/aws_bedrock/data_stream/runtime/agent/stream/stream.yml.hbs @@ -5,6 +5,9 @@ data_granularity: {{data_granularity}} {{/if}} {{#if include_linked_accounts}} include_linked_accounts: {{include_linked_accounts}} +{{#if owning_account}} +owning_account: "{{owning_account}}" +{{/if}} {{/if}} {{#if access_key_id}} access_key_id: {{access_key_id}} diff --git a/packages/aws_bedrock/data_stream/runtime/manifest.yml b/packages/aws_bedrock/data_stream/runtime/manifest.yml index 209762a5f3c..80aa7e48439 100644 --- a/packages/aws_bedrock/data_stream/runtime/manifest.yml +++ b/packages/aws_bedrock/data_stream/runtime/manifest.yml @@ -50,6 +50,13 @@ streams: show_user: false default: true description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is true. + - name: owning_account + type: integer + title: Owning Account + multi: false + required: false + show_user: false + description: Accepts an AWS account ID linked to the monitoring account. Works only if include_linked_accounts is set to true. If set, monitoring data will only include data from the given account. - name: processors type: yaml title: Processors diff --git a/packages/aws_bedrock/manifest.yml b/packages/aws_bedrock/manifest.yml index f9356af36bc..20bc945d2fb 100644 --- a/packages/aws_bedrock/manifest.yml +++ b/packages/aws_bedrock/manifest.yml @@ -3,12 +3,12 @@ name: aws_bedrock title: Amazon Bedrock description: Collect Amazon Bedrock model invocation logs and runtime metrics with Elastic Agent. type: integration -version: "0.11.3" +version: "0.12.0" categories: - aws conditions: kibana: - version: "^8.13.0" + version: "^8.15.2" elastic: subscription: basic policy_templates: