Automatic merge from 5.3 to 5.4 branch #4096
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
- Fix parsing regular expression matching patterns for log lines starting with
a date, by taking an optional literal string/character suffix into account
(panic with index out of error, due to expecting a digit-pattern)
- add more test cases for regression
- add support to flatten nested repetitions like `(\d{2}){2}` into `\d{4}`, so
more date-like patterns can be captured. This adds support for capturing
`\d\d\d\d` as simplified `\d{4}` pattern.
(cherry picked from commit 4808f1c)
* Allow in Apache access log byte count (cherry picked from commit a083077)
…lastic#4037) (elastic#4046) If one prospector started to already send data and a second one was misconfigured, the beat paniced during shutdown. This is no prevented by properly shutting down the crawler also on error. Closes elastic#3917 (cherry picked from commit 95195cc)
* add kafkabeat kafkabeat read data from kafka * Update communitybeats.asciidoc
Backport: elastic#4016, elastic#4009, elastic#4017, and elastic#3890 into 5.3
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.
There were several non-docs commits that are found in 5.3 but not in 5.4. To make sure we don't lose any bug fixes, I'm doing a merge from 5.3 to 5.4. A merge from 5.4 to 5.x will likely follow.
This includes fixes like #3907, #3909, #4037 and docs fix #3875.
There were no significant conflicts.