bugfix break infinite loop on aws billing (#32626) (#32660)

* bugfix break infinite loop on aws billing * changelog * add warning about listing account error (cherry picked from commit 9450332) Co-authored-by: Andrea Spacca <andrea.spacca@elastic.co>
elastic · Aug 11, 2022 · 95a8289 · 95a8289
1 parent 6322fe1
commit 95a8289
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -70,6 +70,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
 - Check for nil metadata in GCP. {pull}32281[32281]
 - update kubernetes controllermanager metricset to not collect deprecated metrics and fix dashboard {pull}32037[32037]
 - Fix to ARN parsing for Cloudwatch resource names with leading slashes {pull}32358[32358]
+- Fix an infinite loop in AWS billing metricset. {pull}32626[32626]
 - Add missing metrics in AWS Transit Gateway module {pull}32617[32617]
 
 *Packetbeat*

diff --git a/x-pack/metricbeat/module/aws/billing/billing.go b/x-pack/metricbeat/module/aws/billing/billing.go
@@ -444,8 +444,8 @@ func (m *MetricSet) getAccountName(svc *organizations.Client) map[string]string
 	for paginator.HasMorePages() {
 		page, err := paginator.NextPage(context.Background())
 		if err != nil {
-			//TODO continue or return with error? Probably is return but...
-			continue
+			m.Logger().Warnf("an error occurred while listing account: %s", err.Error())
+			return accounts
 		}
 		for _, a := range page.Accounts {
 			accounts[*a.Id] = *a.Name