From 0c9d2b2f4777798eca34b3cb847f17a17271b94f Mon Sep 17 00:00:00 2001 From: kaiyan-sheng Date: Fri, 25 Oct 2019 07:12:39 -0600 Subject: [PATCH] Cherry-pick #14114 to 7.5: [Metricbeat] Release cloudwatch, s3, sqs, rds as GA (#14166) * [Metricbeat] Release cloudwatch, s3, sqs, rds as GA (#14114) * Release cloudwatch, s3, sqs, rds as GA (cherry picked from commit be6b124766e3f63002075e6a5a53161207b66cb2) --- CHANGELOG.next.asciidoc | 1 + metricbeat/docs/modules/aws/cloudwatch.asciidoc | 2 -- metricbeat/docs/modules/aws/rds.asciidoc | 2 -- metricbeat/docs/modules/aws/s3_daily_storage.asciidoc | 2 -- metricbeat/docs/modules/aws/s3_request.asciidoc | 2 -- metricbeat/docs/modules/aws/sqs.asciidoc | 2 -- metricbeat/docs/modules_list.asciidoc | 10 +++++----- .../metricbeat/module/aws/cloudwatch/_meta/fields.yml | 2 +- x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go | 2 -- x-pack/metricbeat/module/aws/fields.go | 2 +- x-pack/metricbeat/module/aws/rds/_meta/fields.yml | 2 +- .../module/aws/s3_daily_storage/_meta/fields.yml | 2 +- .../module/aws/s3_daily_storage/s3_daily_storage.go | 3 --- .../metricbeat/module/aws/s3_request/_meta/fields.yml | 2 +- x-pack/metricbeat/module/aws/s3_request/s3_request.go | 3 --- x-pack/metricbeat/module/aws/sqs/_meta/fields.yml | 2 +- x-pack/metricbeat/module/aws/sqs/sqs.go | 3 --- 17 files changed, 12 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 72d210be343..6cf5951ba37 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -97,6 +97,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d *Metricbeat* +- Release cloudwatch, s3_daily_storage, s3_request, sqs and rds metricset as GA. {pull}14114[14114] {issue}14059[14059] *Packetbeat* diff --git a/metricbeat/docs/modules/aws/cloudwatch.asciidoc b/metricbeat/docs/modules/aws/cloudwatch.asciidoc index 1cc8ed82854..7fb2a68ea4d 100644 --- a/metricbeat/docs/modules/aws/cloudwatch.asciidoc +++ b/metricbeat/docs/modules/aws/cloudwatch.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-metricset-aws-cloudwatch]] === aws cloudwatch metricset -beta[] - include::../../../../x-pack/metricbeat/module/aws/cloudwatch/_meta/docs.asciidoc[] This is a default metricset. If the host module is unconfigured, this metricset is enabled by default. diff --git a/metricbeat/docs/modules/aws/rds.asciidoc b/metricbeat/docs/modules/aws/rds.asciidoc index c358ae16ffb..c4564faaf96 100644 --- a/metricbeat/docs/modules/aws/rds.asciidoc +++ b/metricbeat/docs/modules/aws/rds.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-metricset-aws-rds]] === aws rds metricset -beta[] - include::../../../../x-pack/metricbeat/module/aws/rds/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/aws/s3_daily_storage.asciidoc b/metricbeat/docs/modules/aws/s3_daily_storage.asciidoc index 0d7440e0469..de7a74d7e8b 100644 --- a/metricbeat/docs/modules/aws/s3_daily_storage.asciidoc +++ b/metricbeat/docs/modules/aws/s3_daily_storage.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-metricset-aws-s3_daily_storage]] === aws s3_daily_storage metricset -beta[] - include::../../../../x-pack/metricbeat/module/aws/s3_daily_storage/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/aws/s3_request.asciidoc b/metricbeat/docs/modules/aws/s3_request.asciidoc index 3815c2c5d57..131a720589d 100644 --- a/metricbeat/docs/modules/aws/s3_request.asciidoc +++ b/metricbeat/docs/modules/aws/s3_request.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-metricset-aws-s3_request]] === aws s3_request metricset -beta[] - include::../../../../x-pack/metricbeat/module/aws/s3_request/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/aws/sqs.asciidoc b/metricbeat/docs/modules/aws/sqs.asciidoc index dcf0eaad057..8fa5a2120fb 100644 --- a/metricbeat/docs/modules/aws/sqs.asciidoc +++ b/metricbeat/docs/modules/aws/sqs.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go [[metricbeat-metricset-aws-sqs]] === aws sqs metricset -beta[] - include::../../../../x-pack/metricbeat/module/aws/sqs/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index a9687d00e33..49837f80067 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -12,14 +12,14 @@ This file is generated! See scripts/mage/docs_collector.go |<> beta[] |image:./images/icon-no.png[No prebuilt dashboards] | .1+| .1+| |<> beta[] |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | -.8+| .8+| |<> beta[] +.8+| .8+| |<> |<> beta[] |<> |<> beta[] -|<> beta[] -|<> beta[] -|<> beta[] -|<> beta[] +|<> +|<> +|<> +|<> |<> beta[] |image:./images/icon-yes.png[Prebuilt dashboards are available] | .3+| .3+| |<> beta[] |<> beta[] diff --git a/x-pack/metricbeat/module/aws/cloudwatch/_meta/fields.yml b/x-pack/metricbeat/module/aws/cloudwatch/_meta/fields.yml index a8db428508a..e23c34ef212 100644 --- a/x-pack/metricbeat/module/aws/cloudwatch/_meta/fields.yml +++ b/x-pack/metricbeat/module/aws/cloudwatch/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > `cloudwatch` contains the metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by different namespaces. - release: beta + release: ga fields: - name: namespace type: keyword diff --git a/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go b/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go index a0502bb86ee..431ac4a66ff 100644 --- a/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go +++ b/x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go @@ -17,7 +17,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/resourcegroupstaggingapi/resourcegroupstaggingapiiface" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/x-pack/metricbeat/module/aws" ) @@ -91,7 +90,6 @@ type namespaceDetail struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The aws cloudwatch metricset is beta.") metricSet, err := aws.NewMetricSet(base) if err != nil { return nil, errors.Wrap(err, "error creating aws metricset") diff --git a/x-pack/metricbeat/module/aws/fields.go b/x-pack/metricbeat/module/aws/fields.go index e1e79f007c3..daebf23a4af 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/rds/_meta/fields.yml b/x-pack/metricbeat/module/aws/rds/_meta/fields.yml index 06149c98c2a..00d2fef0fbd 100644 --- a/x-pack/metricbeat/module/aws/rds/_meta/fields.yml +++ b/x-pack/metricbeat/module/aws/rds/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > `rds` contains the metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS RDS. - release: beta + release: ga fields: - name: cpu.total.pct type: scaled_float 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 48f06748f0f..0e7e3146e7b 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 @@ -2,7 +2,7 @@ type: group description: > `s3_daily_storage` contains the daily storage metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS S3. - release: beta + release: ga fields: - name: bucket.size.bytes type: long 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 934a9100a19..de9d2574380 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 @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/x-pack/metricbeat/module/aws" ) @@ -39,8 +38,6 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The aws s3_daily_storage metricset is beta.") - moduleConfig := aws.Config{} if err := base.Module().UnpackConfig(&moduleConfig); err != nil { return nil, err 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 cb911fc8423..9f78ebf3d8b 100644 --- a/x-pack/metricbeat/module/aws/s3_request/_meta/fields.yml +++ b/x-pack/metricbeat/module/aws/s3_request/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > `s3_request` contains request metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS S3. - release: beta + release: ga fields: - name: requests.total type: long 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 40e4392e1af..5474cbc0117 100644 --- a/x-pack/metricbeat/module/aws/s3_request/s3_request.go +++ b/x-pack/metricbeat/module/aws/s3_request/s3_request.go @@ -13,7 +13,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/x-pack/metricbeat/module/aws" ) @@ -39,8 +38,6 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The aws s3_request metricset is beta.") - moduleConfig := aws.Config{} if err := base.Module().UnpackConfig(&moduleConfig); err != nil { return nil, err diff --git a/x-pack/metricbeat/module/aws/sqs/_meta/fields.yml b/x-pack/metricbeat/module/aws/sqs/_meta/fields.yml index 708c856b20e..bc20fc16db3 100644 --- a/x-pack/metricbeat/module/aws/sqs/_meta/fields.yml +++ b/x-pack/metricbeat/module/aws/sqs/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > `sqs` contains the metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS SQS. - release: beta + release: ga fields: - name: oldest_message_age.sec type: long diff --git a/x-pack/metricbeat/module/aws/sqs/sqs.go b/x-pack/metricbeat/module/aws/sqs/sqs.go index 018c01b77d0..5e70cdb0b1b 100644 --- a/x-pack/metricbeat/module/aws/sqs/sqs.go +++ b/x-pack/metricbeat/module/aws/sqs/sqs.go @@ -16,7 +16,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/sqs/sqsiface" "github.com/pkg/errors" - "github.com/elastic/beats/libbeat/common/cfgwarn" s "github.com/elastic/beats/libbeat/common/schema" "github.com/elastic/beats/metricbeat/mb" "github.com/elastic/beats/x-pack/metricbeat/module/aws" @@ -43,8 +42,6 @@ type MetricSet struct { // New creates a new instance of the MetricSet. New is responsible for unpacking // any MetricSet specific configuration options if there are any. func New(base mb.BaseMetricSet) (mb.MetricSet, error) { - cfgwarn.Beta("The aws sqs metricset is beta.") - metricSet, err := aws.NewMetricSet(base) if err != nil { return nil, errors.Wrap(err, "error creating aws metricset")