Skip to content

Commit 746c0e1

Browse files
r00tu53rr00tu53r
committed
Upgrade ECS to 8.0.0
1 parent 2980008 commit 746c0e1

9 files changed

Lines changed: 148 additions & 85 deletions

File tree

‎packages/traefik/_dev/build/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
dependencies:
22
ecs:
3-
reference: git@1.12
3+
reference: git@8.0

‎packages/traefik/changelog.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
- version: "1.3.0"
2+
changes:
3+
- description: Update to ECS 8.0
4+
type: enhancement
5+
link: https://github.com/elastic/integrations/pull/2513
16
# newer versions go on top
27
- version: "1.2.2"
38
changes:

‎packages/traefik/data_stream/access/_dev/test/pipeline/test-format-common.log-expected.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"@timestamp": "2017-10-02T20:22:07.000Z",
2626
"ecs": {
27-
"version": "1.12.0"
27+
"version": "8.0.0"
2828
},
2929
"related": {
3030
"ip": [
@@ -46,7 +46,7 @@
4646
},
4747
"event": {
4848
"duration": 2000000,
49-
"ingested": "2021-12-14T14:59:04.121402887Z",
49+
"ingested": "2022-01-12T04:36:41.441738924Z",
5050
"original": "192.168.33.1 - - [02/Oct/2017:20:22:07 +0000] \"GET /ui/favicons/favicon-16x16.png HTTP/1.1\" 304 0 \"http://example.com/login\" \"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36\" 262 \"Host-host-1\" \"http://172.19.0.3:5601\" 2ms",
5151
"created": "2020-04-28T11:07:58.223Z",
5252
"kind": "event",
@@ -115,7 +115,7 @@
115115
},
116116
"@timestamp": "2017-10-02T20:22:08.000Z",
117117
"ecs": {
118-
"version": "1.12.0"
118+
"version": "8.0.0"
119119
},
120120
"related": {
121121
"ip": [
@@ -137,7 +137,7 @@
137137
},
138138
"event": {
139139
"duration": 3000000,
140-
"ingested": "2021-12-14T14:59:04.121404978Z",
140+
"ingested": "2022-01-12T04:36:41.441741089Z",
141141
"original": "89.160.20.156 - - [02/Oct/2017:20:22:08 +0000] \"GET /ui/favicons/favicon.ico HTTP/1.1\" 304 0 \"http://example.com/login\" \"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36\" 271 \"Host-host1\" \"http://172.19.0.3:5601\" 3ms",
142142
"created": "2020-04-28T11:07:58.223Z",
143143
"kind": "event",
@@ -206,7 +206,7 @@
206206
},
207207
"@timestamp": "2018-02-28T17:30:33.000Z",
208208
"ecs": {
209-
"version": "1.12.0"
209+
"version": "8.0.0"
210210
},
211211
"related": {
212212
"ip": [
@@ -227,7 +227,7 @@
227227
},
228228
"event": {
229229
"duration": 247000000,
230-
"ingested": "2021-12-14T14:59:04.121405389Z",
230+
"ingested": "2022-01-12T04:36:41.441741892Z",
231231
"original": "89.160.20.156 - - [28/Feb/2018:17:30:33 +0000] \"GET /en/ HTTP/2.0\" 200 2814 - \"Mozilla/5.0 (iPhone; CPU iPhone OS 11_2_5 like Mac OS X) AppleWebKit/604.5.6 (KHTML, like Gecko) Version/11.0 Mobile/15D60 Safari/604.1\" 13 \"Host-host1-com-0\" \"http://172.19.0.6:14008\" 247ms",
232232
"created": "2020-04-28T11:07:58.223Z",
233233
"kind": "event",
@@ -280,7 +280,7 @@
280280
},
281281
"@timestamp": "2018-11-29T15:03:51.000Z",
282282
"ecs": {
283-
"version": "1.12.0"
283+
"version": "8.0.0"
284284
},
285285
"related": {
286286
"ip": [
@@ -302,7 +302,7 @@
302302
},
303303
"event": {
304304
"duration": 0,
305-
"ingested": "2021-12-14T14:59:04.121405749Z",
305+
"ingested": "2022-01-12T04:36:41.441742687Z",
306306
"original": "::1 - - [29/Nov/2018:15:03:51 +0000] \"GET / HTTP/1.1\" 404 19 \"-\" \"curl/7.62.0\" 10 \"backend not found\" \"/\" 0ms",
307307
"created": "2020-04-28T11:07:58.223Z",
308308
"kind": "event",
@@ -368,7 +368,7 @@
368368
},
369369
"@timestamp": "2018-01-19T10:01:02.000Z",
370370
"ecs": {
371-
"version": "1.12.0"
371+
"version": "8.0.0"
372372
},
373373
"related": {
374374
"ip": [
@@ -389,7 +389,7 @@
389389
},
390390
"event": {
391391
"duration": 13000000,
392-
"ingested": "2021-12-14T14:59:04.121406108Z",
392+
"ingested": "2022-01-12T04:36:41.441743407Z",
393393
"original": "89.160.20.156 - - [19/Jan/2018:10:01:02 +0000] \"GET /assets/52f8f2e711d235d76044799e/owners?oauth_token=ya29.GltABOXd_gtG-XVvYX2YhxXJiXVvbHRMXn9fbzc_mDfl2rDhqK0CrAlwuwwRWnNnEaMDwkmyI7-QGbRSB0Hzje2cc__FjTQ1iuiYTSIBaIPfxSWip5jx6zqvsVVo HTTP/1.1\" 200 85 - \"Android\" 623112 \"Host-api-wearerealitygames-com-2\" \"http://172.25.0.9:4140\" 13ms",
394394
"created": "2020-04-28T11:07:58.223Z",
395395
"kind": "event",
@@ -457,7 +457,7 @@
457457
},
458458
"@timestamp": "2018-01-19T10:01:02.000Z",
459459
"ecs": {
460-
"version": "1.12.0"
460+
"version": "8.0.0"
461461
},
462462
"related": {
463463
"ip": [
@@ -478,7 +478,7 @@
478478
},
479479
"event": {
480480
"duration": 8000000,
481-
"ingested": "2021-12-14T14:59:04.121406456Z",
481+
"ingested": "2022-01-12T04:36:41.441744237Z",
482482
"original": "89.160.20.156 - - [19/Jan/2018:10:01:02 +0000] \"GET /marketplace/tax?oauth_token=ya29.Gl0fBWnrJ7DcEU-tN-O3Vxn2XZVaz2I-hFTjP1JQzhYFVT-SKtlmo9hSzrx3n82LUwUxJ1s5lmU8U3Mc9gA_aCxBk49ShYEwvmYOWxJJyldDIJ7hY4us4LoiSY1OqAM HTTP/1.1\" 200 150 - \"Android\" 623114 \"Host-api-wearerealitygames-com-2\" \"http://172.25.0.6:4140\" 8ms",
483483
"created": "2020-04-28T11:07:58.223Z",
484484
"kind": "event",
@@ -525,7 +525,7 @@
525525
},
526526
"@timestamp": "2000-10-10T20:55:36.000Z",
527527
"ecs": {
528-
"version": "1.12.0"
528+
"version": "8.0.0"
529529
},
530530
"related": {
531531
"user": [
@@ -548,7 +548,7 @@
548548
}
549549
},
550550
"event": {
551-
"ingested": "2021-12-14T14:59:04.121406812Z",
551+
"ingested": "2022-01-12T04:36:41.441744963Z",
552552
"original": "127.0.0.1 - frank [10/Oct/2000:13:55:36 -0700] \"GET /apache_pb.gif HTTP/1.0\" 200 2326",
553553
"created": "2020-04-28T11:07:58.223Z",
554554
"kind": "event",

‎packages/traefik/data_stream/access/_dev/test/pipeline/test-format-json.log-expected.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"@timestamp": "2021-03-16T18:56:54Z",
2727
"ecs": {
28-
"version": "1.12.0"
28+
"version": "8.0.0"
2929
},
3030
"related": {
3131
"ip": [
@@ -46,7 +46,7 @@
4646
},
4747
"event": {
4848
"duration": 40356,
49-
"ingested": "2021-12-14T14:59:05.208971580Z",
49+
"ingested": "2022-01-12T04:36:44.054735236Z",
5050
"original": "{\"BackendAddr\":\"\",\"BackendName\":\"Traefik\",\"BackendURL\":{\"Scheme\":\"\",\"Opaque\":\"\",\"User\":null,\"Host\":\"\",\"Path\":\"/\",\"RawPath\":\"\",\"ForceQuery\":false,\"RawQuery\":\"\",\"Fragment\":\"\"},\"ClientAddr\":\"127.0.0.1:48658\",\"ClientHost\":\"127.0.0.1\",\"ClientPort\":\"48658\",\"ClientUsername\":\"-\",\"DownstreamContentSize\":19,\"DownstreamStatus\":404,\"DownstreamStatusLine\":\"404 Not Found\",\"Duration\":40356,\"FrontendName\":\"backend not found\",\"OriginContentSize\":19,\"OriginDuration\":4086,\"OriginStatus\":404,\"OriginStatusLine\":\"404 Not Found\",\"Overhead\":36270,\"RequestAddr\":\"backend.elastic-package-service.docker.localhost\",\"RequestContentSize\":0,\"RequestCount\":7,\"RequestHost\":\"backend.elastic-package-service.docker.localhost\",\"RequestLine\":\"GET / HTTP/1.1\",\"RequestMethod\":\"GET\",\"RequestPath\":\"/\",\"RequestPort\":\"-\",\"RequestProtocol\":\"HTTP/1.1\",\"RetryAttempts\":0,\"StartLocal\":\"2021-03-16T18:56:54.735539596Z\",\"StartUTC\":\"2021-03-16T18:56:54.735539596Z\",\"downstream_Content-Type\":\"text/plain; charset=utf-8\",\"downstream_X-Content-Type-Options\":\"nosniff\",\"level\":\"info\",\"msg\":\"\",\"origin_Content-Type\":\"text/plain; charset=utf-8\",\"origin_X-Content-Type-Options\":\"nosniff\",\"request_Accept\":\"*/*\",\"request_User-Agent\":\"curl/7.67.0\",\"time\":\"2021-03-16T18:56:54Z\"}",
5151
"created": "2020-04-28T11:07:58.223Z",
5252
"kind": "event",
@@ -101,7 +101,7 @@
101101
},
102102
"@timestamp": "2021-03-16T19:08:41Z",
103103
"ecs": {
104-
"version": "1.12.0"
104+
"version": "8.0.0"
105105
},
106106
"related": {
107107
"ip": [
@@ -123,7 +123,7 @@
123123
},
124124
"event": {
125125
"duration": 3034764,
126-
"ingested": "2021-12-14T14:59:05.208974022Z",
126+
"ingested": "2022-01-12T04:36:44.054737669Z",
127127
"original": "{\"BackendAddr\":\"172.21.0.2:80\",\"BackendName\":\"backend-backend-docker\",\"BackendURL\":{\"Scheme\":\"http\",\"Opaque\":\"\",\"User\":null,\"Host\":\"172.21.0.2:80\",\"Path\":\"\",\"RawPath\":\"\",\"ForceQuery\":false,\"RawQuery\":\"\",\"Fragment\":\"\"},\"ClientAddr\":\"172.21.0.1:59068\",\"ClientHost\":\"172.21.0.1\",\"ClientPort\":\"59068\",\"ClientUsername\":\"-\",\"DownstreamContentSize\":383,\"DownstreamStatus\":200,\"DownstreamStatusLine\":\"200 OK\",\"Duration\":3034764,\"FrontendName\":\"Host-backend-docker-docker-localhost-2\",\"OriginContentSize\":383,\"OriginDuration\":2155389,\"OriginStatus\":200,\"OriginStatusLine\":\"200 OK\",\"Overhead\":879375,\"RequestAddr\":\"backend.docker.docker.localhost\",\"RequestContentSize\":0,\"RequestCount\":27,\"RequestHost\":\"backend.docker.docker.localhost\",\"RequestLine\":\"GET / HTTP/1.1\",\"RequestMethod\":\"GET\",\"RequestPath\":\"/\",\"RequestPort\":\"-\",\"RequestProtocol\":\"HTTP/1.1\",\"RetryAttempts\":0,\"StartLocal\":\"2021-03-16T19:08:41.039598834Z\",\"StartUTC\":\"2021-03-16T19:08:41.039598834Z\",\"downstream_Content-Length\":\"383\",\"downstream_Content-Type\":\"text/plain; charset=utf-8\",\"downstream_Date\":\"Tue, 16 Mar 2021 19:08:41 GMT\",\"level\":\"info\",\"msg\":\"\",\"origin_Content-Length\":\"383\",\"origin_Content-Type\":\"text/plain; charset=utf-8\",\"origin_Date\":\"Tue, 16 Mar 2021 19:08:41 GMT\",\"request_Accept\":\"*/*\",\"request_User-Agent\":\"curl/7.64.1\",\"time\":\"2021-03-16T19:08:41Z\"}",
128128
"created": "2020-04-28T11:07:58.223Z",
129129
"kind": "event",

‎packages/traefik/data_stream/access/elasticsearch/ingest_pipeline/default.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ processors:
66
value: '{{_ingest.timestamp}}'
77
- set:
88
field: ecs.version
9-
value: '1.12.0'
9+
value: '8.0.0'
1010
- rename:
1111
field: '@timestamp'
1212
target_field: event.created
@@ -105,4 +105,4 @@ processors:
105105
on_failure:
106106
- set:
107107
field: error.message
108-
value: '{{ _ingest.on_failure_message }}'
108+
value: '{{ _ingest.on_failure_message }}'

‎packages/traefik/data_stream/access/sample_event.json‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
{
2-
"@timestamp": "2021-03-18T20:39:44.000Z",
2+
"@timestamp": "2022-01-12T04:40:22.000Z",
33
"agent": {
4-
"ephemeral_id": "e500ecee-9e3f-4056-94ff-1cb0d411d7fe",
5-
"hostname": "docker-fleet-agent",
6-
"id": "945634fb-af88-4ace-ab8e-58c7177e751c",
4+
"ephemeral_id": "49d5036c-5357-4aee-b7ae-08e2615d64e2",
5+
"id": "9878d192-22ad-49b6-a6c2-9959b0815d04",
76
"name": "docker-fleet-agent",
87
"type": "filebeat",
9-
"version": "7.13.0"
8+
"version": "8.0.0-beta1"
109
},
1110
"data_stream": {
1211
"dataset": "traefik.access",
1312
"namespace": "ep",
1413
"type": "logs"
1514
},
1615
"ecs": {
17-
"version": "1.8.0"
16+
"version": "8.0.0"
1817
},
1918
"elastic_agent": {
20-
"id": "3fe93adb-3018-49ae-933f-252502b43737",
21-
"snapshot": true,
22-
"version": "7.13.0"
19+
"id": "9878d192-22ad-49b6-a6c2-9959b0815d04",
20+
"snapshot": false,
21+
"version": "8.0.0-beta1"
2322
},
2423
"event": {
24+
"agent_id_status": "verified",
2525
"category": [
2626
"web"
2727
],
28-
"created": "2021-03-18T20:39:53.657Z",
28+
"created": "2022-01-12T04:40:38.534Z",
2929
"dataset": "traefik.access",
30-
"duration": 9000000,
31-
"ingested": "2021-03-18T20:39:54.688854100Z",
30+
"duration": 0,
31+
"ingested": "2022-01-12T04:40:39Z",
3232
"kind": "event",
3333
"outcome": "success",
3434
"type": [
@@ -57,6 +57,9 @@
5757
},
5858
"offset": 0
5959
},
60+
"network": {
61+
"transport": "tcp"
62+
},
6063
"related": {
6164
"ip": [
6265
"127.0.0.1"
@@ -66,9 +69,12 @@
6669
"address": "127.0.0.1",
6770
"ip": "127.0.0.1"
6871
},
72+
"tags": [
73+
"forwarded"
74+
],
6975
"traefik": {
7076
"access": {
71-
"backend_url": "http://172.26.0.2:80",
77+
"backend_url": "http://172.21.0.2:80",
7278
"frontend_name": "Host-backend-elastic-package-service-docker-localhost-0",
7379
"request_count": 1,
7480
"user_identifier": "-"
@@ -85,7 +91,7 @@
8591
"name": "Other"
8692
},
8793
"name": "curl",
88-
"original": "curl/7.67.0",
89-
"version": "7.67.0"
94+
"original": "curl/7.79.1",
95+
"version": "7.79.1"
9096
}
9197
}

‎packages/traefik/data_stream/health/sample_event.json‎

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,76 @@
11
{
2-
"@timestamp": "2021-03-18T20:40:18.823Z",
2+
"@timestamp": "2022-01-12T04:42:17.051Z",
33
"agent": {
4-
"ephemeral_id": "7679e46c-fb2a-4862-a5cb-dd23154a73c7",
5-
"hostname": "docker-fleet-agent",
6-
"id": "16ad4a02-aaa8-4069-8adf-28759817fa07",
4+
"ephemeral_id": "ddbf0fe2-5932-46a6-833b-101861fae9e6",
5+
"id": "9878d192-22ad-49b6-a6c2-9959b0815d04",
76
"name": "docker-fleet-agent",
87
"type": "metricbeat",
9-
"version": "7.13.0"
8+
"version": "8.0.0-beta1"
109
},
1110
"data_stream": {
1211
"dataset": "traefik.health",
1312
"namespace": "ep",
1413
"type": "metrics"
1514
},
1615
"ecs": {
17-
"version": "1.8.0"
16+
"version": "1.12.0"
1817
},
1918
"elastic_agent": {
20-
"id": "3fe93adb-3018-49ae-933f-252502b43737",
21-
"snapshot": true,
22-
"version": "7.13.0"
19+
"id": "9878d192-22ad-49b6-a6c2-9959b0815d04",
20+
"snapshot": false,
21+
"version": "8.0.0-beta1"
2322
},
2423
"event": {
24+
"agent_id_status": "verified",
2525
"dataset": "traefik.health",
26-
"duration": 12419800,
26+
"duration": 37594678,
27+
"ingested": "2022-01-12T04:42:18Z",
2728
"module": "traefik"
2829
},
30+
"host": {
31+
"architecture": "x86_64",
32+
"containerized": true,
33+
"hostname": "docker-fleet-agent",
34+
"id": "4ccba669f0df47fa3f57a9e4169ae7f1",
35+
"ip": [
36+
"172.18.0.4"
37+
],
38+
"mac": [
39+
"02:42:ac:12:00:04"
40+
],
41+
"name": "docker-fleet-agent",
42+
"os": {
43+
"codename": "Core",
44+
"family": "redhat",
45+
"kernel": "5.11.0-44-generic",
46+
"name": "CentOS Linux",
47+
"platform": "centos",
48+
"type": "linux",
49+
"version": "7 (Core)"
50+
}
51+
},
2952
"metricset": {
3053
"name": "health",
3154
"period": 10000
3255
},
3356
"service": {
34-
"address": "http://elastic-package-service_traefik_format_common_1:8080/health",
57+
"address": "http://elastic-package-service-traefik_format_common-1:8080/health",
3558
"name": "traefik",
3659
"type": "traefik"
3760
},
3861
"traefik": {
3962
"health": {
4063
"response": {
4164
"avg_time": {
42-
"us": 1708
65+
"us": 3441
4366
},
44-
"count": 9,
67+
"count": 16,
4568
"status_codes": {
46-
"200": 9
69+
"200": 16
4770
}
4871
},
4972
"uptime": {
50-
"sec": 10
73+
"sec": 20
5174
}
5275
}
5376
}

0 commit comments

Comments
 (0)