From 102302b4575b298ddf488926a64879c190e7cf2c Mon Sep 17 00:00:00 2001 From: kaiyan-sheng Date: Fri, 13 Sep 2019 09:16:17 -0600 Subject: [PATCH] [Metricbeat] Add bucket name to aws.s3.bucket.name (#13581) * Add bucket name to aws.s3.bucket.name * Remove old bucket name fields * Update s3 bucket name field in dashboard * Change visualization version back to 7.0.0 --- metricbeat/docs/fields.asciidoc | 30 ++++------- x-pack/metricbeat/module/aws/_meta/fields.yml | 4 ++ .../dashboard/Metricbeat-aws-s3-overview.json | 52 +++++++++---------- x-pack/metricbeat/module/aws/fields.go | 2 +- .../aws/s3_daily_storage/_meta/data.json | 13 +++-- .../aws/s3_daily_storage/_meta/fields.yml | 4 -- .../aws/s3_daily_storage/s3_daily_storage.go | 2 +- .../module/aws/s3_request/_meta/data.json | 28 +++++----- .../module/aws/s3_request/_meta/fields.yml | 4 -- .../module/aws/s3_request/s3_request.go | 2 +- 10 files changed, 67 insertions(+), 74 deletions(-) diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index c47c93f6772..b26d573ee0e 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -844,6 +844,16 @@ type: object -- +*`aws.s3.bucket.name`*:: ++ +-- +Name of a S3 bucket. + + +type: keyword + +-- + [float] === cloudwatch @@ -1784,16 +1794,6 @@ type: long -*`aws.s3_daily_storage.bucket.name`*:: -+ --- -Name of a S3 bucket. - - -type: keyword - --- - *`aws.s3_daily_storage.bucket.size.bytes`*:: + -- @@ -1823,16 +1823,6 @@ type: long -*`aws.s3_request.bucket.name`*:: -+ --- -Name of a S3 bucket. - - -type: keyword - --- - *`aws.s3_request.requests.total`*:: + -- diff --git a/x-pack/metricbeat/module/aws/_meta/fields.yml b/x-pack/metricbeat/module/aws/_meta/fields.yml index 3dd24aa3082..671af1173e8 100644 --- a/x-pack/metricbeat/module/aws/_meta/fields.yml +++ b/x-pack/metricbeat/module/aws/_meta/fields.yml @@ -14,3 +14,7 @@ object_type_mapping_type: "*" description: > Tag key value pairs from aws resources. + - name: s3.bucket.name + type: keyword + description: > + Name of a S3 bucket. diff --git a/x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-s3-overview.json b/x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-s3-overview.json index f2ab926575d..d69c483c42a 100644 --- a/x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-s3-overview.json +++ b/x-pack/metricbeat/module/aws/_meta/kibana/7/dashboard/Metricbeat-aws-s3-overview.json @@ -29,7 +29,7 @@ }, "panelIndex": "1", "panelRefName": "panel_0", - "version": "7.0.0-beta1" + "version": "7.4.0" }, { "embeddableConfig": {}, @@ -42,7 +42,7 @@ }, "panelIndex": "2", "panelRefName": "panel_1", - "version": "7.0.0-beta1" + "version": "7.4.0" }, { "embeddableConfig": {}, @@ -55,7 +55,7 @@ }, "panelIndex": "3", "panelRefName": "panel_2", - "version": "7.0.0-beta1" + "version": "7.4.0" }, { "embeddableConfig": {}, @@ -68,7 +68,7 @@ }, "panelIndex": "4", "panelRefName": "panel_3", - "version": "7.0.0-beta1" + "version": "7.4.0" }, { "embeddableConfig": {}, @@ -81,7 +81,7 @@ }, "panelIndex": "5", "panelRefName": "panel_4", - "version": "7.0.0-beta1" + "version": "7.4.0" }, { "embeddableConfig": {}, @@ -94,7 +94,7 @@ }, "panelIndex": "6", "panelRefName": "panel_5", - "version": "7.0.0-beta1" + "version": "7.4.0" }, { "embeddableConfig": {}, @@ -107,7 +107,7 @@ }, "panelIndex": "7", "panelRefName": "panel_6", - "version": "7.0.0-beta1" + "version": "7.4.0" } ], "timeRestore": false, @@ -116,7 +116,7 @@ }, "id": "a096b830-4762-11e9-8062-c98a86cb6f94", "migrationVersion": { - "dashboard": "7.0.0" + "dashboard": "7.3.0" }, "references": [ { @@ -156,8 +156,8 @@ } ], "type": "dashboard", - "updated_at": "2019-03-15T20:56:09.373Z", - "version": "WzkyNCw3XQ==" + "updated_at": "2019-09-12T21:18:24.987Z", + "version": "Wzc3NjAsN10=" }, { "attributes": { @@ -242,8 +242,8 @@ }, "references": [], "type": "visualization", - "updated_at": "2019-03-15T20:23:22.120Z", - "version": "WzkxMSw3XQ==" + "updated_at": "2019-09-12T21:13:42.937Z", + "version": "Wzc0MzQsN10=" }, { "attributes": { @@ -320,8 +320,8 @@ }, "references": [], "type": "visualization", - "updated_at": "2019-03-15T20:30:52.573Z", - "version": "WzkxMyw3XQ==" + "updated_at": "2019-09-12T21:13:42.937Z", + "version": "Wzc0MzUsN10=" }, { "attributes": { @@ -413,8 +413,8 @@ }, "references": [], "type": "visualization", - "updated_at": "2019-03-15T20:37:36.827Z", - "version": "WzkxNCw3XQ==" + "updated_at": "2019-09-12T21:13:42.937Z", + "version": "Wzc0MzYsN10=" }, { "attributes": { @@ -488,8 +488,8 @@ }, "references": [], "type": "visualization", - "updated_at": "2019-03-15T20:40:02.231Z", - "version": "WzkxNSw3XQ==" + "updated_at": "2019-09-12T21:13:42.937Z", + "version": "Wzc0MzcsN10=" }, { "attributes": { @@ -563,8 +563,8 @@ }, "references": [], "type": "visualization", - "updated_at": "2019-03-15T20:40:17.936Z", - "version": "WzkxNiw3XQ==" + "updated_at": "2019-09-12T21:13:42.937Z", + "version": "Wzc0MzgsN10=" }, { "attributes": { @@ -601,7 +601,7 @@ "type": "list" }, { - "fieldName": "aws.s3_request.bucket.name", + "fieldName": "aws.s3.bucket.name", "id": "1549512142947", "indexPattern": "metricbeat-*", "label": "s3 bucket name", @@ -630,8 +630,8 @@ }, "references": [], "type": "visualization", - "updated_at": "2019-03-15T20:47:17.880Z", - "version": "WzkyMCw3XQ==" + "updated_at": "2019-09-12T21:18:08.498Z", + "version": "Wzc3NTgsN10=" }, { "attributes": { @@ -709,9 +709,9 @@ }, "references": [], "type": "visualization", - "updated_at": "2019-03-15T20:55:49.785Z", - "version": "WzkyMyw3XQ==" + "updated_at": "2019-09-12T21:13:42.937Z", + "version": "Wzc0NDAsN10=" } ], - "version": "7.0.0-beta1" + "version": "7.4.0" } diff --git a/x-pack/metricbeat/module/aws/fields.go b/x-pack/metricbeat/module/aws/fields.go index 8a8ecaadb5c..abfe6e2a28c 100644 --- a/x-pack/metricbeat/module/aws/fields.go +++ b/x-pack/metricbeat/module/aws/fields.go @@ -19,5 +19,5 @@ func init() { // AssetAws returns asset data. // This is the base64 encoded gzipped contents of module/aws. func AssetAws() string { - return "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" + return "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" } diff --git a/x-pack/metricbeat/module/aws/s3_daily_storage/_meta/data.json b/x-pack/metricbeat/module/aws/s3_daily_storage/_meta/data.json index 3c5316dd961..3d77ee5600b 100644 --- a/x-pack/metricbeat/module/aws/s3_daily_storage/_meta/data.json +++ b/x-pack/metricbeat/module/aws/s3_daily_storage/_meta/data.json @@ -1,14 +1,18 @@ { "@timestamp": "2017-10-12T08:05:34.853Z", "aws": { + "s3": { + "bucket": { + "name": "test-s3-ks-2" + } + }, "s3_daily_storage": { "bucket": { - "name": "test-s3-ks-2", "size": { - "bytes": 256 + "bytes": 51665 } }, - "number_of_objects": 8 + "number_of_objects": 51 } }, "cloud": { @@ -21,7 +25,8 @@ "module": "aws" }, "metricset": { - "name": "s3_daily_storage" + "name": "s3_daily_storage", + "period": 10000 }, "service": { "type": "aws" diff --git a/x-pack/metricbeat/module/aws/s3_daily_storage/_meta/fields.yml b/x-pack/metricbeat/module/aws/s3_daily_storage/_meta/fields.yml index 06c315e2cb2..48f06748f0f 100644 --- a/x-pack/metricbeat/module/aws/s3_daily_storage/_meta/fields.yml +++ b/x-pack/metricbeat/module/aws/s3_daily_storage/_meta/fields.yml @@ -4,10 +4,6 @@ `s3_daily_storage` contains the daily storage metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS S3. release: beta fields: - - name: bucket.name - type: keyword - description: > - Name of a S3 bucket. - name: bucket.size.bytes type: long format: bytes diff --git a/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage.go b/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage.go index bdecffd2458..4dd8f225454 100644 --- a/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage.go +++ b/x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage.go @@ -212,7 +212,7 @@ func createCloudWatchEvents(outputs []cloudwatch.MetricDataResult, regionName st return } - resultMetricSetFields.Put("bucket.name", bucketName) event.MetricSetFields = resultMetricSetFields + event.RootFields.Put("aws.s3.bucket.name", bucketName) return } diff --git a/x-pack/metricbeat/module/aws/s3_request/_meta/data.json b/x-pack/metricbeat/module/aws/s3_request/_meta/data.json index 20fee5447c6..d9c41121110 100644 --- a/x-pack/metricbeat/module/aws/s3_request/_meta/data.json +++ b/x-pack/metricbeat/module/aws/s3_request/_meta/data.json @@ -1,31 +1,32 @@ { "@timestamp": "2017-10-12T08:05:34.853Z", "aws": { - "s3_request": { + "s3": { "bucket": { "name": "test-s3-ks-2" - }, + } + }, + "s3_request": { "downloaded": { - "bytes": 123653 + "bytes": 22307 }, "errors": { "4xx": 0, "5xx": 0 }, "latency": { - "first_byte.ms": 7975, - "total_request.ms": 9005 + "first_byte.ms": 851, + "total_request.ms": 1146 }, "requests": { - "delete": 2, - "get": 80, - "head": 3, - "list": 37, - "put": 34, - "total": 156 + "get": 2, + "head": 1, + "list": 2, + "put": 3, + "total": 8 }, "uploaded": { - "bytes": 2644 + "bytes": 5557 } } }, @@ -39,7 +40,8 @@ "module": "aws" }, "metricset": { - "name": "s3_request" + "name": "s3_request", + "period": 10000 }, "service": { "type": "aws" diff --git a/x-pack/metricbeat/module/aws/s3_request/_meta/fields.yml b/x-pack/metricbeat/module/aws/s3_request/_meta/fields.yml index 70380bd36b8..cb911fc8423 100644 --- a/x-pack/metricbeat/module/aws/s3_request/_meta/fields.yml +++ b/x-pack/metricbeat/module/aws/s3_request/_meta/fields.yml @@ -4,10 +4,6 @@ `s3_request` contains request metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS S3. release: beta fields: - - name: bucket.name - type: keyword - description: > - Name of a S3 bucket. - name: requests.total type: long description: > diff --git a/x-pack/metricbeat/module/aws/s3_request/s3_request.go b/x-pack/metricbeat/module/aws/s3_request/s3_request.go index 046633050f0..cb709fedba5 100644 --- a/x-pack/metricbeat/module/aws/s3_request/s3_request.go +++ b/x-pack/metricbeat/module/aws/s3_request/s3_request.go @@ -214,7 +214,7 @@ func createS3RequestEvents(outputs []cloudwatch.MetricDataResult, regionName str return } - resultMetricSetFields.Put("bucket.name", bucketName) event.MetricSetFields = resultMetricSetFields + event.RootFields.Put("aws.s3.bucket.name", bucketName) return }