Skip to content

Commit cd46a74

Browse files
tetianakravchenkotetianakravchenko
authored
[AWS Cloudwatch] Add metric_type (#6999)
* add metric_type metadata Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * Update manifest.yml * revert kibana.version Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> * update pr link Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> --------- Signed-off-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co>
1 parent 841d6f7 commit cd46a74

File tree

4 files changed

+61
-55
lines changed

4 files changed

+61
-55
lines changed

‎packages/aws/changelog.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "1.50.6"
3+
changes:
4+
- description: Add metric_type metadata to the cloudwatch data_stream
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/6999
27
- version: "1.50.5"
38
changes:
49
- description: Migrate AWS Security Hub dashboards to lens.

‎packages/aws/data_stream/cloudwatch_metrics/fields/package-fields.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
description: |
1515
Autogenerated ID representing the fingerprint of the aws.dimensions object
1616
dimension: true
17-
- name: '*.metrics.*.*'
18-
type: object
19-
description: |
20-
Metrics that returned from Cloudwatch API query.
17+
- name: 'aws.*.metrics.*.*'
18+
type: double
19+
metric_type: gauge
20+
description: |
21+
Metrics that returned from Cloudwatch API query.

‎packages/aws/docs/cloudwatch.md‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -201,54 +201,54 @@ An example event for `cloudwatch` looks as following:
201201

202202
**Exported fields**
203203

204-
| Field | Description | Type |
205-
|---|---|---|
206-
| @timestamp | Event timestamp. | date |
207-
| agent.id | Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id. | keyword |
208-
| aws.\*.metrics.\*.\* | Metrics that returned from Cloudwatch API query. | object |
209-
| aws.cloudwatch.namespace | The namespace specified when query cloudwatch api. | keyword |
210-
| aws.dimensions.\* | Metric dimensions. | object |
211-
| aws.dimensions.fingerprint | Autogenerated ID representing the fingerprint of the aws.dimensions object | keyword |
212-
| aws.tags.\* | Tag key value pairs from aws resources. | object |
213-
| cloud | Fields related to the cloud or infrastructure the events are coming from. | group |
214-
| cloud.account.id | The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier. | keyword |
215-
| cloud.account.name | The cloud account name or alias used to identify different entities in a multi-tenant environment. Examples: AWS account name, Google Cloud ORG display name. | keyword |
216-
| cloud.availability_zone | Availability zone in which this host, resource, or service is located. | keyword |
217-
| cloud.image.id | Image ID for the cloud instance. | keyword |
218-
| cloud.instance.id | Instance ID of the host machine. | keyword |
219-
| cloud.instance.name | Instance name of the host machine. | keyword |
220-
| cloud.machine.type | Machine type of the host machine. | keyword |
221-
| cloud.project.id | The cloud project identifier. Examples: Google Cloud Project id, Azure Project id. | keyword |
222-
| cloud.provider | Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean. | keyword |
223-
| cloud.region | Region in which this host, resource, or service is located. | keyword |
224-
| container.id | Unique container id. | keyword |
225-
| container.image.name | Name of the image the container was built on. | keyword |
226-
| container.labels | Image labels. | object |
227-
| container.name | Container name. | keyword |
228-
| data_stream.dataset | Data stream dataset. | constant_keyword |
229-
| data_stream.namespace | Data stream namespace. | constant_keyword |
230-
| data_stream.type | Data stream type. | constant_keyword |
231-
| ecs.version | ECS version this event conforms to. `ecs.version` is a required field and must exist in all events. When querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events. | keyword |
232-
| error | These fields can represent errors of any kind. Use them for errors that happen while fetching events or in cases where the event itself contains an error. | group |
233-
| error.message | Error message. | match_only_text |
234-
| event.dataset | Event dataset | constant_keyword |
235-
| event.module | Event module | constant_keyword |
236-
| host.architecture | Operating system architecture. | keyword |
237-
| host.containerized | If the host is a container. | boolean |
238-
| host.domain | Name of the domain of which the host is a member. For example, on Windows this could be the host's Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host's LDAP provider. | keyword |
239-
| host.hostname | Hostname of the host. It normally contains what the `hostname` command returns on the host machine. | keyword |
240-
| host.id | Unique host id. As hostname is not always unique, use values that are meaningful in your environment. Example: The current usage of `beat.name`. | keyword |
241-
| host.ip | Host ip addresses. | ip |
242-
| host.mac | Host MAC addresses. The notation format from RFC 7042 is suggested: Each octet (that is, 8-bit byte) is represented by two [uppercase] hexadecimal digits giving the value of the octet as an unsigned integer. Successive octets are separated by a hyphen. | keyword |
243-
| host.name | Name of the host. It can contain what `hostname` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use. | keyword |
244-
| host.os.build | OS build information. | keyword |
245-
| host.os.codename | OS codename, if any. | keyword |
246-
| host.os.family | OS family (such as redhat, debian, freebsd, windows). | keyword |
247-
| host.os.kernel | Operating system kernel version as a raw string. | keyword |
248-
| host.os.name | Operating system name, without the version. | keyword |
249-
| host.os.name.text | Multi-field of `host.os.name`. | match_only_text |
250-
| host.os.platform | Operating system platform (such centos, ubuntu, windows). | keyword |
251-
| host.os.version | Operating system version as a raw string. | keyword |
252-
| host.type | Type of host. For Cloud providers this can be the machine type like `t2.medium`. If vm, this could be the container, for example, or other information meaningful in your environment. | keyword |
253-
| service.type | The type of the service data is collected from. The type can be used to group and correlate logs and metrics from one service type. Example: If logs or metrics are collected from Elasticsearch, `service.type` would be `elasticsearch`. | keyword |
204+
| Field | Description | Type | Metric Type |
205+
|---|---|---|---|
206+
| @timestamp | Event timestamp. | date | |
207+
| agent.id | Unique identifier of this agent (if one exists). Example: For Beats this would be beat.id. | keyword | |
208+
| aws.\*.metrics.\*.\* | Metrics that returned from Cloudwatch API query. | double | gauge |
209+
| aws.cloudwatch.namespace | The namespace specified when query cloudwatch api. | keyword | |
210+
| aws.dimensions.\* | Metric dimensions. | object | |
211+
| aws.dimensions.fingerprint | Autogenerated ID representing the fingerprint of the aws.dimensions object | keyword | |
212+
| aws.tags.\* | Tag key value pairs from aws resources. | object | |
213+
| cloud | Fields related to the cloud or infrastructure the events are coming from. | group | |
214+
| cloud.account.id | The cloud account or organization id used to identify different entities in a multi-tenant environment. Examples: AWS account id, Google Cloud ORG Id, or other unique identifier. | keyword | |
215+
| cloud.account.name | The cloud account name or alias used to identify different entities in a multi-tenant environment. Examples: AWS account name, Google Cloud ORG display name. | keyword | |
216+
| cloud.availability_zone | Availability zone in which this host, resource, or service is located. | keyword | |
217+
| cloud.image.id | Image ID for the cloud instance. | keyword | |
218+
| cloud.instance.id | Instance ID of the host machine. | keyword | |
219+
| cloud.instance.name | Instance name of the host machine. | keyword | |
220+
| cloud.machine.type | Machine type of the host machine. | keyword | |
221+
| cloud.project.id | The cloud project identifier. Examples: Google Cloud Project id, Azure Project id. | keyword | |
222+
| cloud.provider | Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean. | keyword | |
223+
| cloud.region | Region in which this host, resource, or service is located. | keyword | |
224+
| container.id | Unique container id. | keyword | |
225+
| container.image.name | Name of the image the container was built on. | keyword | |
226+
| container.labels | Image labels. | object | |
227+
| container.name | Container name. | keyword | |
228+
| data_stream.dataset | Data stream dataset. | constant_keyword | |
229+
| data_stream.namespace | Data stream namespace. | constant_keyword | |
230+
| data_stream.type | Data stream type. | constant_keyword | |
231+
| ecs.version | ECS version this event conforms to. `ecs.version` is a required field and must exist in all events. When querying across multiple indices -- which may conform to slightly different ECS versions -- this field lets integrations adjust to the schema version of the events. | keyword | |
232+
| error | These fields can represent errors of any kind. Use them for errors that happen while fetching events or in cases where the event itself contains an error. | group | |
233+
| error.message | Error message. | match_only_text | |
234+
| event.dataset | Event dataset | constant_keyword | |
235+
| event.module | Event module | constant_keyword | |
236+
| host.architecture | Operating system architecture. | keyword | |
237+
| host.containerized | If the host is a container. | boolean | |
238+
| host.domain | Name of the domain of which the host is a member. For example, on Windows this could be the host's Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host's LDAP provider. | keyword | |
239+
| host.hostname | Hostname of the host. It normally contains what the `hostname` command returns on the host machine. | keyword | |
240+
| host.id | Unique host id. As hostname is not always unique, use values that are meaningful in your environment. Example: The current usage of `beat.name`. | keyword | |
241+
| host.ip | Host ip addresses. | ip | |
242+
| host.mac | Host MAC addresses. The notation format from RFC 7042 is suggested: Each octet (that is, 8-bit byte) is represented by two [uppercase] hexadecimal digits giving the value of the octet as an unsigned integer. Successive octets are separated by a hyphen. | keyword | |
243+
| host.name | Name of the host. It can contain what `hostname` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use. | keyword | |
244+
| host.os.build | OS build information. | keyword | |
245+
| host.os.codename | OS codename, if any. | keyword | |
246+
| host.os.family | OS family (such as redhat, debian, freebsd, windows). | keyword | |
247+
| host.os.kernel | Operating system kernel version as a raw string. | keyword | |
248+
| host.os.name | Operating system name, without the version. | keyword | |
249+
| host.os.name.text | Multi-field of `host.os.name`. | match_only_text | |
250+
| host.os.platform | Operating system platform (such centos, ubuntu, windows). | keyword | |
251+
| host.os.version | Operating system version as a raw string. | keyword | |
252+
| host.type | Type of host. For Cloud providers this can be the machine type like `t2.medium`. If vm, this could be the container, for example, or other information meaningful in your environment. | keyword | |
253+
| service.type | The type of the service data is collected from. The type can be used to group and correlate logs and metrics from one service type. Example: If logs or metrics are collected from Elasticsearch, `service.type` would be `elasticsearch`. | keyword | |
254254

‎packages/aws/manifest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: 1.0.0
22
name: aws
33
title: AWS
4-
version: 1.50.5
4+
version: 1.50.6
55
license: basic
66
description: Collect logs and metrics from Amazon Web Services (AWS) with Elastic Agent.
77
type: integration

0 commit comments

Comments
 (0)