diff --git a/packages/aws/changelog.yml b/packages/aws/changelog.yml index bf20780ca6..02f1c1c9d8 100644 --- a/packages/aws/changelog.yml +++ b/packages/aws/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.19.3" + changes: + - description: Update sample_event.json in kinesis data stream + type: bugfix + link: https://github.com/elastic/integrations/pull/3874 - version: "1.19.2" changes: - description: Move NATGateway metrics config from beats to integrations diff --git a/packages/aws/data_stream/kinesis/fields/agent.yml b/packages/aws/data_stream/kinesis/fields/agent.yml index 8603c3c91e..9ea4c73e97 100644 --- a/packages/aws/data_stream/kinesis/fields/agent.yml +++ b/packages/aws/data_stream/kinesis/fields/agent.yml @@ -5,52 +5,6 @@ footnote: 'Examples: If Metricbeat is running on an EC2 host and fetches data from its host, the cloud info contains the data about this machine. If Metricbeat runs on a remote machine outside the cloud and fetches data from a service running in the cloud, the field contains cloud data from the machine the service is running on.' type: group fields: - - name: account.id - level: extended - type: keyword - ignore_above: 1024 - description: '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.' - example: 666777888999 - - name: availability_zone - level: extended - type: keyword - ignore_above: 1024 - description: Availability zone in which this host is running. - example: us-east-1c - - name: instance.id - level: extended - type: keyword - ignore_above: 1024 - description: Instance ID of the host machine. - example: i-1234567890abcdef0 - - name: instance.name - level: extended - type: keyword - ignore_above: 1024 - description: Instance name of the host machine. - - name: machine.type - level: extended - type: keyword - ignore_above: 1024 - description: Machine type of the host machine. - example: t2.medium - - name: provider - level: extended - type: keyword - ignore_above: 1024 - description: Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean. - example: aws - - name: region - level: extended - type: keyword - ignore_above: 1024 - description: Region in which this host is running. - example: us-east-1 - - name: project.id - type: keyword - description: Name of the project in Google Cloud. - name: image.id type: keyword description: Image ID for the cloud instance. @@ -67,21 +21,6 @@ type: keyword ignore_above: 1024 description: Unique container id. - - name: image.name - level: extended - type: keyword - ignore_above: 1024 - description: Name of the image the container was built on. - - name: labels - level: extended - type: object - object_type: keyword - description: Image labels. - - name: name - level: extended - type: keyword - ignore_above: 1024 - description: Container name. - name: host title: Host group: 2 @@ -90,95 +29,6 @@ ECS host.* fields should be populated with details about the host on which the event happened, or from which the measurement was taken. Host types include hardware, virtual machines, Docker containers, and Kubernetes nodes.' type: group fields: - - name: architecture - level: core - type: keyword - ignore_above: 1024 - description: Operating system architecture. - example: x86_64 - - name: domain - level: extended - type: keyword - ignore_above: 1024 - description: '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.' - example: CONTOSO - default_field: false - - name: hostname - level: core - type: keyword - ignore_above: 1024 - description: 'Hostname of the host. - - It normally contains what the `hostname` command returns on the host machine.' - - name: id - level: core - type: keyword - ignore_above: 1024 - description: 'Unique host id. - - As hostname is not always unique, use values that are meaningful in your environment. - - Example: The current usage of `beat.name`.' - - name: ip - level: core - type: ip - description: Host ip addresses. - - name: mac - level: core - type: keyword - ignore_above: 1024 - description: Host mac addresses. - - name: name - level: core - type: keyword - ignore_above: 1024 - description: '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.' - - name: os.family - level: extended - type: keyword - ignore_above: 1024 - description: OS family (such as redhat, debian, freebsd, windows). - example: debian - - name: os.kernel - level: extended - type: keyword - ignore_above: 1024 - description: Operating system kernel version as a raw string. - example: 4.4.0-112-generic - - name: os.name - level: extended - type: keyword - ignore_above: 1024 - multi_fields: - - name: text - type: text - norms: false - default_field: false - description: Operating system name, without the version. - example: Mac OS X - - name: os.platform - level: extended - type: keyword - ignore_above: 1024 - description: Operating system platform (such centos, ubuntu, windows). - example: darwin - - name: os.version - level: extended - type: keyword - ignore_above: 1024 - description: Operating system version as a raw string. - example: 10.14.1 - - name: type - level: core - type: keyword - ignore_above: 1024 - description: '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.' - name: containerized type: boolean description: > diff --git a/packages/aws/data_stream/kinesis/fields/ecs.yml b/packages/aws/data_stream/kinesis/fields/ecs.yml index 83e3f6f122..b7e568f94b 100644 --- a/packages/aws/data_stream/kinesis/fields/ecs.yml +++ b/packages/aws/data_stream/kinesis/fields/ecs.yml @@ -8,12 +8,22 @@ name: cloud.availability_zone - external: ecs name: cloud.instance.id +- external: ecs + name: cloud.instance.name - external: ecs name: cloud.machine.type +- external: ecs + name: cloud.project.id - external: ecs name: cloud.provider - external: ecs name: cloud.region +- external: ecs + name: container.image.name +- external: ecs + name: container.labels +- external: ecs + name: container.name - external: ecs name: ecs.version - external: ecs @@ -22,3 +32,29 @@ name: error.message - external: ecs name: service.type +- external: ecs + name: host.architecture +- external: ecs + name: host.domain +- external: ecs + name: host.hostname +- external: ecs + name: host.id +- external: ecs + name: host.ip +- external: ecs + name: host.mac +- external: ecs + name: host.name +- external: ecs + name: host.os.family +- external: ecs + name: host.os.kernel +- external: ecs + name: host.os.name +- external: ecs + name: host.os.platform +- external: ecs + name: host.os.version +- external: ecs + name: host.type diff --git a/packages/aws/data_stream/kinesis/sample_event.json b/packages/aws/data_stream/kinesis/sample_event.json index 833418c2eb..dec427115e 100644 --- a/packages/aws/data_stream/kinesis/sample_event.json +++ b/packages/aws/data_stream/kinesis/sample_event.json @@ -1,17 +1,40 @@ { - "@timestamp": "2017-10-12T08:05:34.853Z", + "@timestamp": "2022-07-27T20:56:00.000Z", "agent": { "name": "docker-fleet-agent", - "id": "24d50340-a9d0-4d5d-9f42-fe9cb4b8c95d", + "id": "2d4b09d0-cdb6-445e-ac3f-6415f87b9864", + "ephemeral_id": "51866723-6dfa-4a72-a68e-f439d5de7f53", "type": "metricbeat", - "ephemeral_id": "f8282deb-ebc7-4d1f-9386-207f56657244", - "version": "8.2.0" + "version": "8.3.2" }, "elastic_agent": { - "id": "24d50340-a9d0-4d5d-9f42-fe9cb4b8c95d", - "version": "8.2.0", + "id": "2d4b09d0-cdb6-445e-ac3f-6415f87b9864", + "version": "8.3.2", "snapshot": false }, + "cloud": { + "provider": "aws", + "region": "us-east-1", + "account": { + "name": "elastic-beats", + "id": "428152502467" + } + }, + "ecs": { + "version": "8.0.0" + }, + "data_stream": { + "namespace": "default", + "type": "metrics", + "dataset": "aws.kinesis" + }, + "service": { + "type": "aws" + }, + "metricset": { + "period": 300000, + "name": "cloudwatch" + }, "aws": { "cloudwatch": { "namespace": "AWS/Kinesis" @@ -42,31 +65,11 @@ } } }, - "cloud": { - "account": { - "id": "428152502467", - "name": "elastic-beats" - }, - "provider": "aws", - "region": "us-west-1" - }, - "data_stream": { - "namespace": "default", - "type": "metrics", - "dataset": "aws.kinesis" - }, "event": { - "dataset": "aws.kinesis", - "duration": 115000, - "module": "aws", + "duration": 10483932100, "agent_id_status": "verified", - "ingested": "2022-05-26T12:44:52Z" - }, - "metricset": { - "name": "kinesis", - "period": 10000 - }, - "service": { - "type": "aws" + "ingested": "2022-07-27T20:56:00.000Z", + "module": "aws", + "dataset": "aws.kinesis" } } \ No newline at end of file diff --git a/packages/aws/docs/kinesis.md b/packages/aws/docs/kinesis.md index 2f06ca1a14..f58bdaf555 100644 --- a/packages/aws/docs/kinesis.md +++ b/packages/aws/docs/kinesis.md @@ -6,19 +6,42 @@ An example event for `kinesis` looks as following: ```json { - "@timestamp": "2017-10-12T08:05:34.853Z", + "@timestamp": "2022-07-27T20:56:00.000Z", "agent": { "name": "docker-fleet-agent", - "id": "24d50340-a9d0-4d5d-9f42-fe9cb4b8c95d", + "id": "2d4b09d0-cdb6-445e-ac3f-6415f87b9864", + "ephemeral_id": "51866723-6dfa-4a72-a68e-f439d5de7f53", "type": "metricbeat", - "ephemeral_id": "f8282deb-ebc7-4d1f-9386-207f56657244", - "version": "8.2.0" + "version": "8.3.2" }, "elastic_agent": { - "id": "24d50340-a9d0-4d5d-9f42-fe9cb4b8c95d", - "version": "8.2.0", + "id": "2d4b09d0-cdb6-445e-ac3f-6415f87b9864", + "version": "8.3.2", "snapshot": false }, + "cloud": { + "provider": "aws", + "region": "us-east-1", + "account": { + "name": "elastic-beats", + "id": "428152502467" + } + }, + "ecs": { + "version": "8.0.0" + }, + "data_stream": { + "namespace": "default", + "type": "metrics", + "dataset": "aws.kinesis" + }, + "service": { + "type": "aws" + }, + "metricset": { + "period": 300000, + "name": "cloudwatch" + }, "aws": { "cloudwatch": { "namespace": "AWS/Kinesis" @@ -49,32 +72,12 @@ An example event for `kinesis` looks as following: } } }, - "cloud": { - "account": { - "id": "428152502467", - "name": "elastic-beats" - }, - "provider": "aws", - "region": "us-west-1" - }, - "data_stream": { - "namespace": "default", - "type": "metrics", - "dataset": "aws.kinesis" - }, "event": { - "dataset": "aws.kinesis", - "duration": 115000, - "module": "aws", + "duration": 10483932100, "agent_id_status": "verified", - "ingested": "2022-05-26T12:44:52Z" - }, - "metricset": { - "name": "kinesis", - "period": 10000 - }, - "service": { - "type": "aws" + "ingested": "2022-07-27T20:56:00.000Z", + "module": "aws", + "dataset": "aws.kinesis" } } ``` @@ -122,7 +125,7 @@ An example event for `kinesis` looks as following: | cloud.instance.id | Instance ID of the host machine. | keyword | | cloud.instance.name | Instance name of the host machine. | keyword | | cloud.machine.type | Machine type of the host machine. | keyword | -| cloud.project.id | Name of the project in Google Cloud. | keyword | +| cloud.project.id | The cloud project identifier. Examples: Google Cloud Project id, Azure Project id. | keyword | | cloud.provider | Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean. | keyword | | cloud.region | Region in which this host, resource, or service is located. | keyword | | container.id | Unique container id. | keyword | @@ -146,7 +149,7 @@ An example event for `kinesis` looks as following: | host.hostname | Hostname of the host. It normally contains what the `hostname` command returns on the host machine. | keyword | | 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 | | host.ip | Host ip addresses. | ip | -| host.mac | Host mac addresses. | keyword | +| 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 | | 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 | | host.network.in.bytes | The number of bytes received on all network interfaces by the host in a given period of time. | long | | host.network.in.packets | The number of packets received on all network interfaces by the host in a given period of time. | long | @@ -157,7 +160,7 @@ An example event for `kinesis` looks as following: | host.os.family | OS family (such as redhat, debian, freebsd, windows). | keyword | | host.os.kernel | Operating system kernel version as a raw string. | keyword | | host.os.name | Operating system name, without the version. | keyword | -| host.os.name.text | Multi-field of `host.os.name`. | text | +| host.os.name.text | Multi-field of `host.os.name`. | match_only_text | | host.os.platform | Operating system platform (such centos, ubuntu, windows). | keyword | | host.os.version | Operating system version as a raw string. | keyword | | 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 | diff --git a/packages/aws/manifest.yml b/packages/aws/manifest.yml index df019110e9..e9c7e868b8 100644 --- a/packages/aws/manifest.yml +++ b/packages/aws/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: aws title: AWS -version: 1.19.2 +version: 1.19.3 license: basic description: Collect logs and metrics from Amazon Web Services with Elastic Agent. type: integration