Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions packages/aws/_dev/build/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@ The extra-charges generated by GetMetricData API calls are proportional to the f
* `Collection Period` and `Data Granularity`. By setting `Collection Period` and `Data Granularity` together, you can control, respectively, how frequently you want your metrics to be collected and how granular they have to be. If you can tolerate an extra delay in retrieving metrics as trade off, you may consider setting `data_granularity` and increase the value for `Collection Period` to reduce extra charges. For example, setting `Data Granularity` to your current value for `Period`, and doubling the value of `Period`, may lead to a 50% savings.
* `Tags Filter`. By specifying a tag, you can ensure that no Cloudwatch API call is performed for AWS resources you are not interested in.

### Cross-account observability
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.

*_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.
Please see [Link monitoring accounts with source accounts](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Unified-Cross-Account-Setup.html#CloudWatch-Unified-Cross-Account-Setup-permissions) for more details.

## Requirements

Before using the AWS integration you will need:
Expand Down
5 changes: 5 additions & 0 deletions packages/aws/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.43.0"
changes:
- description: Add include_linked_accounts config parameter for metrics data streams.
type: enhancement
link: https://github.com/elastic/integrations/pull/6459
- version: "1.42.0"
changes:
- description: Add field agent.id to be set as dimension for TSDB migration.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws/data_stream/billing/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,13 @@ streams:
show_user: true
default:
- "aws:createdBy"
- name: include_linked_accounts
type: bool
title: Include Linked Accounts
multi: false
required: false
show_user: false
default: false
description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is false.
title: AWS Billing Metrics
description: Collect billing metrics from Amazon Web Services with Elastic Agent.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws/data_stream/cloudwatch_metrics/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ streams:
multi: false
required: false
show_user: false
- name: include_linked_accounts
type: bool
title: Include Linked Accounts
multi: false
required: false
show_user: false
default: false
description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is false.
- name: regions
type: text
title: Regions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws/data_stream/dynamodb/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,13 @@ streams:
default: |
# - key: "created-by"
# value: "foo"
- name: include_linked_accounts
type: bool
title: Include Linked Accounts
multi: false
required: false
show_user: false
default: false
description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is false.
title: AWS DynamoDB metrics
description: Collect AWS DynamoDB metrics
3 changes: 3 additions & 0 deletions packages/aws/data_stream/ebs/agent/stream/stream.yml.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws/data_stream/ebs/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,13 @@ streams:
default: |
# - key: "created-by"
# value: "foo"
- name: include_linked_accounts
type: bool
title: Include Linked Accounts
multi: false
required: false
show_user: false
default: false
description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is false.
title: AWS EBS metrics
description: Collect AWS EBS metrics
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws/data_stream/ec2_metrics/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,13 @@ streams:
default: |
# - key: "created-by"
# value: "foo"
- name: include_linked_accounts
type: bool
title: Include Linked Accounts
multi: false
required: false
show_user: false
default: false
description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is false.
title: AWS EC2 metrics
description: Collect AWS EC2 metrics
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws/data_stream/ecs_metrics/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,13 @@ streams:
default: |
# - key: "created-by"
# value: "foo"
- name: include_linked_accounts
type: bool
title: Include Linked Accounts
multi: false
required: false
show_user: false
default: false
description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is false.
title: AWS ECS metrics
description: Collect AWS ECS metrics
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws/data_stream/elb_metrics/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,13 @@ streams:
default: |
# - key: "created-by"
# value: "foo"
- name: include_linked_accounts
type: bool
title: Include Linked Accounts
multi: false
required: false
show_user: false
default: false
description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is false.
title: AWS ELB metrics
description: Collect AWS ELB metrics
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws/data_stream/firewall_metrics/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ streams:
multi: false
required: false
show_user: false
- name: include_linked_accounts
type: bool
title: Include Linked Accounts
multi: false
required: false
show_user: false
default: false
description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is false.
- name: metrics
type: yaml
title: Metrics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws/data_stream/kinesis/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,13 @@ streams:
default: |
# - key: "created-by"
# value: "foo"
- name: include_linked_accounts
type: bool
title: Include Linked Accounts
multi: false
required: false
show_user: false
default: false
description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is false.
title: AWS Kinesis Data Stream metrics
description: Collect AWS Kinesis Data Stream metrics
3 changes: 3 additions & 0 deletions packages/aws/data_stream/lambda/agent/stream/stream.yml.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws/data_stream/lambda/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,13 @@ streams:
default: |
# - key: "created-by"
# value: "foo"
- name: include_linked_accounts
type: bool
title: Include Linked Accounts
multi: false
required: false
show_user: false
default: false
description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is false.
title: AWS Lambda metrics
description: Collect AWS Lambda metrics
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
8 changes: 8 additions & 0 deletions packages/aws/data_stream/natgateway/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,13 @@ streams:
multi: false
required: false
show_user: false
- name: include_linked_accounts
type: bool
title: Include Linked Accounts
multi: false
required: false
show_user: false
default: false
description: When include_linked_accounts is set to true, CloudWatch metrics will be collected from both linked accounts and the monitoring account. Default is false.
title: AWS NAT gateway metrics
description: Collect AWS NAT gateway metrics
3 changes: 3 additions & 0 deletions packages/aws/data_stream/rds/agent/stream/stream.yml.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ period: {{period}}
{{#if data_granularity}}
data_granularity: {{data_granularity}}
{{/if}}
{{#if include_linked_accounts}}
include_linked_accounts: {{include_linked_accounts}}
{{/if}}
{{#if access_key_id}}
access_key_id: {{access_key_id}}
{{/if}}
Expand Down
2 changes: 1 addition & 1 deletion packages/aws/data_stream/rds/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@
name: container.name
- name: agent.id
external: ecs
dimension: true
dimension: true
11 changes: 0 additions & 11 deletions packages/aws/data_stream/rds/fields/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,11 @@
type: long
description: |
The number of earned CPU credits that an instance has accrued since it was launched or started.

- name: database_connections
type: long
metric_type: gauge
description: |
The number of database connections in use.

- name: db_instance
type: group
fields:
Expand Down Expand Up @@ -89,8 +87,6 @@
type: keyword
description: |
Each DB instance runs a DB engine, like MySQL, MariaDB, PostgreSQL and etc.


- name: disk_queue_depth
metric_type: gauge
type: float
Expand Down Expand Up @@ -123,7 +119,6 @@
type: long
description: |
The lagging size of the replica lagging the most in terms of WAL data received. Applies to PostgreSQL.

- name: read_io.ops_per_sec
metric_type: gauge
type: float
Expand Down Expand Up @@ -190,7 +185,6 @@
type: long
description: |
The average number of failed login attempts per second.

- name: throughput
type: group
fields:
Expand Down Expand Up @@ -254,7 +248,6 @@
type: float
description: |
The average number of bytes written to disk per second.

- name: latency
type: group
fields:
Expand Down Expand Up @@ -312,7 +305,6 @@
format: duration
description: |
The amount of latency for delete queries, in milliseconds.

- name: disk_usage
type: group
fields:
Expand All @@ -332,7 +324,6 @@
type: long
description: |
The disk space used by transaction logs. Applies to PostgreSQL.

- name: transactions
type: group
fields:
Expand All @@ -346,7 +337,6 @@
type: long
description: |
The average number of transactions in the database that are blocked per second.

- name: aurora_bin_log_replica_lag
metric_type: gauge
type: long
Expand Down Expand Up @@ -393,7 +383,6 @@
type: long
description: |
The minimum amount of lag between the primary instance and each Aurora DB instance in the DB cluster, in milliseconds.

- name: backtrack_change_records.creation_rate
metric_type: gauge
type: long
Expand Down
Loading