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

Add linked account information into billing metricset #26285

Merged
merged 9 commits into from
Jun 23, 2021
Merged

Add linked account information into billing metricset #26285

merged 9 commits into from
Jun 23, 2021

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Jun 14, 2021 •
edited
Loading

What does this PR do?

This PR is to improve billing metricset for AWS by adding linked account information. This information includes not only the account ID but also the more readable account name. This requires a new API call organizations.ListAccounts and also changes in the out-of-the-box dashboard is needed in order to use the account names instead of account IDs.

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.

Related issues

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 14, 2021
@kaiyan-sheng kaiyan-sheng self-assigned this Jun 14, 2021
@kaiyan-sheng kaiyan-sheng added the Team:Integrations Label for the Integrations team label Jun 14, 2021
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jun 14, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jun 14, 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: Pull request #26285 updated

  • Start Time: 2021-06-22T19:53:37.977+0000

  • Duration: 100 min 21 sec

  • Commit: a540a42

Test stats 🧪

Test Results
Failed 0
Passed 8677
Skipped 2476
Total 11153

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 8677
Skipped 2476
Total 11153

@kaiyan-sheng kaiyan-sheng marked this pull request as ready for review June 16, 2021 19:44
@elasticmachine
Copy link
Collaborator

Pinging @elastic/integrations (Team:Integrations)

@mergify
Copy link
Contributor

mergify bot commented Jun 16, 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 aws_billing upstream/aws_billing
git merge upstream/master
git push upstream aws_billing

@kaiyan-sheng kaiyan-sheng added needs_backport PR is waiting to be backported to other branches. needs_integration_sync Changes in this PR need synced to elastic/integrations. labels Jun 16, 2021
fxdgear
fxdgear approved these changes Jun 23, 2021
View reviewed changes
Copy link

@fxdgear fxdgear left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Screenshot from 2021-06-23 10-15-27
FWIW I'm not the best at go, but while deploying this change set to a test cluster, I was able to verify and validate that the field aws.linked_account.id and aws.linked_account.name filed do get populated.

@kaiyan-sheng kaiyan-sheng merged commit d512dc0 into elastic:master Jun 23, 2021
@kaiyan-sheng kaiyan-sheng deleted the aws_billing branch June 23, 2021 16:56
@kaiyan-sheng kaiyan-sheng mentioned this pull request Jun 23, 2021
Merged
6 tasks
@kaiyan-sheng kaiyan-sheng added v7.14.0 and removed needs_backport PR is waiting to be backported to other branches. labels Jun 23, 2021
kaiyan-sheng added a commit that referenced this pull request Jun 23, 2021
@kaiyan-sheng
Add linked account information into billing metricset (#26285) (#26451)
98b5bdd 
(cherry picked from commit d512dc0)
mdelapenya added a commit to mdelapenya/beats that referenced this pull request Jun 28, 2021
@mdelapenya
Merge branch 'master' into archive-system-tests
b6dbec3 
* master: (32 commits)
  [Metricbeat] Change Account ID to Project ID in `gcp.billing` module (elastic#26412)
  update libbeat fields.ecs.yml file and ecsVersion to 1.10.0 (elastic#26121)
  [Filebeat] Update AWS ELB ingest pipeline (elastic#26441)
  [FIlebeat] add strict_date_optional_time_nanos date format to PanOS module (elastic#26158)
  Fix the irregular and typo on prometheus module. (elastic#25726)
  [Filebeat] Parse additonal debug data fields for Okta module (elastic#25818)
  fix: update MSSQL Server linux image's Docker registry (elastic#26440)
  Update indexing.go godocs (elastic#26408)
  Do not close filestream harvester if an unexpected error is returned when close.on_state_change.* is enabled (elastic#26411)
  Add support for copytruncate method when rotating input logs with an external tool in `filestream` input (elastic#23457)
  Allow fields with ip_range datatype (elastic#26444)
  Add Anomali ThreatStream support to threatintel module (elastic#26350)
  fix: use the right param type (elastic#26469)
  [Automation] Update elastic stack version to 8.0.0-7640093f for testing (elastic#26460)
  Set SM Filebeat modules as GA (elastic#26226)
  Fix rfc5464 date parsing in the syslog input (elastic#26419)
  Add linked account information into billing metricset (elastic#26285)
  [Filebeat] Update HA Proxy log grok patterns (elastic#25835)
  disable metricbeat logstash test_node_stats (elastic#26436)
  chore: pass BEAT_VERSION when running E2E tests (elastic#26291)
  ...
@kaiyan-sheng kaiyan-sheng mentioned this pull request Jul 19, 2021
Merged
4 tasks
@kaiyan-sheng kaiyan-sheng removed the needs_integration_sync Changes in this PR need synced to elastic/integrations. label Jul 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fxdgear fxdgear fxdgear approved these changes

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.

Improve AWS Billing with linked account and account name
3 participants
@kaiyan-sheng @elasticmachine @fxdgear