Skip to content

Commit

Permalink
[Metricbeat] allow empty region/zone config param for storage metrics…
Browse files Browse the repository at this point in the history
…et (elastic#17624)

* allow empty region/zone config param for storage metricset
  • Loading branch information
kaiyan-sheng authored Apr 9, 2020
1 parent 91565f6 commit a8ef199
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Metricbeat no longer needs to be started strictly after Logstash for `logstash-xpack` module to report correct data. {issue}17261[17261] {pull}17497[17497]
- Add privileged option so as mb to access data dir in Openshift. {pull}17606[17606]
- 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*

Expand Down
5 changes: 5 additions & 0 deletions x-pack/metricbeat/module/googlecloud/stackdriver/metricset.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down

0 comments on commit a8ef199

Please sign in to comment.