-
Notifications
You must be signed in to change notification settings - Fork 4.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Ignore timestamp in redis, haproxy and system filebeat module #9855
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a better solution so if this passes on CI let's go with it.
Fixing formatting
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for fixing this!
@@ -178,6 +178,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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
…ebeat module (#9855) (#9858) * Ignore timestamp in redis, haproxy and system filebeat module (#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 (#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 (#9862) * Rerun GENERATE=1 to update expected json files
…ebeat module (#9855) (#9857) * Ignore timestamp in redis, haproxy and system filebeat module (#9855) * Ignore timestamp in redis, haproxy and system filebeat module * Fixing formatting (cherry picked from commit b9a20f7) * Change to use event.dataset instead * Update golden files for icinga/startup test to exclude timestamp (#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 (#9862) * Rerun icinga redis haproxy and system modules with GENERATE=1
Thanks for the quick fix on this. There is a difference from incinga to redis / haproxy in that incinga does not have a timestamp at all and these have a timestamp but no year. To still test that we convert the timestamps correctly it would be nice if the |
…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)
…ebeat module (#9855) (#9858) (#10072) (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. (cherry picked from commit 6defdd4) Co-authored-by: Nicolas Ruflin <spam@ruflin.com> Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
…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 a5f0323) * 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
…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 <spam@ruflin.com> Co-authored-by: kaiyan-sheng <kaiyan.sheng@elastic.co>
Another way to solve this issue #9849 is to ignore timestamp in test_modules.py for redis, haproxy and system filebeat module.