From 207bd24c36276002bb4463b684f11b37233dc7e7 Mon Sep 17 00:00:00 2001 From: kaiyan-sheng Date: Tue, 13 Jun 2023 15:10:53 -0600 Subject: [PATCH] [AWS] Change include_linked_accounts default value to true (#35686) --- metricbeat/docs/modules/aws.asciidoc | 6 +++--- x-pack/metricbeat/module/aws/_meta/docs.asciidoc | 6 +++--- x-pack/metricbeat/module/aws/aws.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/metricbeat/docs/modules/aws.asciidoc b/metricbeat/docs/modules/aws.asciidoc index da21bdbfad2..ee2a73e17dc 100644 --- a/metricbeat/docs/modules/aws.asciidoc +++ b/metricbeat/docs/modules/aws.asciidoc @@ -80,9 +80,9 @@ If endpoint is specified, `regions` config becomes required. 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 https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html[CloudWatch cross-account observability]. -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 accounts in the returned data, providing a comprehensive cross-account view. +By default, the `include_linked_accounts` parameter is set to true, meaning that only metrics from the main monitoring +account and all linked accounts are all collected. When set to false, the parameter allows the CloudWatch service to +only retrieve metrics from the monitoring account. *_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/x-pack/metricbeat/module/aws/_meta/docs.asciidoc b/x-pack/metricbeat/module/aws/_meta/docs.asciidoc index cb6f05a9336..08ac6918d9e 100644 --- a/x-pack/metricbeat/module/aws/_meta/docs.asciidoc +++ b/x-pack/metricbeat/module/aws/_meta/docs.asciidoc @@ -68,9 +68,9 @@ If endpoint is specified, `regions` config becomes required. 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 https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account.html[CloudWatch cross-account observability]. -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 accounts in the returned data, providing a comprehensive cross-account view. +By default, the `include_linked_accounts` parameter is set to true, meaning that only metrics from the main monitoring +account and all linked accounts are all collected. When set to false, the parameter allows the CloudWatch service to +only retrieve metrics from the monitoring account. *_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/x-pack/metricbeat/module/aws/aws.go b/x-pack/metricbeat/module/aws/aws.go index 76f0b9d83d8..90569f9edb0 100644 --- a/x-pack/metricbeat/module/aws/aws.go +++ b/x-pack/metricbeat/module/aws/aws.go @@ -62,10 +62,10 @@ type Tag struct { // ModuleName is the name of this module. const ModuleName = "aws" -// IncludeLinkedAccountsDefault defines if we should include metrics from linked AWS accounts or not. Default is false. +// IncludeLinkedAccountsDefault defines if we should include metrics from linked AWS accounts or not. Default is true. // More information about cross-account Cloudwatch monitoring can be found at // https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Cross-Account-Cross-Region.html -const IncludeLinkedAccountsDefault = false +const IncludeLinkedAccountsDefault = true type LabelConstants struct { AccountIdIdx int