Skip to content
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

Regenerate expectations for logs without timestamps #9862

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion filebeat/module/haproxy/log/test/default.log-expected.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
1 change: 0 additions & 1 deletion filebeat/module/haproxy/log/test/haproxy.log-expected.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[
{
"@timestamp": "2018-07-30T09:03:52.726Z",
"ecs.version": "1.0.0-beta2",
"event.dataset": "log",
"event.module": "haproxy",
Expand Down
1 change: 0 additions & 1 deletion filebeat/module/haproxy/log/test/tcplog.log-expected.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[
{
"@timestamp": "2018-09-20T15:44:23.285Z",
"ecs.version": "1.0.0-beta2",
"event.dataset": "log",
"event.module": "haproxy",
Expand Down
4 changes: 0 additions & 4 deletions filebeat/module/redis/log/test/test.log-expected.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[
{
"@timestamp": "2019-05-30T12:23:52.442Z",
"ecs.version": "1.0.0-beta2",
"event.dataset": "log",
"event.module": "redis",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
10 changes: 0 additions & 10 deletions filebeat/module/system/auth/test/test.log-expected.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[
{
"@timestamp": "2019-02-21T21:54:44.000Z",
"ecs.version": "1.0.0-beta2",
"event.action": "Accepted",
"event.dataset": "auth",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[
{
"@timestamp": "2019-12-13T11:35:28.000Z",
"ecs.version": "1.0.0-beta2",
"event.dataset": "syslog",
"event.module": "system",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
1 change: 0 additions & 1 deletion filebeat/tests/system/test_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down