Skip to content

Commit

Permalink
Cherry-pick #14525 to 7.x: [Metricbeat] Check length of the slice ins…
Browse files Browse the repository at this point in the history
…tead of comparing with nil in cloudwatch (#14539)

* [Metricbeat] Check length of the slice instead of comparing with nil in cloudwatch (#14525)

* Check length of the slice instead of comparing with nil

(cherry picked from commit 8dce4b1)

* Update changelog
  • Loading branch information
kaiyan-sheng committed Nov 16, 2019
1 parent 66e26c3 commit c003f9b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Update azure configuration example. {issue}14224[14224]
- Fix cloudwatch metricset with names and dimensions in config. {issue}14376[14376] {pull}14391[14391]
- Fix marshaling of ms-since-epoch values in `elasticsearch/cluster_stats` metricset. {pull}14378[14378]
- Fix checking tagsFilter using length in cloudwatch metricset. {pull}14525[14525]

*Packetbeat*

Expand Down
6 changes: 3 additions & 3 deletions x-pack/metricbeat/module/aws/cloudwatch/cloudwatch.go
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ func (m *MetricSet) createEvents(svcCloudwatch cloudwatchiface.ClientAPI, svcRes
m.Logger().Info(errors.Wrap(err, "getResourcesTags failed, skipping region "+regionName))
}

if tagsFilter != nil && resourceTagMap == nil {
if len(tagsFilter) != 0 && len(resourceTagMap) == 0 {
continue
}

Expand All @@ -472,7 +472,7 @@ func (m *MetricSet) createEvents(svcCloudwatch cloudwatchiface.ClientAPI, svcRes
labels := strings.Split(*output.Label, labelSeperator)
if len(labels) != 5 {
// if there is no tag in labels but there is a tagsFilter, then no event should be reported.
if tagsFilter != nil {
if len(tagsFilter) != 0 {
continue
}
eventNew := aws.InitEvent(regionName, m.AccountName, m.AccountID)
Expand All @@ -483,7 +483,7 @@ func (m *MetricSet) createEvents(svcCloudwatch cloudwatchiface.ClientAPI, svcRes

identifierValue := labels[identifierValueIdx]
tags := resourceTagMap[identifierValue]
if tagsFilter != nil && tags == nil {
if len(tagsFilter) != 0 && len(tags) == 0 {
continue
}

Expand Down

0 comments on commit c003f9b

Please sign in to comment.