Skip to content

Commit

Permalink
Define field formats that were defined in Beats but not yet in ECS. (e…
Browse files Browse the repository at this point in the history
  • Loading branch information
webmat authored and Mathieu Martin committed May 24, 2019
1 parent ab5e966 commit 5e2a67e
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.next.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

### Added

* Added field formats to all `.bytes` fields and `event.duration`. #385

### Improvements

### Deprecated
Expand Down
12 changes: 11 additions & 1 deletion fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@
# Metrics
- name: bytes
format: bytes
level: core
type: long
example: 184
Expand Down Expand Up @@ -384,6 +385,7 @@
# Metrics
- name: bytes
format: bytes
level: core
type: long
example: 184
Expand Down Expand Up @@ -601,6 +603,8 @@
- name: duration
level: core
type: long
format: duration
input_format: nanoseconds
short: Duration of the event in nanoseconds.
description: >
Duration of the event in nanoseconds.
Expand Down Expand Up @@ -1005,32 +1009,35 @@
- name: request.bytes
level: extended
type: long
format: bytes
description: >
Total size in bytes of the request (body and headers).
example: 1437

- name: request.body.bytes
level: extended
type: long
format: bytes
description: >
Size in bytes of the request body.
example: 887

- name: response.bytes
level: extended
type: long
format: bytes
description: >
Total size in bytes of the response (body and headers).
example: 1437

- name: response.body.bytes
level: extended
type: long
format: bytes
description: >
Size in bytes of the response body.
example: 887


- name: log
title: Log
description: >
Expand Down Expand Up @@ -1189,6 +1196,7 @@
- name: bytes
level: core
type: long
format: bytes
short: Total bytes transferred in both directions.
description: >
Total bytes transferred in both directions.
Expand Down Expand Up @@ -1514,6 +1522,7 @@
# Metrics
- name: bytes
format: bytes
level: core
type: long
example: 184
Expand Down Expand Up @@ -1666,6 +1675,7 @@
# Metrics
- name: bytes
format: bytes
level: core
type: long
example: 184
Expand Down
9 changes: 9 additions & 0 deletions generated/beats/fields.ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
- name: bytes
level: core
type: long
format: bytes
description: Bytes sent from the client to the server.
example: 184
- name: domain
Expand Down Expand Up @@ -383,6 +384,7 @@
- name: bytes
level: core
type: long
format: bytes
description: Bytes sent from the destination to the source.
example: 184
- name: domain
Expand Down Expand Up @@ -1082,6 +1084,7 @@
- name: request.body.bytes
level: extended
type: long
format: bytes
description: Size in bytes of the request body.
example: 887
- name: request.body.content
Expand All @@ -1093,6 +1096,7 @@
- name: request.bytes
level: extended
type: long
format: bytes
description: Total size in bytes of the request (body and headers).
example: 1437
- name: request.method
Expand All @@ -1113,6 +1117,7 @@
- name: response.body.bytes
level: extended
type: long
format: bytes
description: Size in bytes of the response body.
example: 887
- name: response.body.content
Expand All @@ -1124,6 +1129,7 @@
- name: response.bytes
level: extended
type: long
format: bytes
description: Total size in bytes of the response (body and headers).
example: 1437
- name: response.status_code
Expand Down Expand Up @@ -1193,6 +1199,7 @@
- name: bytes
level: core
type: long
format: bytes
description: 'Total bytes transferred in both directions.
If `source.bytes` and `destination.bytes` are known, `network.bytes` is their
Expand Down Expand Up @@ -1607,6 +1614,7 @@
- name: bytes
level: core
type: long
format: bytes
description: Bytes sent from the server to the client.
example: 184
- name: domain
Expand Down Expand Up @@ -1821,6 +1829,7 @@
- name: bytes
level: core
type: long
format: bytes
description: Bytes sent from the source to the destination.
example: 184
- name: domain
Expand Down
9 changes: 9 additions & 0 deletions generated/ecs/ecs_flat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ client.bytes:
description: Bytes sent from the client to the server.
example: 184
flat_name: client.bytes
format: bytes
level: core
name: bytes
order: 5
Expand Down Expand Up @@ -464,6 +465,7 @@ destination.bytes:
description: Bytes sent from the destination to the source.
example: 184
flat_name: destination.bytes
format: bytes
level: core
name: bytes
order: 5
Expand Down Expand Up @@ -1507,6 +1509,7 @@ http.request.body.bytes:
description: Size in bytes of the request body.
example: 887
flat_name: http.request.body.bytes
format: bytes
level: extended
name: request.body.bytes
order: 7
Expand All @@ -1526,6 +1529,7 @@ http.request.bytes:
description: Total size in bytes of the request (body and headers).
example: 1437
flat_name: http.request.bytes
format: bytes
level: extended
name: request.bytes
order: 6
Expand Down Expand Up @@ -1558,6 +1562,7 @@ http.response.body.bytes:
description: Size in bytes of the response body.
example: 887
flat_name: http.response.body.bytes
format: bytes
level: extended
name: response.body.bytes
order: 9
Expand All @@ -1577,6 +1582,7 @@ http.response.bytes:
description: Total size in bytes of the response (body and headers).
example: 1437
flat_name: http.response.bytes
format: bytes
level: extended
name: response.bytes
order: 8
Expand Down Expand Up @@ -1691,6 +1697,7 @@ network.bytes:
sum.'
example: 368
flat_name: network.bytes
format: bytes
level: core
name: bytes
order: 9
Expand Down Expand Up @@ -2236,6 +2243,7 @@ server.bytes:
description: Bytes sent from the server to the client.
example: 184
flat_name: server.bytes
format: bytes
level: core
name: bytes
order: 5
Expand Down Expand Up @@ -2560,6 +2568,7 @@ source.bytes:
description: Bytes sent from the source to the destination.
example: 184
flat_name: source.bytes
format: bytes
level: core
name: bytes
order: 5
Expand Down
9 changes: 9 additions & 0 deletions generated/ecs/ecs_nested.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ client:
description: Bytes sent from the client to the server.
example: 184
flat_name: client.bytes
format: bytes
level: core
name: bytes
order: 5
Expand Down Expand Up @@ -595,6 +596,7 @@ destination:
description: Bytes sent from the destination to the source.
example: 184
flat_name: destination.bytes
format: bytes
level: core
name: bytes
order: 5
Expand Down Expand Up @@ -1761,6 +1763,7 @@ http:
description: Size in bytes of the request body.
example: 887
flat_name: http.request.body.bytes
format: bytes
level: extended
name: request.body.bytes
order: 7
Expand All @@ -1780,6 +1783,7 @@ http:
description: Total size in bytes of the request (body and headers).
example: 1437
flat_name: http.request.bytes
format: bytes
level: extended
name: request.bytes
order: 6
Expand Down Expand Up @@ -1812,6 +1816,7 @@ http:
description: Size in bytes of the response body.
example: 887
flat_name: http.response.body.bytes
format: bytes
level: extended
name: response.body.bytes
order: 9
Expand All @@ -1831,6 +1836,7 @@ http:
description: Total size in bytes of the response (body and headers).
example: 1437
flat_name: http.response.bytes
format: bytes
level: extended
name: response.bytes
order: 8
Expand Down Expand Up @@ -1935,6 +1941,7 @@ network:
sum.'
example: 368
flat_name: network.bytes
format: bytes
level: core
name: bytes
order: 9
Expand Down Expand Up @@ -2587,6 +2594,7 @@ server:
description: Bytes sent from the server to the client.
example: 184
flat_name: server.bytes
format: bytes
level: core
name: bytes
order: 5
Expand Down Expand Up @@ -2937,6 +2945,7 @@ source:
description: Bytes sent from the source to the destination.
example: 184
flat_name: source.bytes
format: bytes
level: core
name: bytes
order: 5
Expand Down
1 change: 1 addition & 0 deletions schemas/client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
# Metrics
- name: bytes
format: bytes
level: core
type: long
example: 184
Expand Down
1 change: 1 addition & 0 deletions schemas/destination.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
# Metrics
- name: bytes
format: bytes
level: core
type: long
example: 184
Expand Down
5 changes: 4 additions & 1 deletion schemas/http.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,28 +59,31 @@
- name: request.bytes
level: extended
type: long
format: bytes
description: >
Total size in bytes of the request (body and headers).
example: 1437

- name: request.body.bytes
level: extended
type: long
format: bytes
description: >
Size in bytes of the request body.
example: 887

- name: response.bytes
level: extended
type: long
format: bytes
description: >
Total size in bytes of the response (body and headers).
example: 1437

- name: response.body.bytes
level: extended
type: long
format: bytes
description: >
Size in bytes of the response body.
example: 887

1 change: 1 addition & 0 deletions schemas/network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
- name: bytes
level: core
type: long
format: bytes
short: Total bytes transferred in both directions.
description: >
Total bytes transferred in both directions.
Expand Down
1 change: 1 addition & 0 deletions schemas/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
# Metrics
- name: bytes
format: bytes
level: core
type: long
example: 184
Expand Down
1 change: 1 addition & 0 deletions schemas/source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
# Metrics
- name: bytes
format: bytes
level: core
type: long
example: 184
Expand Down

0 comments on commit 5e2a67e

Please sign in to comment.