Update golden files for icinga/startup test to exclude timestamp (#9506)

ruflin · web-flow · commit ea8e6d6c9d54 · 2018-12-12T13:38:04.000+01:00
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.
diff --git a/filebeat/module/icinga/startup/test/test.log-expected.json b/filebeat/module/icinga/startup/test/test.log-expected.json
@@ -1,6 +1,5 @@
 [
     {
-        "@timestamp": "2018-11-06T18:29:13.579Z", 
         "event.dataset": "startup", 
         "event.module": "icinga", 
         "icinga.startup.facility": "cli", 
@@ -10,7 +9,6 @@
         "log.offset": 0
     }, 
     {
-        "@timestamp": "2018-11-06T18:29:13.579Z", 
         "event.dataset": "startup", 
         "event.module": "icinga", 
         "icinga.startup.facility": "cli", 
diff --git a/filebeat/tests/system/test_modules.py b/filebeat/tests/system/test_modules.py
@@ -159,6 +159,7 @@ def _test_expected_events(self, test_file, objects):
                 for k, obj in enumerate(objects):
                     objects[k] = self.flatten_object(obj, {}, "")
                     clean_keys(objects[k])
+
                 json.dump(objects, f, indent=4, sort_keys=True)
 
         with open(test_file + "-expected.json", "r") as f:
@@ -175,11 +176,6 @@ def _test_expected_events(self, test_file, objects):
                 obj = self.flatten_object(obj, {}, "")
                 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":
-                    delete_key(obj, "@timestamp")
-                    delete_key(ev, "@timestamp")
-
                 if ev == obj:
                     found = True
                     break
@@ -199,6 +195,10 @@ def clean_keys(obj):
     for key in host_keys + time_keys + other_keys:
         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":
+        delete_key(obj, "@timestamp")
+
 
 def delete_key(obj, key):
     if key in obj:

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "@timestamp": "2018-11-06T18:29:13.579Z",`
`4`	`3`	`"event.dataset": "startup",`
`5`	`4`	`"event.module": "icinga",`
`6`	`5`	`"icinga.startup.facility": "cli",`
`@@ -10,7 +9,6 @@`
`10`	`9`	`"log.offset": 0`
`11`	`10`	`},`
`12`	`11`	`{`
`13`		`- "@timestamp": "2018-11-06T18:29:13.579Z",`
`14`	`12`	`"event.dataset": "startup",`
`15`	`13`	`"event.module": "icinga",`
`16`	`14`	`"icinga.startup.facility": "cli",`