Skip to content
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

Jump to bottom

[AWS] add support to include linked accounts when using log name prefix to select log groups #11484

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[AWS] add support to include linked accounts when using log name prefix to select log groups #11484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/aws/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "2.31.3"
changes:
- description: Add option to check linked accounts when using log group prefixes to derive matching log groups
type: enhancement
link: https://github.com/elastic/integrations/pull/11484
- version: "2.31.2"
changes:
- description: Add the support for listeners with ALPN policy extension in ELB dataset for Network Load Balancers.
Expand Down
3 changes: 3 additions & 0 deletions packages/aws/data_stream/apigateway_logs/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{/unless}}
{{/unless}}

Expand Down
7 changes: 7 additions & 0 deletions packages/aws/data_stream/apigateway_logs/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,13 @@ streams:
required: false
show_user: false
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: region_name
type: text
title: Region Name
Expand Down
3 changes: 3 additions & 0 deletions packages/aws/data_stream/cloudtrail/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{/unless}}
{{/unless}}

Expand Down
7 changes: 7 additions & 0 deletions packages/aws/data_stream/cloudtrail/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,13 @@ streams:
required: false
show_user: false
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: region_name
type: text
title: Region Name
Expand Down
3 changes: 3 additions & 0 deletions packages/aws/data_stream/cloudwatch_logs/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{/unless}}
{{/unless}}

Expand Down
7 changes: 7 additions & 0 deletions packages/aws/data_stream/cloudwatch_logs/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ streams:
required: false
show_user: false
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: region_name
type: text
title: Region Name
Expand Down
3 changes: 3 additions & 0 deletions packages/aws/data_stream/ec2_logs/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{/unless}}
{{/unless}}

Expand Down
7 changes: 7 additions & 0 deletions packages/aws/data_stream/ec2_logs/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,13 @@ streams:
required: false
show_user: false
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: region_name
type: text
title: Region Name
Expand Down
3 changes: 3 additions & 0 deletions packages/aws/data_stream/elb_logs/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{/unless}}
{{/unless}}

Expand Down
7 changes: 7 additions & 0 deletions packages/aws/data_stream/elb_logs/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,13 @@ streams:
required: false
show_user: false
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: region_name
type: text
title: Region Name
Expand Down
3 changes: 3 additions & 0 deletions packages/aws/data_stream/emr_logs/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{/unless}}
{{/unless}}

Expand Down
7 changes: 7 additions & 0 deletions packages/aws/data_stream/emr_logs/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,13 @@ streams:
required: false
show_user: false
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: region_name
type: text
title: Region Name
Expand Down
3 changes: 3 additions & 0 deletions packages/aws/data_stream/firewall_logs/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{/unless}}
{{/unless}}

Expand Down
7 changes: 7 additions & 0 deletions packages/aws/data_stream/firewall_logs/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,13 @@ streams:
required: false
show_user: false
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: region_name
type: text
title: Region Name
Expand Down
3 changes: 3 additions & 0 deletions packages/aws/data_stream/route53_public_logs/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{/unless}}
{{/unless}}

Expand Down
7 changes: 7 additions & 0 deletions packages/aws/data_stream/route53_public_logs/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ streams:
multi: false
show_user: false
required: false
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: log_streams
type: text
title: Log Streams
Expand Down
3 changes: 3 additions & 0 deletions packages/aws/data_stream/route53_resolver_logs/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{/unless}}
{{/unless}}

Expand Down
7 changes: 7 additions & 0 deletions packages/aws/data_stream/route53_resolver_logs/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ streams:
multi: false
show_user: false
required: false
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: log_streams
type: text
title: Log Streams
Expand Down
3 changes: 3 additions & 0 deletions packages/aws/data_stream/vpcflow/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{/unless}}
{{/unless}}

Expand Down
7 changes: 7 additions & 0 deletions packages/aws/data_stream/vpcflow/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,13 @@ streams:
required: false
show_user: false
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: region_name
type: text
title: Region Name
Expand Down
3 changes: 3 additions & 0 deletions packages/aws/data_stream/waf/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{/unless}}
{{/unless}}

Expand Down
7 changes: 7 additions & 0 deletions packages/aws/data_stream/waf/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,13 @@ streams:
required: false
show_user: false
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: region_name
type: text
title: Region Name
Expand Down
2 changes: 1 addition & 1 deletion packages/aws/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 3.0.0
name: aws
title: AWS
version: 2.31.2
version: 2.31.3
description: Collect logs and metrics from Amazon Web Services (AWS) with Elastic Agent.
type: integration
categories:
Expand Down
5 changes: 5 additions & 0 deletions packages/aws_bedrock/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
- version: "0.13.0"
changes:
- description: Add option to check linked accounts when using log group prefixes to derive matching log groups
type: enhancement
link: https://github.com/elastic/integrations/pull/11484
- version: "0.12.0"
changes:
- description: Support configuring the Owning Account
Expand Down
3 changes: 3 additions & 0 deletions packages/aws_bedrock/data_stream/invocation/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{#if number_of_workers }}
number_of_workers: {{ number_of_workers }}
{{/if}}
Expand Down
7 changes: 7 additions & 0 deletions packages/aws_bedrock/data_stream/invocation/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ streams:
required: false
show_user: false
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: region_name
type: text
title: Region Name
Expand Down
4 changes: 2 additions & 2 deletions packages/aws_bedrock/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.12.0"
version: "0.13.0"
categories:
- aws
conditions:
kibana:
version: "^8.15.2"
version: "^8.16.0"
elastic:
subscription: basic
policy_templates:
Expand Down
5 changes: 5 additions & 0 deletions packages/aws_logs/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
- version: "1.5.0"
changes:
- description: Add option to check linked accounts when using log group prefixes to derive matching log groups
type: enhancement
link: https://github.com/elastic/integrations/pull/11484
- version: "1.4.0"
changes:
- description: Update file_selectors field to be able to receive multiline configuration
Expand Down
3 changes: 3 additions & 0 deletions packages/aws_logs/data_stream/generic/agent/stream/aws-cloudwatch.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ log_group_arn: {{ log_group_arn }}
{{#if log_group_name_prefix }}
log_group_name_prefix: {{ log_group_name_prefix }}
{{/if}}
{{#if include_linked_accounts_with_prefix }}
include_linked_accounts_for_prefix_mode: {{ include_linked_accounts_with_prefix }}
{{/if}}
{{#if number_of_workers }}
number_of_workers: {{ number_of_workers }}
{{/if}}
Expand Down
7 changes: 7 additions & 0 deletions packages/aws_logs/data_stream/generic/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ streams:
required: false
show_user: false
description: The prefix for a group of log group names. `region_name` is required when `log_group_name_prefix` is given. `log_group_name` and `log_group_name_prefix` cannot be given at the same time.
- name: include_linked_accounts_with_prefix
type: bool
title: Include Linked Accounts with prefix
multi: false
required: false
show_user: false
description: Include log groups from linked accounts when using `log_group_name_prefix` to derive the monitoring log groups.
- name: region_name
type: text
title: Region Name
Expand Down
4 changes: 2 additions & 2 deletions packages/aws_logs/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: aws_logs
title: Custom AWS Logs
description: Collect raw logs from AWS S3 or CloudWatch with Elastic Agent.
type: integration
version: "1.4.0"
version: "1.5.0"
categories:
- observability
- custom
- aws
conditions:
kibana:
version: ^8.12.0
version: ^8.16.0
elastic:
subscription: basic
policy_templates:
Expand Down