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

Collect cloud.instance.name in ec2 metricset #20077

Merged
merged 3 commits into from
Jul 22, 2020
Merged

Collect cloud.instance.name in ec2 metricset #20077

merged 3 commits into from
Jul 22, 2020

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Jul 20, 2020 •
edited
Loading

This PR is to add ECS field cloud.instance.name for ec2 metricset.

EC2 instance name is optional in AWS and if it's given by user, it will show as tag value of tag key Name.

@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 20, 2020
@kaiyan-sheng kaiyan-sheng self-assigned this Jul 20, 2020
@kaiyan-sheng kaiyan-sheng added in progress Pull request is currently in progress. needs_backport PR is waiting to be backported to other branches. Team:Platforms Label for the Integrations - Platforms team labels Jul 20, 2020
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Jul 20, 2020
@kaiyan-sheng kaiyan-sheng mentioned this pull request Jul 20, 2020
Closed
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 20, 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 #20077 updated]

  • Start Time: 2020-07-21T20:56:44.428+0000

  • Duration: 40 min 54 sec

Test stats 🧪

Test Results
Failed 0
Passed 753
Skipped 84
Total 837

@kaiyan-sheng kaiyan-sheng changed the title Add host common fields and cloud.instance.name Collect cloud.instance.name in ec2 metricset Jul 21, 2020
@kaiyan-sheng kaiyan-sheng marked this pull request as ready for review July 21, 2020 20:56
@elasticmachine
Copy link
Collaborator

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

@kaiyan-sheng kaiyan-sheng added review and removed in progress Pull request is currently in progress. labels Jul 21, 2020
exekias
exekias approved these changes Jul 22, 2020
View reviewed changes
Copy link
Contributor

@exekias exekias left a comment

Choose a reason for hiding this comment

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

LGTM! I see in the docs that this field is not filled either by add_cloud_metadata, do you know if it's available in the resource metadata endpoint?

@kaiyan-sheng
Copy link
Contributor Author

@exekias Thanks for the review. For add_cloud_metadata, I think the EC2 info comes from the instance identity document. Unfortunately it does not include instanceName as a part of the document. instanceName is a part of tags information for AWS EC2, which is not required for each instance. My guess is, that's why it's not a part of the instance identity document.

@kaiyan-sheng kaiyan-sheng merged commit c1055c6 into elastic:master Jul 22, 2020
@kaiyan-sheng kaiyan-sheng deleted the common_fields_ec2 branch July 22, 2020 18:31
@kaiyan-sheng kaiyan-sheng mentioned this pull request Jul 22, 2020
Merged
@kaiyan-sheng kaiyan-sheng added v7.10.0 and removed needs_backport PR is waiting to be backported to other branches. labels Jul 22, 2020
kaiyan-sheng added a commit that referenced this pull request Jul 28, 2020
@kaiyan-sheng
Collect cloud.instance.name in ec2 metricset (#20077) (#20161)
fb20188 
* add cloud.instance.name

(cherry picked from commit c1055c6)
melchiormoulin pushed a commit to melchiormoulin/beats that referenced this pull request Oct 14, 2020
@kaiyan-sheng @melchiormoulin
Collect cloud.instance.name in ec2 metricset (elastic#20077)
99d981b 
* add cloud.instance.name
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@exekias exekias exekias 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 @exekias