Cherry-pick to 6.x: Ignore timestamp in redis, haproxy and system filebeat module (#9855) #9857
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
kaiyan-sheng
added
Team:Integrations
ycombinator
reviewed
Jan 3, 2019
NOTICE.txt
Outdated
| @@ -1,5 +1,5 @@ | |||
| Elastic Beats | |||
| Copyright 2014-2018 Elasticsearch BV | |||
| Copyright 2014-2019 Elasticsearch BV | |||
There was a problem hiding this comment.
Should we wait till #9855 is merged and backported, then rebase this PR on 6.x?
ycombinator
reviewed
Jan 3, 2019
| @@ -170,6 +170,7 @@ def _test_expected_events(self, test_file, objects): | |||
|
|
|||
| for ev in expected: | |||
| found = False | |||
| clean_keys(ev) | |||
There was a problem hiding this comment.
Should we wait till #9852 is merged and then rebase this PR on 6.x?
* Ignore timestamp in redis, haproxy and system filebeat module * Fixing formatting (cherry picked from commit b9a20f7)
The icing/startup log file does not contain a timestamp. Because of this the timestamp from filebeat is taken. During the generation of golden files still a timestamp was added but every skipped on comparison. Instead now the timestamp is not added to the generated file anymore to now show a diff each time GENERATE is run.
jsoriano
approved these changes
Jan 3, 2019
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.
Ignore timestamp in redis, haproxy and system filebeat module
Fixing formatting
(cherry picked from commit b9a20f7)
This PR also cherry picked #9506 from commit ea8e6d6
This PR also cherry picked #9862 from commit 9b740a9