Skip to content

Commit 4d30e5a

Browse files
r00tu53rr00tu53r
committed
Upgrade ECS to 8.0.0
1 parent 2aa502e commit 4d30e5a

File tree

11 files changed

+319
-19
lines changed

11 files changed

+319
-19
lines changed

‎packages/haproxy/_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/haproxy/_dev/build/docs/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ The `info` and `stat` datasets were tested with tested with HAProxy versions fro
1414

1515
The `log` dataset collects the HAProxy application logs.
1616

17+
{{event "log"}}
18+
1719
{{fields "log"}}
1820

1921
## Metrics

‎packages/haproxy/changelog.yml‎

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

‎packages/haproxy/data_stream/log/_dev/test/pipeline/test-default.log-expected.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"name": "haproxy",
66
"pid": 24551
77
},
8-
"@timestamp": "2021-09-20T15:42:59.000Z",
8+
"@timestamp": "2022-09-20T15:42:59.000Z",
99
"ecs": {
10-
"version": "1.12.0"
10+
"version": "8.0.0"
1111
},
1212
"related": {
1313
"ip": [
@@ -42,7 +42,7 @@
4242
"ip": "67.43.156.13"
4343
},
4444
"event": {
45-
"ingested": "2021-12-14T14:46:40.578911001Z",
45+
"ingested": "2022-01-11T00:34:38.600286711Z",
4646
"original": "Sep 20 15:42:59 67.43.156.13 haproxy[24551]: Connect from 67.43.156.13:40780 to 67.43.156.13:5000 (main/HTTP)",
4747
"category": [
4848
"web",

‎packages/haproxy/data_stream/log/_dev/test/pipeline/test-haproxy.log-expected.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
],
3434
"@timestamp": "2018-07-30T09:03:52.726Z",
3535
"ecs": {
36-
"version": "1.12.0"
36+
"version": "8.0.0"
3737
},
3838
"related": {
3939
"ip": [
@@ -85,7 +85,7 @@
8585
},
8686
"event": {
8787
"duration": 2000000,
88-
"ingested": "2021-12-14T14:46:40.692084383Z",
88+
"ingested": "2022-01-11T00:34:39.019318897Z",
8989
"original": "Jul 30 09:03:52 localhost haproxy[32450]: 67.43.156.13:38862 [30/Jul/2018:09:03:52.726] incoming~ docs_microservice/docs 0/0/1/0/2 304 168 - - ---- 6/6/0/0/0 0/0 {docs.example.internal||} {|||} \"GET /component---src-pages-index-js-4b15624544f97cf0bb8f.js HTTP/1.1\"",
9090
"category": [
9191
"web"
@@ -115,7 +115,7 @@
115115
],
116116
"@timestamp": "2021-05-22T02:22:22.222Z",
117117
"ecs": {
118-
"version": "1.12.0"
118+
"version": "8.0.0"
119119
},
120120
"haproxy": {
121121
"server_name": "node2",
@@ -158,7 +158,7 @@
158158
},
159159
"event": {
160160
"duration": 18000000,
161-
"ingested": "2021-12-14T14:46:40.692086776Z",
161+
"ingested": "2022-01-11T00:34:39.019322658Z",
162162
"original": "May 22 02:22:22 server1 haproxy[5089]: -:22222 [22/May/2021:02:22:22.222] www-https~ myapp/node2 site.domain.com 0/0/0/18/18 200 200 - - ---- 222/222/2/0/0 0/0 \"OPTIONS /api/v2/app/ HTTP/1.1\"",
163163
"category": [
164164
"web"

‎packages/haproxy/data_stream/log/_dev/test/pipeline/test-httplog-no-headers.log-expected.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
],
2121
"@timestamp": "2018-12-10T12:01:46.395Z",
2222
"ecs": {
23-
"version": "1.12.0"
23+
"version": "8.0.0"
2424
},
2525
"related": {
2626
"ip": [
@@ -68,7 +68,7 @@
6868
},
6969
"event": {
7070
"duration": 0,
71-
"ingested": "2021-12-14T14:46:40.952826309Z",
71+
"ingested": "2022-01-11T00:34:40.217058006Z",
7272
"original": "Dec 10 12:01:46 voyager haproxy[19312]: 127.0.0.1:35982 [10/Dec/2018:12:01:46.395] http-webservices http-webservices/\u003cNOSRV\u003e 0/-1/-1/-1/0 503 213 - - SC-- 1/1/0/0/0 0/0 \"GET / HTTP/1.1\"",
7373
"category": [
7474
"web"
@@ -97,7 +97,7 @@
9797
],
9898
"@timestamp": "2018-12-10T15:46:49.497Z",
9999
"ecs": {
100-
"version": "1.12.0"
100+
"version": "8.0.0"
101101
},
102102
"related": {
103103
"ip": [
@@ -145,7 +145,7 @@
145145
},
146146
"event": {
147147
"duration": 0,
148-
"ingested": "2021-12-14T14:46:40.952829108Z",
148+
"ingested": "2022-01-11T00:34:40.217062411Z",
149149
"original": "Dec 10 15:46:49 voyager haproxy[29785]: 127.0.0.1:43738 [10/Dec/2018:15:46:49.497] http-webservices http-webservices/\u003cNOSRV\u003e 0/-1/-1/-1/0 503 213 - - SC-- 1/1/0/0/0 0/0 {localhost:8888||} \"GET /foo HTTP/1.1\"",
150150
"category": [
151151
"web"
@@ -174,7 +174,7 @@
174174
],
175175
"@timestamp": "2018-12-10T15:48:56.017Z",
176176
"ecs": {
177-
"version": "1.12.0"
177+
"version": "8.0.0"
178178
},
179179
"related": {
180180
"ip": [
@@ -226,7 +226,7 @@
226226
},
227227
"event": {
228228
"duration": 0,
229-
"ingested": "2021-12-14T14:46:40.952829521Z",
229+
"ingested": "2022-01-11T00:34:40.217063833Z",
230230
"original": "Dec 10 15:48:56 voyager haproxy[7873]: 127.0.0.1:44542 [10/Dec/2018:15:48:56.017] http-webservices http-webservices/\u003cNOSRV\u003e 0/-1/-1/-1/0 503 213 - - SC-- 1/1/0/0/0 0/0 {localhost:8888||} {|} \"GET /foo HTTP/1.1\"",
231231
"category": [
232232
"web"

‎packages/haproxy/data_stream/log/_dev/test/pipeline/test-tcplog.log-expected.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"@timestamp": "2018-09-20T15:44:23.285Z",
1010
"ecs": {
11-
"version": "1.12.0"
11+
"version": "8.0.0"
1212
},
1313
"related": {
1414
"ip": [
@@ -41,7 +41,7 @@
4141
},
4242
"event": {
4343
"duration": 1000000,
44-
"ingested": "2021-12-14T14:46:41.298330789Z",
44+
"ingested": "2022-01-11T00:34:41.781854989Z",
4545
"original": "Sep 20 15:44:23 127.0.0.1 haproxy[25457]: 127.0.0.1:40962 [20/Sep/2018:15:44:23.285] main app/\u003cNOSRV\u003e -1/-1/1 212 SC 1/1/0/0/0 0/0",
4646
"kind": "event"
4747
},

‎packages/haproxy/data_stream/log/elasticsearch/ingest_pipeline/default.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ processors:
77
value: "{{ _ingest.timestamp }}"
88
- set:
99
field: ecs.version
10-
value: '1.12.0'
10+
value: '8.0.0'
1111
- rename:
1212
field: message
1313
target_field: event.original

‎packages/haproxy/data_stream/log/sample_event.json‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
{
2+
"@timestamp": "2018-07-30T09:03:52.726Z",
3+
"agent": {
4+
"ephemeral_id": "7eccbe53-c1e3-424d-8a1b-c290b8c2ca88",
5+
"id": "25ee0259-10b8-4a16-9f80-d18ce8ad6442",
6+
"name": "docker-fleet-agent",
7+
"type": "filebeat",
8+
"version": "8.0.0-beta1"
9+
},
10+
"data_stream": {
11+
"dataset": "haproxy.log",
12+
"namespace": "ep",
13+
"type": "logs"
14+
},
15+
"ecs": {
16+
"version": "8.0.0"
17+
},
18+
"elastic_agent": {
19+
"id": "25ee0259-10b8-4a16-9f80-d18ce8ad6442",
20+
"snapshot": false,
21+
"version": "8.0.0-beta1"
22+
},
23+
"event": {
24+
"agent_id_status": "verified",
25+
"category": [
26+
"web"
27+
],
28+
"dataset": "haproxy.log",
29+
"duration": 2000000,
30+
"ingested": "2022-01-11T00:35:53Z",
31+
"kind": "event",
32+
"outcome": "success",
33+
"timezone": "+00:00"
34+
},
35+
"haproxy": {
36+
"backend_name": "docs_microservice",
37+
"backend_queue": 0,
38+
"bytes_read": 168,
39+
"connection_wait_time_ms": 1,
40+
"connections": {
41+
"active": 6,
42+
"backend": 0,
43+
"frontend": 6,
44+
"retries": 0,
45+
"server": 0
46+
},
47+
"frontend_name": "incoming~",
48+
"http": {
49+
"request": {
50+
"captured_cookie": "-",
51+
"captured_headers": [
52+
"docs.example.internal"
53+
],
54+
"raw_request_line": "GET /component---src-pages-index-js-4b15624544f97cf0bb8f.js HTTP/1.1",
55+
"time_wait_ms": 0,
56+
"time_wait_without_data_ms": 0
57+
},
58+
"response": {
59+
"captured_cookie": "-",
60+
"captured_headers": []
61+
}
62+
},
63+
"server_name": "docs",
64+
"server_queue": 0,
65+
"termination_state": "----",
66+
"total_waiting_time_ms": 0
67+
},
68+
"host": {
69+
"architecture": "x86_64",
70+
"containerized": true,
71+
"hostname": "docker-fleet-agent",
72+
"id": "4ccba669f0df47fa3f57a9e4169ae7f1",
73+
"ip": [
74+
"172.18.0.7"
75+
],
76+
"mac": [
77+
"02:42:ac:12:00:07"
78+
],
79+
"name": "docker-fleet-agent",
80+
"os": {
81+
"codename": "Core",
82+
"family": "redhat",
83+
"kernel": "5.11.0-43-generic",
84+
"name": "CentOS Linux",
85+
"platform": "centos",
86+
"type": "linux",
87+
"version": "7 (Core)"
88+
}
89+
},
90+
"http": {
91+
"request": {
92+
"method": "GET"
93+
},
94+
"response": {
95+
"bytes": 168,
96+
"status_code": 304
97+
},
98+
"version": "1.1"
99+
},
100+
"input": {
101+
"type": "log"
102+
},
103+
"log": {
104+
"file": {
105+
"path": "/tmp/service_logs/haproxy.log"
106+
},
107+
"offset": 0
108+
},
109+
"process": {
110+
"name": "haproxy",
111+
"pid": 32450
112+
},
113+
"related": {
114+
"ip": [
115+
"67.43.156.13"
116+
]
117+
},
118+
"source": {
119+
"address": "67.43.156.13",
120+
"as": {
121+
"number": 35908
122+
},
123+
"geo": {
124+
"continent_name": "Asia",
125+
"country_iso_code": "BT",
126+
"country_name": "Bhutan",
127+
"location": {
128+
"lat": 27.5,
129+
"lon": 90.5
130+
}
131+
},
132+
"ip": "67.43.156.13",
133+
"port": 38862
134+
},
135+
"tags": [
136+
"haproxy-log"
137+
],
138+
"temp": {},
139+
"url": {
140+
"extension": "js",
141+
"original": "/component---src-pages-index-js-4b15624544f97cf0bb8f.js",
142+
"path": "/component---src-pages-index-js-4b15624544f97cf0bb8f.js"
143+
}
144+
}

0 commit comments

Comments
 (0)