Cherry-pick to 6.x: Add OS Name into add-host-metadata (#9405) #9444
Conversation
libbeat/metric/system/host/host.go
Outdated
| @@ -72,6 +74,11 @@ func ReportInfo(_ monitoring.Mode, V monitoring.Visitor) { | |||
| monitoring.ReportString(V, "platform", info.OS.Platform) | |||
| monitoring.ReportString(V, "version", info.OS.Version) | |||
| monitoring.ReportString(V, "family", info.OS.Family) | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
expected statement, found '<<' (and 1 more errors)
* Add OS Name into add-host-metadat * Run gofmt * Add changelog and update documentation * Update changelog
|
I think this cherry pick also picked up other changes :(
|
|
I had to restart Jenkins to perform upgrades and this job was cancelled...kicking it off again. Jenkins, test this please. |
| @@ -108,6 +108,9 @@ https://github.com/elastic/beats/compare/v6.5.0...6.x[Check the HEAD diff] | |||
| - Test etcd module with etcd 3.3. {pull}9068[9068] | |||
| - Add setting to disable docker cpu metrics per core. {pull}9194[9194] | |||
| - The `elasticsearch/node` metricset now reports the Elasticsearch cluster UUID. {pull}8771[8771] | |||
| - Add service.type field to Metricbeat. {pull}8965[8965] | |||
| - Support GET requests in Jolokia module. {issue}8566[8566] {pull}9226[9226] | |||
There was a problem hiding this comment.
Please remove these lines from this PR (git uses to do this with these kind of merges).
There was a problem hiding this comment.
It is not that you have cherry-picked more changes than needed, the problem is only here in the automatic merge of the changelog, this uses to happen :)
|
@kaiyan-sheng For backports I strongly recommend to use the cherrypick_pr script: https://github.com/elastic/beats/blob/master/dev-tools/cherrypick_pr It will do a bit of magic for you like labels etc. |
| @@ -917,7 +917,9 @@ The fields added to the event are looking as following: | |||
| "family":"darwin", | |||
| "build":"16G1212", | |||
| "platform":"darwin", | |||
| "version":"10.12.6" | |||
| "version":"10.12.6", | |||
| "kernel":"16.7.0", | |||
There was a problem hiding this comment.
It seems kernel was added in an other PR then your original PR. Perhaps we should backport these separately to make sure we have all the code.
|
Will close this pr after using https://github.com/elastic/beats/blob/master/dev-tools/cherrypick_pr to generate a new pr: #9471 |
Add OS Name into add-host-metadat
Run gofmt
Add changelog and update documentation
Update changelog