Skip to content

[nginx] Upgrade ECS to 8.0.0 #2505

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jan 24, 2022
Merged

[nginx] Upgrade ECS to 8.0.0 #2505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bc3656
Upgrade ECS to 8.0.0
r00tu53r Jan 12, 2022
2f5aca3
Merge branch 'master' into feat/ecs-8-0-nginx
r00tu53r Jan 12, 2022
87cdc00
fix changelog
r00tu53r Jan 12, 2022
6d82c02
update readme
r00tu53r Jan 12, 2022
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
2 changes: 1 addition & 1 deletion packages/nginx/_dev/build/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies:
ecs:
reference: git@1.12
reference: git@8.0
5 changes: 5 additions & 0 deletions packages/nginx/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.3.0"
changes:
- description: Update to ECS 8.0
type: enhancement
link: https://github.com/elastic/integrations/pull/2505
- version: "1.2.3"
changes:
- description: Regenerate test files using the new GeoIP database
Expand Down
72 changes: 36 additions & 36 deletions packages/nginx/data_stream/access/_dev/test/pipeline/test-access.log-expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
],
"@timestamp": "2016-10-25T12:49:33.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -43,7 +43,7 @@
},
"http": {
"request": {
"method": "get"
"method": "GET"
},
"version": "1.1",
"response": {
Expand All @@ -54,7 +54,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282353575Z",
"ingested": "2022-01-12T03:18:12.673228241Z",
"original": "67.43.156.13 - - [25/Oct/2016:14:49:33 +0200] \"GET / HTTP/1.1\" 200 612 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.59 Safari/537.36\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down Expand Up @@ -114,7 +114,7 @@
],
"@timestamp": "2016-10-25T12:49:34.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -124,7 +124,7 @@
},
"http": {
"request": {
"method": "get",
"method": "GET",
"referrer": "http://localhost:8080/"
},
"version": "1.1",
Expand All @@ -136,7 +136,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282356218Z",
"ingested": "2022-01-12T03:18:12.673230472Z",
"original": "67.43.156.13 - - [25/Oct/2016:14:49:34 +0200] \"GET /favicon.ico HTTP/1.1\" 404 571 \"http://localhost:8080/\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.59 Safari/537.36\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down Expand Up @@ -195,7 +195,7 @@
],
"@timestamp": "2016-10-25T12:50:44.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -205,7 +205,7 @@
},
"http": {
"request": {
"method": "get"
"method": "GET"
},
"version": "1.1",
"response": {
Expand All @@ -216,7 +216,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282356644Z",
"ingested": "2022-01-12T03:18:12.673231678Z",
"original": "67.43.156.13 - - [25/Oct/2016:14:50:44 +0200] \"GET /adsasd HTTP/1.1\" 404 571 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.59 Safari/537.36\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down Expand Up @@ -275,7 +275,7 @@
],
"@timestamp": "2016-12-07T09:34:43.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -285,7 +285,7 @@
},
"http": {
"request": {
"method": "get"
"method": "GET"
},
"version": "1.1",
"response": {
Expand All @@ -296,7 +296,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282357030Z",
"ingested": "2022-01-12T03:18:12.673232740Z",
"original": "67.43.156.13 - - [07/Dec/2016:10:34:43 +0100] \"GET / HTTP/1.1\" 200 612 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down Expand Up @@ -356,7 +356,7 @@
],
"@timestamp": "2016-12-07T09:34:43.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -366,7 +366,7 @@
},
"http": {
"request": {
"method": "get",
"method": "GET",
"referrer": "http://localhost:8080/"
},
"version": "1.1",
Expand All @@ -378,7 +378,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282357376Z",
"ingested": "2022-01-12T03:18:12.673233809Z",
"original": "67.43.156.13 - - [07/Dec/2016:10:34:43 +0100] \"GET /favicon.ico HTTP/1.1\" 404 571 \"http://localhost:8080/\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down Expand Up @@ -437,7 +437,7 @@
],
"@timestamp": "2016-12-07T09:43:18.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -447,7 +447,7 @@
},
"http": {
"request": {
"method": "get"
"method": "GET"
},
"version": "1.1",
"response": {
Expand All @@ -458,7 +458,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282357746Z",
"ingested": "2022-01-12T03:18:12.673234868Z",
"original": "67.43.156.13 - - [07/Dec/2016:10:43:18 +0100] \"GET /test HTTP/1.1\" 404 571 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down Expand Up @@ -517,7 +517,7 @@
],
"@timestamp": "2016-12-07T09:43:21.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -527,7 +527,7 @@
},
"http": {
"request": {
"method": "get"
"method": "GET"
},
"version": "1.1",
"response": {
Expand All @@ -538,7 +538,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282358112Z",
"ingested": "2022-01-12T03:18:12.673235892Z",
"original": "67.43.156.13 - - [07/Dec/2016:10:43:21 +0100] \"GET /test HTTP/1.1\" 404 571 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down Expand Up @@ -597,7 +597,7 @@
],
"@timestamp": "2016-12-07T09:43:23.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -607,7 +607,7 @@
},
"http": {
"request": {
"method": "get"
"method": "GET"
},
"version": "1.1",
"response": {
Expand All @@ -618,7 +618,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282358462Z",
"ingested": "2022-01-12T03:18:12.673236930Z",
"original": "67.43.156.13 - - [07/Dec/2016:10:43:23 +0100] \"GET /test1 HTTP/1.1\" 404 571 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down Expand Up @@ -665,7 +665,7 @@
],
"@timestamp": "2016-12-07T10:04:37.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -675,7 +675,7 @@
},
"http": {
"request": {
"method": "get"
"method": "GET"
},
"version": "1.1",
"response": {
Expand All @@ -686,7 +686,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282358812Z",
"ingested": "2022-01-12T03:18:12.673238006Z",
"original": "127.0.0.1 - - [07/Dec/2016:11:04:37 +0100] \"GET /test1 HTTP/1.1\" 404 571 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/54.0.2840.98 Safari/537.36\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down Expand Up @@ -733,7 +733,7 @@
],
"@timestamp": "2016-12-07T10:04:58.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -743,7 +743,7 @@
},
"http": {
"request": {
"method": "get"
"method": "GET"
},
"version": "1.1",
"response": {
Expand All @@ -754,7 +754,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282359158Z",
"ingested": "2022-01-12T03:18:12.673239059Z",
"original": "127.0.0.1 - - [07/Dec/2016:11:04:58 +0100] \"GET / HTTP/1.1\" 304 0 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:49.0) Gecko/20100101 Firefox/49.0\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down Expand Up @@ -801,7 +801,7 @@
],
"@timestamp": "2016-12-07T10:04:59.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -811,7 +811,7 @@
},
"http": {
"request": {
"method": "get"
"method": "GET"
},
"version": "1.1",
"response": {
Expand All @@ -822,7 +822,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282359505Z",
"ingested": "2022-01-12T03:18:12.673240124Z",
"original": "127.0.0.1 - - [07/Dec/2016:11:04:59 +0100] \"GET / HTTP/1.1\" 304 0 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:49.0) Gecko/20100101 Firefox/49.0\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down Expand Up @@ -869,7 +869,7 @@
],
"@timestamp": "2016-12-07T10:05:07.000Z",
"ecs": {
"version": "1.12.0"
"version": "8.0.0"
},
"_tmp": {},
"related": {
Expand All @@ -879,7 +879,7 @@
},
"http": {
"request": {
"method": "get"
"method": "GET"
},
"version": "1.1",
"response": {
Expand All @@ -890,7 +890,7 @@
}
},
"event": {
"ingested": "2021-12-14T14:48:32.282360050Z",
"ingested": "2022-01-12T03:18:12.673241307Z",
"original": "127.0.0.1 - - [07/Dec/2016:11:05:07 +0100] \"GET /taga HTTP/1.1\" 404 169 \"-\" \"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:49.0) Gecko/20100101 Firefox/49.0\"\nlessons.example.com 192.168.0.1 - - [09/Jun/2020:12:10:39 -0700] \"GET /A%20Beka%20G1%20Howe/029_AND_30/15%20reading%20elephants.mp4 HTTP/1.1\" 206 7648063 \"http://lessons.example.com/A%20Beka%20G1%20Howe/029_AND_30/15%20reading%20elephants.mp4\" \"Mozilla/5.0 (Linux; Android 5.1.1; KFFOWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/81.2.16 like Chrome/81.0.4044.138 Safari/537.36\"\nlessons.example.com 192.168.0.1 - - [09/Jun/2020:12:15:39 -0700] \"GET /%D0%A0%D1%83%D1%81%D1%81%D0%BA%D0%B0%D1%8F%20%D1%88%D0%BA%D0%BE%D0%BB%D0%B0%20-%20InternetUrok%201%D0%BA%D0%BB%D0%B0%D1%81%D1%81/ HTTP/1.1\" 206 7648063 \"http://lessons.example.com/A%20Beka%20G1%20Howe/029_AND_30/15%20reading%20elephants.mp4\" \"Mozilla/5.0 (Linux; Android 5.1.1; KFFOWI) AppleWebKit/537.36 (KHTML, like Gecko) Silk/81.2.16 like Chrome/81.0.4044.138 Safari/537.36\"",
"created": "2020-04-28T11:07:58.223Z",
"kind": "event",
Expand Down
Loading