From e735959048b311551cd07994b852be8277c64a6c Mon Sep 17 00:00:00 2001 From: kaiyan-sheng Date: Wed, 2 Jan 2019 14:49:54 -0700 Subject: [PATCH 1/2] Ignore timestamp in redis, haproxy and system filebeat module --- filebeat/tests/system/test_modules.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/filebeat/tests/system/test_modules.py b/filebeat/tests/system/test_modules.py index 10218e70c575..cd6b6c4fe654 100644 --- a/filebeat/tests/system/test_modules.py +++ b/filebeat/tests/system/test_modules.py @@ -178,6 +178,7 @@ def _test_expected_events(self, test_file, objects): for ev in expected: found = False + clean_keys(ev) for obj in objects: # Flatten objects for easier comparing @@ -204,7 +205,9 @@ def clean_keys(obj): delete_key(obj, key) # Remove timestamp for comparison where timestamp is not part of the log line - if obj["event.module"] == "icinga" and obj["event.dataset"] == "startup": + if (obj["event.module"] == "icinga" and obj["event.dataset"] == "startup") or \ + (obj["event.module"] in ["redis", "haproxy"] and obj["event.dataset"] == "log") or \ + (obj["event.module"] == "system" and obj["event.dataset"] in ["auth", "syslog"]): delete_key(obj, "@timestamp") From c77b710ad21ce4c5e4f112ff1b9d880fe5315c61 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Wed, 2 Jan 2019 14:07:30 -0800 Subject: [PATCH 2/2] Fixing formatting --- filebeat/tests/system/test_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filebeat/tests/system/test_modules.py b/filebeat/tests/system/test_modules.py index cd6b6c4fe654..6c8def8984ca 100644 --- a/filebeat/tests/system/test_modules.py +++ b/filebeat/tests/system/test_modules.py @@ -207,7 +207,7 @@ def clean_keys(obj): # Remove timestamp for comparison where timestamp is not part of the log line if (obj["event.module"] == "icinga" and obj["event.dataset"] == "startup") or \ (obj["event.module"] in ["redis", "haproxy"] and obj["event.dataset"] == "log") or \ - (obj["event.module"] == "system" and obj["event.dataset"] in ["auth", "syslog"]): + (obj["event.module"] == "system" and obj["event.dataset"] in ["auth", "syslog"]): delete_key(obj, "@timestamp")