Skip to content

[metricbeat] fix aws cloudwatch metric tags when the number of resource is a multiple of 50 (#26385)#26443

Merged
kaiyan-sheng merged 1 commit intoelastic:masterfrom
kwinstonix:fix_aws_metric_tags
Jun 30, 2021
Merged

[metricbeat] fix aws cloudwatch metric tags when the number of resource is a multiple of 50 (#26385)#26443
kaiyan-sheng merged 1 commit intoelastic:masterfrom
kwinstonix:fix_aws_metric_tags

Conversation

@kwinstonix
Copy link
Copy Markdown
Contributor

@kwinstonix kwinstonix commented Jun 23, 2021 •
edited
Loading

What does this PR do?

see issue #26385

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 23, 2021
@kwinstonix kwinstonix force-pushed the fix_aws_metric_tags branch 2 times, most recently from b1b3626 to 9dc6959 Compare June 23, 2021 13:22
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 23, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: jsoriano commented: /test

  • Start Time: 2021-06-30T16:36:17.242+0000

  • Duration: 75 min 27 sec

  • Commit: 3ce2da3

Test stats 🧪

Test Results
Failed 0
Passed 1973
Skipped 289
Total 2262

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1973
Skipped 289
Total 2262

@kwinstonix kwinstonix marked this pull request as ready for review June 23, 2021 13:28
@kaiyan-sheng kaiyan-sheng self-assigned this Jun 23, 2021
@kaiyan-sheng kaiyan-sheng added needs_backport PR is waiting to be backported to other branches. Team:Integrations Label for the Integrations team labels Jun 23, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 23, 2021

Pinging @elastic/integrations (Team:Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 23, 2021
kaiyan-sheng
kaiyan-sheng reviewed Jun 23, 2021
View reviewed changes
@kwinstonix kwinstonix force-pushed the fix_aws_metric_tags branch 3 times, most recently from 810ebb5 to 4da20d9 Compare June 25, 2021 14:34
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jun 25, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b fix_aws_metric_tags upstream/fix_aws_metric_tags
git merge upstream/master
git push upstream fix_aws_metric_tags

@kwinstonix kwinstonix force-pushed the fix_aws_metric_tags branch from 4da20d9 to b6f06cb Compare June 25, 2021 15:44
@kwinstonix
Copy link
Copy Markdown
Contributor Author

kwinstonix commented Jun 25, 2021

rebased on upstream/master

@kaiyan-sheng
Copy link
Copy Markdown
Contributor

kaiyan-sheng commented Jun 29, 2021

/test

@kwinstonix kwinstonix force-pushed the fix_aws_metric_tags branch from b6f06cb to 3ce2da3 Compare June 30, 2021 15:50
@kwinstonix
Copy link
Copy Markdown
Contributor Author

kwinstonix commented Jun 30, 2021

/test

@kwinstonix
Copy link
Copy Markdown
Contributor Author

kwinstonix commented Jun 30, 2021

failed test cases are fixed. please run CI test again. 😅

@jsoriano
Copy link
Copy Markdown
Member

jsoriano commented Jun 30, 2021

/test

@kaiyan-sheng
Copy link
Copy Markdown
Contributor

kaiyan-sheng commented Jun 30, 2021

@kwinstonix Thank you!!

@kaiyan-sheng kaiyan-sheng merged commit 179108c into elastic:master Jun 30, 2021
@kaiyan-sheng kaiyan-sheng mentioned this pull request Jun 30, 2021
Merged
4 tasks
@kaiyan-sheng kaiyan-sheng added v7.14.0 and removed needs_backport PR is waiting to be backported to other branches. labels Jun 30, 2021
@kaiyan-sheng kaiyan-sheng mentioned this pull request Jun 30, 2021
Merged
4 tasks
kaiyan-sheng pushed a commit that referenced this pull request Jun 30, 2021
@kwinstonix
[MetricBeat] [AWS] Fix aws metric tags with resourcegroupstaggingapi …
f23335c 
…paginator (#26385) (#26443) (#26630)

(cherry picked from commit 179108c)

Co-authored-by: martin <kwinstonix@users.noreply.github.com>
kaiyan-sheng pushed a commit that referenced this pull request Jun 30, 2021
@kwinstonix
[MetricBeat] [AWS] Fix aws metric tags with resourcegroupstaggingapi …
0de1d8d 
…paginator (#26385) (#26443) (#26628)

(cherry picked from commit 179108c)

Co-authored-by: martin <kwinstonix@users.noreply.github.com>
mdelapenya added a commit to mdelapenya/beats that referenced this pull request Jul 1, 2021
@mdelapenya
Merge branch 'master' into archive-system-tests
2edf800 
* master:
  [MetricBeat] [AWS] Fix aws metric tags with resourcegroupstaggingapi paginator (elastic#26385) (elastic#26443)
  Move openmetrics module to oss (elastic#26561)
  Skip flaky test TestFilestreamMetadataUpdatedOnRename (elastic#26609)
  [filebeat][fortinet] Use default add_locale for fortinet.firewall (elastic#26524)
  Enroll proxy settings (elastic#26514)
v1v added a commit to v1v/beats that referenced this pull request Jul 5, 2021
@v1v
Merge remote-tracking branch 'upstream/master' into feature/retry-if-…
a26267c 
…stage-failed-within-same-build

* upstream/master: (36 commits)
  Revert "[CI] fight the flakiness with some retry option in the CI only for the Pull Requests (elastic#26617)" (elastic#26704)
  Packaging: linux/armv7 is not supported (elastic#26706)
  Cyberarkpas: Link to official docs on how to setup TLS (elastic#26614)
  Make network_direction, registered_domain and convert processors compatible with ES older than 7.13.0 (elastic#26676)
  Disable armv7 packaging (elastic#26679)
  [Heartbeat] use --params flag for synthetics (elastic#26674)
  Update dependent package to avoid downloading a suspicious file (elastic#26406)
  [mergify] set title and allow bp in any direction (elastic#26648)
  Fix memory leak in SQL helper when database is not available (elastic#26607)
  [CI] fight the flakiness with some retry option in the CI only for the Pull Requests (elastic#26617)
  [mergify] automate PRs that change the backport rules (elastic#26641)
  [Metricbeat] Add Airflow module in xpack (elastic#26220)
  chore: add-backport-next (elastic#26620)
  [metricbeat] Add state_job metricset (elastic#26479)
  CI: jenkins labels are less time consuming now (elastic#26613)
  [MetricBeat] [AWS] Fix aws metric tags with resourcegroupstaggingapi paginator (elastic#26385) (elastic#26443)
  Move openmetrics module to oss (elastic#26561)
  Skip flaky test TestFilestreamMetadataUpdatedOnRename (elastic#26609)
  [filebeat][fortinet] Use default add_locale for fortinet.firewall (elastic#26524)
  Enroll proxy settings (elastic#26514)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@kaiyan-sheng kaiyan-sheng kaiyan-sheng approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@kaiyan-sheng kaiyan-sheng

Labels

Team:Integrations Label for the Integrations team v7.14.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[MetricBeat] [AWS] if the number of resources is a multiple of 50, there is no tags field in the event

4 participants

@kwinstonix @elasticmachine @kaiyan-sheng @jsoriano