From 5e2a67eedb4d4bb8658c46ce9fc62da9cb6566ff Mon Sep 17 00:00:00 2001 From: Mathieu Martin Date: Fri, 15 Mar 2019 11:22:51 -0400 Subject: [PATCH] Define field formats that were defined in Beats but not yet in ECS. (#385) --- CHANGELOG.next.md | 2 ++ fields.yml | 12 +++++++++++- generated/beats/fields.ecs.yml | 9 +++++++++ generated/ecs/ecs_flat.yml | 9 +++++++++ generated/ecs/ecs_nested.yml | 9 +++++++++ schemas/client.yml | 1 + schemas/destination.yml | 1 + schemas/http.yml | 5 ++++- schemas/network.yml | 1 + schemas/server.yml | 1 + schemas/source.yml | 1 + 11 files changed, 49 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.next.md b/CHANGELOG.next.md index a8c87f89f0..b33fd834f3 100644 --- a/CHANGELOG.next.md +++ b/CHANGELOG.next.md @@ -6,6 +6,8 @@ ### Added +* Added field formats to all `.bytes` fields and `event.duration`. #385 + ### Improvements ### Deprecated diff --git a/fields.yml b/fields.yml index f05f055361..190057c653 100644 --- a/fields.yml +++ b/fields.yml @@ -199,6 +199,7 @@ # Metrics - name: bytes + format: bytes level: core type: long example: 184 @@ -384,6 +385,7 @@ # Metrics - name: bytes + format: bytes level: core type: long example: 184 @@ -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. @@ -1005,6 +1009,7 @@ - name: request.bytes level: extended type: long + format: bytes description: > Total size in bytes of the request (body and headers). example: 1437 @@ -1012,6 +1017,7 @@ - name: request.body.bytes level: extended type: long + format: bytes description: > Size in bytes of the request body. example: 887 @@ -1019,6 +1025,7 @@ - name: response.bytes level: extended type: long + format: bytes description: > Total size in bytes of the response (body and headers). example: 1437 @@ -1026,11 +1033,11 @@ - 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: > @@ -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. @@ -1514,6 +1522,7 @@ # Metrics - name: bytes + format: bytes level: core type: long example: 184 @@ -1666,6 +1675,7 @@ # Metrics - name: bytes + format: bytes level: core type: long example: 184 diff --git a/generated/beats/fields.ecs.yml b/generated/beats/fields.ecs.yml index 39c6cca0a9..206ed71cb0 100644 --- a/generated/beats/fields.ecs.yml +++ b/generated/beats/fields.ecs.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/generated/ecs/ecs_flat.yml b/generated/ecs/ecs_flat.yml index 150bc29d3c..412e2ce9b1 100644 --- a/generated/ecs/ecs_flat.yml +++ b/generated/ecs/ecs_flat.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -1691,6 +1697,7 @@ network.bytes: sum.' example: 368 flat_name: network.bytes + format: bytes level: core name: bytes order: 9 @@ -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 @@ -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 diff --git a/generated/ecs/ecs_nested.yml b/generated/ecs/ecs_nested.yml index 0625cfd52e..70de5efe49 100644 --- a/generated/ecs/ecs_nested.yml +++ b/generated/ecs/ecs_nested.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -1935,6 +1941,7 @@ network: sum.' example: 368 flat_name: network.bytes + format: bytes level: core name: bytes order: 9 @@ -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 @@ -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 diff --git a/schemas/client.yml b/schemas/client.yml index ec75f5ea5d..b46cef0ef8 100644 --- a/schemas/client.yml +++ b/schemas/client.yml @@ -61,6 +61,7 @@ # Metrics - name: bytes + format: bytes level: core type: long example: 184 diff --git a/schemas/destination.yml b/schemas/destination.yml index 8221f46dfc..ccef779a80 100644 --- a/schemas/destination.yml +++ b/schemas/destination.yml @@ -52,6 +52,7 @@ # Metrics - name: bytes + format: bytes level: core type: long example: 184 diff --git a/schemas/http.yml b/schemas/http.yml index f39fd7ba50..aab4c24d08 100644 --- a/schemas/http.yml +++ b/schemas/http.yml @@ -59,6 +59,7 @@ - name: request.bytes level: extended type: long + format: bytes description: > Total size in bytes of the request (body and headers). example: 1437 @@ -66,6 +67,7 @@ - name: request.body.bytes level: extended type: long + format: bytes description: > Size in bytes of the request body. example: 887 @@ -73,6 +75,7 @@ - name: response.bytes level: extended type: long + format: bytes description: > Total size in bytes of the response (body and headers). example: 1437 @@ -80,7 +83,7 @@ - name: response.body.bytes level: extended type: long + format: bytes description: > Size in bytes of the response body. example: 887 - diff --git a/schemas/network.yml b/schemas/network.yml index 8a76af5915..2edcfd1746 100644 --- a/schemas/network.yml +++ b/schemas/network.yml @@ -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. diff --git a/schemas/server.yml b/schemas/server.yml index d937be8b1b..564af539c2 100644 --- a/schemas/server.yml +++ b/schemas/server.yml @@ -61,6 +61,7 @@ # Metrics - name: bytes + format: bytes level: core type: long example: 184 diff --git a/schemas/source.yml b/schemas/source.yml index 97262b17a6..6c9fabc5af 100644 --- a/schemas/source.yml +++ b/schemas/source.yml @@ -52,6 +52,7 @@ # Metrics - name: bytes + format: bytes level: core type: long example: 184