Regenerate expectations for logs without timestamps (#9862)

elastic · Jan 3, 2019 · 9b740a9 · 9b740a9
1 parent 8bc920c
commit 9b740a9
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 21 deletions.
diff --git a/filebeat/module/haproxy/log/test/default.log-expected.json b/filebeat/module/haproxy/log/test/default.log-expected.json
@@ -1,6 +1,5 @@
 [
     {
-        "@timestamp": "2019-09-20T15:42:59.000Z",
         "destination.ip": "1.2.3.4",
         "destination.port": 5000,
         "ecs.version": "1.0.0-beta2",

diff --git a/filebeat/module/haproxy/log/test/haproxy.log-expected.json b/filebeat/module/haproxy/log/test/haproxy.log-expected.json
@@ -1,6 +1,5 @@
 [
     {
-        "@timestamp": "2018-07-30T09:03:52.726Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "log",
         "event.module": "haproxy",

diff --git a/filebeat/module/haproxy/log/test/tcplog.log-expected.json b/filebeat/module/haproxy/log/test/tcplog.log-expected.json
@@ -1,6 +1,5 @@
 [
     {
-        "@timestamp": "2018-09-20T15:44:23.285Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "log",
         "event.module": "haproxy",

diff --git a/filebeat/module/redis/log/test/test.log-expected.json b/filebeat/module/redis/log/test/test.log-expected.json
@@ -1,6 +1,5 @@
 [
     {
-        "@timestamp": "2019-05-30T12:23:52.442Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "log",
         "event.module": "redis",
@@ -12,7 +11,6 @@
         "redis.log.role": "master"
     },
     {
-        "@timestamp": "2019-05-30T10:05:20.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "log",
         "event.module": "redis",
@@ -22,7 +20,6 @@
         "message": "0 clients connected (0 slaves), 618932 bytes in use, 0 shared objects."
     },
     {
-        "@timestamp": "2019-05-31T04:32:08.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "log",
         "event.module": "redis",
@@ -32,7 +29,6 @@
         "message": "The server is now ready to accept connections on port 6379\""
     },
     {
-        "@timestamp": "2017-05-30T10:57:24.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "log",
         "event.module": "redis",

diff --git a/filebeat/module/system/auth/test/test.log-expected.json b/filebeat/module/system/auth/test/test.log-expected.json
@@ -1,6 +1,5 @@
 [
     {
-        "@timestamp": "2019-02-21T21:54:44.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.action": "Accepted",
         "event.dataset": "auth",
@@ -16,7 +15,6 @@
         "user.name": "vagrant"
     },
     {
-        "@timestamp": "2019-02-23T00:13:35.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.action": "Accepted",
         "event.dataset": "auth",
@@ -31,7 +29,6 @@
         "user.name": "vagrant"
     },
     {
-        "@timestamp": "2019-02-21T21:56:12.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.action": "Invalid",
         "event.dataset": "auth",
@@ -44,7 +41,6 @@
         "user.name": "test"
     },
     {
-        "@timestamp": "2019-02-20T08:35:22.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.action": "Failed",
         "event.dataset": "auth",
@@ -65,7 +61,6 @@
         "user.name": "root"
     },
     {
-        "@timestamp": "2019-02-21T23:35:33.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "auth",
         "event.module": "system",
@@ -79,7 +74,6 @@
         "user.name": "vagrant"
     },
     {
-        "@timestamp": "2019-02-19T15:30:04.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "auth",
         "event.module": "system",
@@ -95,7 +89,6 @@
         "system.auth.ssh.dropped_ip": "123.57.245.163"
     },
     {
-        "@timestamp": "2019-02-23T00:08:48.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "auth",
         "event.module": "system",
@@ -109,7 +102,6 @@
         "user.name": "vagrant"
     },
     {
-        "@timestamp": "2019-02-24T00:13:02.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "auth",
         "event.module": "system",
@@ -124,7 +116,6 @@
         "user.name": "tsg"
     },
     {
-        "@timestamp": "2019-02-22T11:47:05.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "auth",
         "event.module": "system",
@@ -136,7 +127,6 @@
         "process.pid": 6991
     },
     {
-        "@timestamp": "2019-02-22T11:47:05.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "auth",
         "event.module": "system",

diff --git a/filebeat/module/system/syslog/test/darwin-syslog-sample.log-expected.json b/filebeat/module/system/syslog/test/darwin-syslog-sample.log-expected.json
@@ -1,6 +1,5 @@
 [
     {
-        "@timestamp": "2019-12-13T11:35:28.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "syslog",
         "event.module": "system",
@@ -15,7 +14,6 @@
         "process.pid": 21412
     },
     {
-        "@timestamp": "2019-12-13T11:35:28.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "syslog",
         "event.module": "system",
@@ -27,7 +25,6 @@
         "process.pid": 21412
     },
     {
-        "@timestamp": "2019-04-04T03:39:57.000Z",
         "ecs.version": "1.0.0-beta2",
         "event.dataset": "syslog",
         "event.module": "system",

diff --git a/filebeat/tests/system/test_modules.py b/filebeat/tests/system/test_modules.py
@@ -178,7 +178,6 @@ 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