Automatic merge from 5.5 to 5.x branch #4704
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Fixed socket scanning for tcp6 * Fixed ip6 parsing (cherry picked from commit 1426260)
This were introduced in elastic#3515, but I think they cause issues like the one in elastic#4483, at least in recent versions of ES. We already removed these in master, but I didn't realize the 5.x branches are affected. Fixes elastic#4483.
Remove empty properties from the template files
* Misc doc fixes * Fix syslog typo
Fixed Windows issue that caused a hang during `init()` if WMI wasn't ready. elastic/gosigar#74 elastic/gosigar#76 Fixes elastic#4373
* Document complex ojbect support in env vars * Fixes from the review * More changes from the review
….17_5.5 Backport into 5.5: elastic#4200, elastic#4312, elastic#4405, elastic#4408, elastic#4505
Change all `system.cpu.*.pct` metrics to be scaled by the number of CPU cores such that the values range on `[0, 100% * number_of_cores]`. This will make the CPU usage percentages from the system cpu metricset consistent with the system process metricset. The documentation for these metrics already stated that on multi-core systems the percentages could be greater than 100%. This makes the code match the docs, but does cause a change in behavior to the user.
In some docs file `path.conf` instead of `path.config` was mentioned. To reduce confusion I also changed the type from `conf` to `config`.
Adding a new beat to listen to a mqtt broker, and add any message received to elastic
…UTC time zone (elastic#4683) * Normalize times to common.Time with UTC time zone (elastic#4658) During event normalization convert any time objects to a common.Time and ensure that the time zone is UTC. Fixes elastic#4569 (cherry picked from commit 29f4cc7) * Fix changelog
|
jenkins, retest it pls |
|
jenkins retest this please |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I recommend a merge commit on this one.