From f5191cb3fd16546b60660b8df139dd0debf2f7f0 Mon Sep 17 00:00:00 2001 From: mtojek Date: Mon, 18 Jan 2021 17:09:19 +0100 Subject: [PATCH] Fix --- .../aws/data_stream/sns/sample_event.json | 114 +++++++---------- test/packages/aws/docs/README.md | 116 +++++++----------- 2 files changed, 87 insertions(+), 143 deletions(-) diff --git a/test/packages/aws/data_stream/sns/sample_event.json b/test/packages/aws/data_stream/sns/sample_event.json index dee8ff18a..802010cd7 100644 --- a/test/packages/aws/data_stream/sns/sample_event.json +++ b/test/packages/aws/data_stream/sns/sample_event.json @@ -1,81 +1,53 @@ { - "_index": "metrics-aws.sns-default-000001", - "_id": "Ds9vXHIBpGMSUzkZmyod", - "_version": 1, - "_score": null, - "_source": { - "@timestamp": "2020-05-28T17:58:27.154Z", - "service": { - "type": "aws" - }, - "stream": { - "dataset": "aws.sns", - "namespace": "default", - "type": "metrics" - }, - "ecs": { - "version": "1.5.0" + "@timestamp": "2020-05-28T17:58:27.154Z", + "data_stream": { + "dataset": "aws.sns", + "namespace": "default", + "type": "metrics" + }, + "aws": { + "dimensions": { + "TopicName": "test-sns-ks" }, - "aws": { - "cloudwatch": { - "namespace": "AWS/SNS" - }, - "dimensions": { - "TopicName": "test-sns-ks" - }, - "sns": { - "metrics": { - "NumberOfMessagesPublished": { - "sum": 1 - }, - "NumberOfNotificationsFailed": { - "sum": 1 - }, - "PublishSize": { - "avg": 5 - } + "sns": { + "metrics": { + "NumberOfMessagesPublished": { + "sum": 1 + }, + "NumberOfNotificationsFailed": { + "sum": 1 + }, + "PublishSize": { + "avg": 5 } - }, - "tags": { - "created-by": "ks" } }, - "event": { - "dataset": "aws.sns", - "module": "aws", - "duration": 10418157072 - }, - "metricset": { - "period": 60000, - "name": "sns" - }, - "cloud": { - "region": "us-west-2", - "account": { - "name": "elastic-beats", - "id": "428152502467" - }, - "provider": "aws" - }, - "agent": { - "version": "8.0.0", - "ephemeral_id": "17803f33-b617-4ce9-a9ac-e218c02aeb4b", - "id": "12f376ef-5186-4e8b-a175-70f1140a8f30", - "name": "MacBook-Elastic.local", - "type": "metricbeat" + "tags": { + "created-by": "ks" } }, - "fields": { - "@timestamp": [ - "2020-05-28T17:58:27.154Z" - ] + "event": { + "dataset": "aws.sns", + "module": "aws", + "duration": 10418157072 }, - "highlight": { - "event.dataset": [ - "@kibana-highlighted-field@aws.sns@/kibana-highlighted-field@" - ] + "metricset": { + "period": 60000, + "name": "sns" + }, + "cloud": { + "region": "us-west-2", + "account": { + "name": "elastic-beats", + "id": "428152502467" + }, + "provider": "aws" }, - "sort": [ - 1590688707154 - ] + "agent": { + "version": "8.0.0", + "ephemeral_id": "17803f33-b617-4ce9-a9ac-e218c02aeb4b", + "id": "12f376ef-5186-4e8b-a175-70f1140a8f30", + "name": "MacBook-Elastic.local", + "type": "metricbeat" + } } \ No newline at end of file diff --git a/test/packages/aws/docs/README.md b/test/packages/aws/docs/README.md index b56db8ed5..5a66b4514 100644 --- a/test/packages/aws/docs/README.md +++ b/test/packages/aws/docs/README.md @@ -2429,85 +2429,57 @@ An example event for `sns` looks as following: ```$json { - "_index": "metrics-aws.sns-default-000001", - "_id": "Ds9vXHIBpGMSUzkZmyod", - "_version": 1, - "_score": null, - "_source": { - "@timestamp": "2020-05-28T17:58:27.154Z", - "service": { - "type": "aws" - }, - "stream": { - "dataset": "aws.sns", - "namespace": "default", - "type": "metrics" - }, - "ecs": { - "version": "1.5.0" - }, - "aws": { - "cloudwatch": { - "namespace": "AWS/SNS" - }, - "dimensions": { - "TopicName": "test-sns-ks" - }, - "sns": { - "metrics": { - "NumberOfMessagesPublished": { - "sum": 1 - }, - "NumberOfNotificationsFailed": { - "sum": 1 - }, - "PublishSize": { - "avg": 5 - } + "@timestamp": "2020-05-28T17:58:27.154Z", + "data_stream": { + "dataset": "aws.sns", + "namespace": "default", + "type": "metrics" + }, + "aws": { + "dimensions": { + "TopicName": "test-sns-ks" + }, + "sns": { + "metrics": { + "NumberOfMessagesPublished": { + "sum": 1 + }, + "NumberOfNotificationsFailed": { + "sum": 1 + }, + "PublishSize": { + "avg": 5 } - }, - "tags": { - "created-by": "ks" } }, - "event": { - "dataset": "aws.sns", - "module": "aws", - "duration": 10418157072 - }, - "metricset": { - "period": 60000, - "name": "sns" - }, - "cloud": { - "region": "us-west-2", - "account": { - "name": "elastic-beats", - "id": "428152502467" - }, - "provider": "aws" - }, - "agent": { - "version": "8.0.0", - "ephemeral_id": "17803f33-b617-4ce9-a9ac-e218c02aeb4b", - "id": "12f376ef-5186-4e8b-a175-70f1140a8f30", - "name": "MacBook-Elastic.local", - "type": "metricbeat" + "tags": { + "created-by": "ks" } }, - "fields": { - "@timestamp": [ - "2020-05-28T17:58:27.154Z" - ] + "event": { + "dataset": "aws.sns", + "module": "aws", + "duration": 10418157072 }, - "highlight": { - "event.dataset": [ - "@kibana-highlighted-field@aws.sns@/kibana-highlighted-field@" - ] + "metricset": { + "period": 60000, + "name": "sns" }, - "sort": [ - 1590688707154 - ] + "cloud": { + "region": "us-west-2", + "account": { + "name": "elastic-beats", + "id": "428152502467" + }, + "provider": "aws" + }, + "agent": { + "version": "8.0.0", + "ephemeral_id": "17803f33-b617-4ce9-a9ac-e218c02aeb4b", + "id": "12f376ef-5186-4e8b-a175-70f1140a8f30", + "name": "MacBook-Elastic.local", + "type": "metricbeat" + } } ```