Cherry-pick #9855 to 6.5: Ignore timestamp in redis, haproxy and system filebeat module #10072
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
…ebeat module (elastic#9855) (elastic#9858) * Ignore timestamp in redis, haproxy and system filebeat module (elastic#9855) * Ignore timestamp in redis, haproxy and system filebeat module * Fixing formatting (cherry picked from commit b9a20f7) * Use event.dataset in if statement * Update golden files for icinga/startup test to exclude timestamp (elastic#9506) 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. * Regenerate expectations for logs without timestamps (elastic#9862) * Rerun GENERATE=1 to update expected json files (cherry picked from commit 6defdd4)
|
Backporting this for #10057 |
|
jenkins, test this |
|
Test failures are flakiness in other Beats. I think we're good to merge this, WDYT @jsoriano? |
|
Yeah, merging this. |
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…ebeat module (elastic#9855) (elastic#9858) (elastic#10072) (cherry picked from commit a5f0323) 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. (cherry picked from commit 6defdd4) Co-authored-by: Nicolas Ruflin <[email protected]> Co-authored-by: kaiyan-sheng <[email protected]>
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.
Cherry-pick of PR #9855 to 6.5 branch. Original message:
Another way to solve this issue #9849 is to ignore timestamp in test_modules.py for redis, haproxy and system filebeat module.