From ff34b73555e5a6d98c90e9da8e18207f874dc36c Mon Sep 17 00:00:00 2001 From: kaiyan-sheng Date: Wed, 8 Apr 2020 15:22:21 -0600 Subject: [PATCH 1/2] allow empty region/zone config param for storage metricset --- .../metricbeat/module/googlecloud/stackdriver/metricset.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/x-pack/metricbeat/module/googlecloud/stackdriver/metricset.go b/x-pack/metricbeat/module/googlecloud/stackdriver/metricset.go index ee797482000..69ac38ca101 100644 --- a/x-pack/metricbeat/module/googlecloud/stackdriver/metricset.go +++ b/x-pack/metricbeat/module/googlecloud/stackdriver/metricset.go @@ -148,6 +148,11 @@ func validatePeriodForGCP(d time.Duration) (err error) { } func (c *config) Validate() error { + // storage metricset does not require region or zone config parameter. + if c.ServiceName == "storage" { + return nil + } + if c.Region == "" && c.Zone == "" { return errors.New("region and zone in Google Cloud config file cannot both be empty") } From 7664926043790a2ee1545098bb30259f785c6b0d Mon Sep 17 00:00:00 2001 From: kaiyan-sheng Date: Wed, 8 Apr 2020 15:34:08 -0600 Subject: [PATCH 2/2] add changelog --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index e3342d740de..b54b6e9d37f 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -152,6 +152,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix azure storage dashboards. {pull}17590[17590] - Metricbeat no longer needs to be started strictly after Logstash for `logstash-xpack` module to report correct data. {issue}17261[17261] {pull}17497[17497] - Fix "ID" event generator of Google Cloud module {issue}17160[17160] {pull}17608[17608] +- Fix storage metricset to allow config without region/zone. {issue}17623[17623] {pull}17624[17624] *Packetbeat*