Skip to content

Commit

Permalink
WIP Update the HTTP field set with ECS definitions as of beta 2 (#9645)
Browse files Browse the repository at this point in the history
- Introduces fields for http size metrics
- HTTP body field is now nested deeper:
  - `http.request.body` moves to `http.request.body.content`
  - `http.response.body` moves to `http.response.body.content`
  - packetbeat has been adjusted accordingly
- Introduces missing field definition updates (mainly to lowercase `method`)
- Unrelated: delete `x-pack/auditbeat/include/fields.go` which should have been deleted in #9724.
  • Loading branch information
webmat authored Dec 21, 2018
1 parent 337113e commit caf07a3
Show file tree
Hide file tree
Showing 23 changed files with 577 additions and 66 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Packetbeat*

- Adjust Packetbeat `http` fields to ECS Beta 2 {pull}9645[9645]
- `http.request.body` moves to `http.request.body.content`
- `http.response.body` moves to `http.response.body.content`

*Winlogbeat*

*Functionbeat*
Expand Down Expand Up @@ -67,6 +71,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Affecting all Beats*

- Update field definitions for `http` to ECS Beta 2 {pull}9645[9645]

*Auditbeat*

- Add system module. {pull}9546[9546]
Expand Down
65 changes: 63 additions & 2 deletions auditbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4071,9 +4071,22 @@ Fields related to HTTP activity.
--
type: keyword
example: GET, POST, PUT
example: get, post, put
Http request method.
The field value must be normalized to lowercase for querying. See "Lowercase Capitalization" in the "Implementing ECS" section.
--
*`http.request.body.content`*::
+
--
type: keyword
example: Hello world
The full http request body.
--
Expand Down Expand Up @@ -4102,7 +4115,7 @@ Http response status code.
--
*`http.response.body`*::
*`http.response.body.content`*::
+
--
type: keyword
Expand All @@ -4124,6 +4137,54 @@ example: 1.1
Http version.
--
*`http.request.bytes`*::
+
--
type: long
example: 1437
Total size in bytes of the request (body and headers).
--
*`http.request.body.bytes`*::
+
--
type: long
example: 887
Size in bytes of the request body.
--
*`http.response.bytes`*::
+
--
type: long
example: 1437
Total size in bytes of the response (body and headers).
--
*`http.response.body.bytes`*::
+
--
type: long
example: 887
Size in bytes of the response body.
--
[float]
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/include/fields.go

Large diffs are not rendered by default.

65 changes: 63 additions & 2 deletions filebeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -2097,9 +2097,22 @@ Fields related to HTTP activity.
--
type: keyword
example: GET, POST, PUT
example: get, post, put
Http request method.
The field value must be normalized to lowercase for querying. See "Lowercase Capitalization" in the "Implementing ECS" section.
--
*`http.request.body.content`*::
+
--
type: keyword
example: Hello world
The full http request body.
--
Expand Down Expand Up @@ -2128,7 +2141,7 @@ Http response status code.
--
*`http.response.body`*::
*`http.response.body.content`*::
+
--
type: keyword
Expand All @@ -2150,6 +2163,54 @@ example: 1.1
Http version.
--
*`http.request.bytes`*::
+
--
type: long
example: 1437
Total size in bytes of the request (body and headers).
--
*`http.request.body.bytes`*::
+
--
type: long
example: 887
Size in bytes of the request body.
--
*`http.response.bytes`*::
+
--
type: long
example: 1437
Total size in bytes of the response (body and headers).
--
*`http.response.body.bytes`*::
+
--
type: long
example: 887
Size in bytes of the response body.
--
[float]
Expand Down
2 changes: 1 addition & 1 deletion filebeat/include/fields.go

Large diffs are not rendered by default.

65 changes: 63 additions & 2 deletions heartbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -1662,9 +1662,22 @@ Fields related to HTTP activity.
--
type: keyword
example: GET, POST, PUT
example: get, post, put
Http request method.
The field value must be normalized to lowercase for querying. See "Lowercase Capitalization" in the "Implementing ECS" section.
--
*`http.request.body.content`*::
+
--
type: keyword
example: Hello world
The full http request body.
--
Expand Down Expand Up @@ -1693,7 +1706,7 @@ Http response status code.
--
*`http.response.body`*::
*`http.response.body.content`*::
+
--
type: keyword
Expand All @@ -1715,6 +1728,54 @@ example: 1.1
Http version.
--
*`http.request.bytes`*::
+
--
type: long
example: 1437
Total size in bytes of the request (body and headers).
--
*`http.request.body.bytes`*::
+
--
type: long
example: 887
Size in bytes of the request body.
--
*`http.response.bytes`*::
+
--
type: long
example: 1437
Total size in bytes of the response (body and headers).
--
*`http.response.body.bytes`*::
+
--
type: long
example: 887
Size in bytes of the response body.
--
[float]
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/include/fields.go

Large diffs are not rendered by default.

65 changes: 63 additions & 2 deletions journalbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -1943,9 +1943,22 @@ Fields related to HTTP activity.
--
type: keyword
example: GET, POST, PUT
example: get, post, put
Http request method.
The field value must be normalized to lowercase for querying. See "Lowercase Capitalization" in the "Implementing ECS" section.
--
*`http.request.body.content`*::
+
--
type: keyword
example: Hello world
The full http request body.
--
Expand Down Expand Up @@ -1974,7 +1987,7 @@ Http response status code.
--
*`http.response.body`*::
*`http.response.body.content`*::
+
--
type: keyword
Expand All @@ -1996,6 +2009,54 @@ example: 1.1
Http version.
--
*`http.request.bytes`*::
+
--
type: long
example: 1437
Total size in bytes of the request (body and headers).
--
*`http.request.body.bytes`*::
+
--
type: long
example: 887
Size in bytes of the request body.
--
*`http.response.bytes`*::
+
--
type: long
example: 1437
Total size in bytes of the response (body and headers).
--
*`http.response.body.bytes`*::
+
--
type: long
example: 887
Size in bytes of the response body.
--
[float]
Expand Down
2 changes: 1 addition & 1 deletion journalbeat/include/fields.go

Large diffs are not rendered by default.

Loading

0 comments on commit caf07a3

Please sign in to comment.