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.

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

Add operating system from vsphere to 'os' field #8638

Closed
wants to merge 6 commits into from

Conversation

rfalias
Copy link

@rfalias rfalias commented Oct 17, 2018

Add operating system from vsphere to 'os' field

@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@ghost
Copy link

ghost commented Oct 17, 2018

Hi @rfalias, we have found your signature in our records, but it seems like you have signed with a different e-mail than the one used in yout Git commit. Can you please add both of these e-mails into your Github profile (they can be hidden), so we can match your e-mails to your Github profile?

@@ -141,6 +141,7 @@ func (m *MetricSet) Fetch() ([]common.MapStr, error) {
event := common.MapStr{
"host": vm.Summary.Runtime.Host.Value,
"name": vm.Summary.Config.Name,
"os": vm.Summary.Config.GuestFullName,
Copy link
Member

Choose a reason for hiding this comment

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

This file needs to be formatted with gofmt.

Copy link
Member

@andrewkroh andrewkroh left a comment

Choose a reason for hiding this comment

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

Thanks for the contribution. There are two additional things that this needs:

@ruflin ruflin added the module label Oct 18, 2018
@andrewkroh
Copy link
Member

jenkins, test this

@ruflin ruflin added the Team:Integrations Label for the Integrations team label Nov 21, 2018
@alvarolobato alvarolobato assigned jsoriano and unassigned jsoriano Dec 10, 2018
@rfalias
Copy link
Author

rfalias commented Apr 11, 2019

Anything need to be done to merge?

@jsoriano
Copy link
Member

@rfalias sorry for keeping it so long. Could you update the branch again with master and run make update? For the rest I think this is good to go.

@rfalias rfalias requested review from a team as code owners April 12, 2019 18:41
@@ -128,7 +128,48 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) error {

for _, vm := range vmt {

<<<<<<< HEAD

Choose a reason for hiding this comment

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

expected statement, found '<<' (and 3 more errors)

@jsoriano
Copy link
Member

@rfalias there are some leftovers from the merge, could you check it? Tell us if you need any help with this.

@jsoriano
Copy link
Member

jsoriano commented Jun 3, 2019

I have opened #12391 to continue with this and resolve the merge conflicts so we can merge it.
I am closing this, @rfalias feel free to reopen it if you can continue with this.

@jsoriano jsoriano closed this Jun 3, 2019
@zube zube bot removed the [zube]: In Review label Jun 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Metricbeat Metricbeat module Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants