Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Metricbeat] Use timestamp from CloudWatch for events #21498

Merged
merged 4 commits into from
Oct 6, 2020
Merged

[Metricbeat] Use timestamp from CloudWatch for events #21498

merged 4 commits into from
Oct 6, 2020

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Oct 2, 2020 •
edited
Loading

This PR is to use timestamp from CloudWatch ListMetric API instead of the current timestamp to construct events.

Checklist

  • My code follows the style guidelines of this project
  • [ ]I have commented my code, particularly in hard-to-understand areas
  • [ ]I have made corresponding changes to the documentation
  • [ ]I have made corresponding change to the default configuration files
  • 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.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 2, 2020
@kaiyan-sheng kaiyan-sheng self-assigned this Oct 2, 2020
@kaiyan-sheng kaiyan-sheng added needs_backport PR is waiting to be backported to other branches. review Team:Platforms Label for the Integrations - Platforms team labels Oct 2, 2020
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations-platforms (Team:Platforms)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 2, 2020
@elasticmachine
Copy link
Collaborator

elasticmachine commented Oct 2, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request #21498 updated]

  • Start Time: 2020-10-06T15:50:06.699+0000

  • Duration: 85 min 22 sec

Test stats 🧪

Test Results
Failed 0
Passed 588
Skipped 69
Total 657

ChrsMark
ChrsMark reviewed Oct 5, 2020
View reviewed changes
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! Wondering if it would worth adding unit-tests for this change? Was really helpful in Prometheus module. Not sure if possible here though.

x-pack/metricbeat/module/aws/aws.go Outdated Show resolved Hide resolved
@kaiyan-sheng
Copy link
Contributor Author

Looks good to me! Wondering if it would worth adding unit-tests for this change? Was really helpful in Prometheus module. Not sure if possible here though.

Thanks for the review @ChrsMark ! I just added a unit test for this! Definitely good to have a test in there even with mocked apis.

@kaiyan-sheng kaiyan-sheng requested a review from ChrsMark October 6, 2020 15:50
@kaiyan-sheng kaiyan-sheng merged commit b4c273c into elastic:master Oct 6, 2020
@kaiyan-sheng kaiyan-sheng deleted the aws_cw_timestamp branch October 6, 2020 18:40
@kaiyan-sheng kaiyan-sheng mentioned this pull request Oct 6, 2020
Merged
3 tasks
@kaiyan-sheng kaiyan-sheng added v7.10.0 and removed needs_backport PR is waiting to be backported to other branches. labels Oct 6, 2020
kaiyan-sheng added a commit that referenced this pull request Oct 6, 2020
@kaiyan-sheng
Cherry-pick #21498 to 7.x: [Metricbeat] Use timestamp from CloudWatch…
9a22909 
… for events (#21595)

* [Metricbeat] Use timestamp from CloudWatch for events (#21498)

(cherry picked from commit b4c273c)
v1v added a commit to v1v/beats that referenced this pull request Oct 8, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/2.0-skip-…
36ed51a 
…ci-build-label-support

* upstream/master: (60 commits)
  Skip publisher flaky tests (elastic#21657)
  backport: add 7.10 branch (elastic#21635)
  [CI: Packaging] fix: push ubi8 images too (elastic#21621)
  Docker build resiliance with a retry (elastic#21587)
  Fix flaky FSWatch/FSScanner tests (elastic#21625)
  chore: add versions 7.1x (elastic#21670)
  [Elastic Agent] Reload fleet.kibana.hosts from policy change (elastic#21599)
  Fix cyberark/corepas pipeline (elastic#21643)
  Add openstack ssl provider in add_cloud_metadata (elastic#21590)
  Add fips_enabled into all aws filesets (elastic#21626)
  [Filebeat S3] Change log.file.path to be nested object (elastic#21624)
  [CI] Change notification channel (elastic#21559)
  Add `add_observer_metadata` `geo.name` to Quickstart (elastic#21501)
  [E2E Tests] fix: set versions ony for PRs (elastic#21608)
  Fix badger build in 386 (elastic#21613)
  docs: Update timestamp.asciidoc (elastic#20395)
  Remove nil-zero metrics and linux-exclusive metrics from Metricbeat (elastic#21457)
  [Metricbeat] Use timestamp from CloudWatch for events (elastic#21498)
  [Filebeat][S3 Input] Add support for FIPS endpoints (elastic#21585)
  [Ingest Manager] Use new form of fleet API paths (elastic#21478)
  ...
v1v added a commit to v1v/beats that referenced this pull request Oct 8, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-2…
b3b7cb1 
…012-2.0

* upstream/master: (110 commits)
  Skip publisher flaky tests (elastic#21657)
  backport: add 7.10 branch (elastic#21635)
  [CI: Packaging] fix: push ubi8 images too (elastic#21621)
  Docker build resiliance with a retry (elastic#21587)
  Fix flaky FSWatch/FSScanner tests (elastic#21625)
  chore: add versions 7.1x (elastic#21670)
  [Elastic Agent] Reload fleet.kibana.hosts from policy change (elastic#21599)
  Fix cyberark/corepas pipeline (elastic#21643)
  Add openstack ssl provider in add_cloud_metadata (elastic#21590)
  Add fips_enabled into all aws filesets (elastic#21626)
  [Filebeat S3] Change log.file.path to be nested object (elastic#21624)
  [CI] Change notification channel (elastic#21559)
  Add `add_observer_metadata` `geo.name` to Quickstart (elastic#21501)
  [E2E Tests] fix: set versions ony for PRs (elastic#21608)
  Fix badger build in 386 (elastic#21613)
  docs: Update timestamp.asciidoc (elastic#20395)
  Remove nil-zero metrics and linux-exclusive metrics from Metricbeat (elastic#21457)
  [Metricbeat] Use timestamp from CloudWatch for events (elastic#21498)
  [Filebeat][S3 Input] Add support for FIPS endpoints (elastic#21585)
  [Ingest Manager] Use new form of fleet API paths (elastic#21478)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChrsMark ChrsMark ChrsMark approved these changes

Assignees

@kaiyan-sheng kaiyan-sheng

Labels
review Team:Platforms Label for the Integrations - Platforms team v7.10.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kaiyan-sheng @elasticmachine @ChrsMark