Skip to content

Commit c019f1e

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

File tree

5 files changed

+153
-58
lines changed

5 files changed

+153
-58
lines changed

‎packages/etcd/_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/etcd/changelog.yml‎

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

‎packages/etcd/data_stream/metrics/sample_event.json‎

Lines changed: 73 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,89 @@
11
{
2-
"@timestamp": "2017-10-12T08:05:34.853Z",
2+
"@timestamp": "2022-01-10T09:13:54.764Z",
3+
"agent": {
4+
"ephemeral_id": "29a986b1-d5f3-4e9d-8544-4746db1415a6",
5+
"id": "25ee0259-10b8-4a16-9f80-d18ce8ad6442",
6+
"name": "docker-fleet-agent",
7+
"type": "metricbeat",
8+
"version": "8.0.0-beta1"
9+
},
10+
"data_stream": {
11+
"dataset": "etcd.metrics",
12+
"namespace": "ep",
13+
"type": "metrics"
14+
},
15+
"ecs": {
16+
"version": "1.12.0"
17+
},
18+
"elastic_agent": {
19+
"id": "25ee0259-10b8-4a16-9f80-d18ce8ad6442",
20+
"snapshot": false,
21+
"version": "8.0.0-beta1"
22+
},
323
"etcd": {
424
"api_version": "3",
525
"disk": {
626
"backend_commit_duration": {
727
"ns": {
828
"bucket": {
929
"+Inf": 7,
10-
"1000000": 5,
30+
"1000000": 0,
1131
"1024000000": 7,
1232
"128000000": 7,
13-
"16000000": 7,
14-
"2000000": 7,
33+
"16000000": 6,
34+
"2000000": 3,
1535
"2048000000": 7,
1636
"256000000": 7,
17-
"32000000": 7,
18-
"4000000": 7,
37+
"32000000": 6,
38+
"4000000": 4,
1939
"4096000000": 7,
2040
"512000000": 7,
2141
"64000000": 7,
22-
"8000000": 7,
42+
"8000000": 6,
2343
"8192000000": 7
2444
},
2545
"count": 7,
26-
"sum": 4332557
46+
"sum": 57776473
2747
}
2848
},
2949
"mvcc_db_total_size": {
30-
"bytes": 41369600
50+
"bytes": 20480
3151
},
3252
"wal_fsync_duration": {
3353
"ns": {
3454
"bucket": {
35-
"+Inf": 3,
55+
"+Inf": 5,
3656
"1000000": 0,
37-
"1024000000": 3,
57+
"1024000000": 5,
3858
"128000000": 3,
3959
"16000000": 2,
4060
"2000000": 0,
41-
"2048000000": 3,
42-
"256000000": 3,
43-
"32000000": 3,
44-
"4000000": 0,
45-
"4096000000": 3,
46-
"512000000": 3,
47-
"64000000": 3,
61+
"2048000000": 5,
62+
"256000000": 5,
63+
"32000000": 2,
64+
"4000000": 2,
65+
"4096000000": 5,
66+
"512000000": 5,
67+
"64000000": 2,
4868
"8000000": 2,
49-
"8192000000": 3
69+
"8192000000": 5
5070
},
51-
"count": 3,
52-
"sum": 40943916.00000001
71+
"count": 5,
72+
"sum": 434507865.00000006
5373
}
5474
}
5575
},
5676
"memory": {
5777
"go_memstats_alloc": {
58-
"bytes": 9952840
78+
"bytes": 6440232
5979
}
6080
},
6181
"network": {
6282
"client_grpc_received": {
63-
"bytes": 0
83+
"bytes": 4
6484
},
6585
"client_grpc_sent": {
66-
"bytes": 0
86+
"bytes": 188
6787
}
6888
},
6989
"server": {
@@ -78,7 +98,7 @@
7898
"count": 1
7999
},
80100
"proposals_committed": {
81-
"count": 110024
101+
"count": 4
82102
},
83103
"proposals_failed": {
84104
"count": 0
@@ -89,15 +109,40 @@
89109
}
90110
},
91111
"event": {
112+
"agent_id_status": "verified",
92113
"dataset": "etcd.metrics",
93-
"duration": 115000,
114+
"duration": 171096760,
115+
"ingested": "2022-01-10T09:13:56Z",
94116
"module": "etcd"
95117
},
118+
"host": {
119+
"architecture": "x86_64",
120+
"containerized": true,
121+
"hostname": "docker-fleet-agent",
122+
"id": "4ccba669f0df47fa3f57a9e4169ae7f1",
123+
"ip": [
124+
"172.18.0.7"
125+
],
126+
"mac": [
127+
"02:42:ac:12:00:07"
128+
],
129+
"name": "docker-fleet-agent",
130+
"os": {
131+
"codename": "Core",
132+
"family": "redhat",
133+
"kernel": "5.11.0-43-generic",
134+
"name": "CentOS Linux",
135+
"platform": "centos",
136+
"type": "linux",
137+
"version": "7 (Core)"
138+
}
139+
},
96140
"metricset": {
97-
"name": "metrics"
141+
"name": "metrics",
142+
"period": 10000
98143
},
99144
"service": {
100-
"address": "127.0.0.1:2379",
145+
"address": "http://elastic-package-service-etcd-1:2379/metrics",
101146
"type": "etcd"
102147
}
103148
}

‎packages/etcd/docs/README.md‎

Lines changed: 73 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,71 +21,91 @@ An example event for `metrics` looks as following:
2121

2222
```json
2323
{
24-
"@timestamp": "2017-10-12T08:05:34.853Z",
24+
"@timestamp": "2022-01-10T09:13:54.764Z",
25+
"agent": {
26+
"ephemeral_id": "29a986b1-d5f3-4e9d-8544-4746db1415a6",
27+
"id": "25ee0259-10b8-4a16-9f80-d18ce8ad6442",
28+
"name": "docker-fleet-agent",
29+
"type": "metricbeat",
30+
"version": "8.0.0-beta1"
31+
},
32+
"data_stream": {
33+
"dataset": "etcd.metrics",
34+
"namespace": "ep",
35+
"type": "metrics"
36+
},
37+
"ecs": {
38+
"version": "1.12.0"
39+
},
40+
"elastic_agent": {
41+
"id": "25ee0259-10b8-4a16-9f80-d18ce8ad6442",
42+
"snapshot": false,
43+
"version": "8.0.0-beta1"
44+
},
2545
"etcd": {
2646
"api_version": "3",
2747
"disk": {
2848
"backend_commit_duration": {
2949
"ns": {
3050
"bucket": {
3151
"+Inf": 7,
32-
"1000000": 5,
52+
"1000000": 0,
3353
"1024000000": 7,
3454
"128000000": 7,
35-
"16000000": 7,
36-
"2000000": 7,
55+
"16000000": 6,
56+
"2000000": 3,
3757
"2048000000": 7,
3858
"256000000": 7,
39-
"32000000": 7,
40-
"4000000": 7,
59+
"32000000": 6,
60+
"4000000": 4,
4161
"4096000000": 7,
4262
"512000000": 7,
4363
"64000000": 7,
44-
"8000000": 7,
64+
"8000000": 6,
4565
"8192000000": 7
4666
},
4767
"count": 7,
48-
"sum": 4332557
68+
"sum": 57776473
4969
}
5070
},
5171
"mvcc_db_total_size": {
52-
"bytes": 41369600
72+
"bytes": 20480
5373
},
5474
"wal_fsync_duration": {
5575
"ns": {
5676
"bucket": {
57-
"+Inf": 3,
77+
"+Inf": 5,
5878
"1000000": 0,
59-
"1024000000": 3,
79+
"1024000000": 5,
6080
"128000000": 3,
6181
"16000000": 2,
6282
"2000000": 0,
63-
"2048000000": 3,
64-
"256000000": 3,
65-
"32000000": 3,
66-
"4000000": 0,
67-
"4096000000": 3,
68-
"512000000": 3,
69-
"64000000": 3,
83+
"2048000000": 5,
84+
"256000000": 5,
85+
"32000000": 2,
86+
"4000000": 2,
87+
"4096000000": 5,
88+
"512000000": 5,
89+
"64000000": 2,
7090
"8000000": 2,
71-
"8192000000": 3
91+
"8192000000": 5
7292
},
73-
"count": 3,
74-
"sum": 40943916.00000001
93+
"count": 5,
94+
"sum": 434507865.00000006
7595
}
7696
}
7797
},
7898
"memory": {
7999
"go_memstats_alloc": {
80-
"bytes": 9952840
100+
"bytes": 6440232
81101
}
82102
},
83103
"network": {
84104
"client_grpc_received": {
85-
"bytes": 0
105+
"bytes": 4
86106
},
87107
"client_grpc_sent": {
88-
"bytes": 0
108+
"bytes": 188
89109
}
90110
},
91111
"server": {
@@ -100,7 +120,7 @@ An example event for `metrics` looks as following:
100120
"count": 1
101121
},
102122
"proposals_committed": {
103-
"count": 110024
123+
"count": 4
104124
},
105125
"proposals_failed": {
106126
"count": 0
@@ -111,15 +131,40 @@ An example event for `metrics` looks as following:
111131
}
112132
},
113133
"event": {
134+
"agent_id_status": "verified",
114135
"dataset": "etcd.metrics",
115-
"duration": 115000,
136+
"duration": 171096760,
137+
"ingested": "2022-01-10T09:13:56Z",
116138
"module": "etcd"
117139
},
140+
"host": {
141+
"architecture": "x86_64",
142+
"containerized": true,
143+
"hostname": "docker-fleet-agent",
144+
"id": "4ccba669f0df47fa3f57a9e4169ae7f1",
145+
"ip": [
146+
"172.18.0.7"
147+
],
148+
"mac": [
149+
"02:42:ac:12:00:07"
150+
],
151+
"name": "docker-fleet-agent",
152+
"os": {
153+
"codename": "Core",
154+
"family": "redhat",
155+
"kernel": "5.11.0-43-generic",
156+
"name": "CentOS Linux",
157+
"platform": "centos",
158+
"type": "linux",
159+
"version": "7 (Core)"
160+
}
161+
},
118162
"metricset": {
119-
"name": "metrics"
163+
"name": "metrics",
164+
"period": 10000
120165
},
121166
"service": {
122-
"address": "127.0.0.1:2379",
167+
"address": "http://elastic-package-service-etcd-1:2379/metrics",
123168
"type": "etcd"
124169
}
125170
}

‎packages/etcd/manifest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: 1.0.0
22
name: etcd
33
title: etcd
4-
version: 0.1.0
4+
version: 0.1.1
55
license: basic
66
description: Collect metrics from etcd servers with Elastic Agent.
77
type: integration

0 commit comments

Comments
 (0)