Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[1.7] Reinforce the exclusion of the leading dot from url.extension (#1151) #1153

Merged
merged 1 commit into from
Nov 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion code/go/ecs/url.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion docs/field-details.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -6230,12 +6230,14 @@ example: `www.elastic.co`
// ===============================================================

| url.extension
| The field contains the file extension from the original request url.
| The field contains the file extension from the original request url, excluding the leading dot.

The file extension is only set if it exists, as not every url has a file extension.

The leading period must not be included. For example, the value must be "png", not ".png".

Note that when the file name has multiple extensions (example.tar.gz), only the last one should be captured ("gz", not "tar.gz").

type: keyword


Expand Down
7 changes: 5 additions & 2 deletions experimental/generated/beats/fields.ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5224,12 +5224,15 @@
type: keyword
ignore_above: 1024
description: 'The field contains the file extension from the original request
url.
url, excluding the leading dot.

The file extension is only set if it exists, as not every url has a file extension.

The leading period must not be included. For example, the value must be "png",
not ".png".'
not ".png".

Note that when the file name has multiple extensions (example.tar.gz), only
the last one should be captured ("gz", not "tar.gz").'
example: png
- name: fragment
level: extended
Expand Down
2 changes: 1 addition & 1 deletion experimental/generated/csv/fields.csv
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
1.7.0+exp,true,trace,trace.id,keyword,extended,,4bf92f3577b34da6a3ce929d0e0e4736,Unique identifier of the trace.
1.7.0+exp,true,transaction,transaction.id,keyword,extended,,00f067aa0ba902b7,Unique identifier of the transaction within the scope of its trace.
1.7.0+exp,true,url,url.domain,wildcard,extended,,www.elastic.co,Domain of the url.
1.7.0+exp,true,url,url.extension,keyword,extended,,png,File extension from the original request url.
1.7.0+exp,true,url,url.extension,keyword,extended,,png,"File extension from the request url, excluding the leading dot."
1.7.0+exp,true,url,url.fragment,keyword,extended,,,Portion of the url after the `#`.
1.7.0+exp,true,url,url.full,wildcard,extended,,https://www.elastic.co:443/search?q=elasticsearch#top,Full unparsed URL.
1.7.0+exp,true,url,url.full.text,text,extended,,https://www.elastic.co:443/search?q=elasticsearch#top,Full unparsed URL.
Expand Down
10 changes: 7 additions & 3 deletions experimental/generated/ecs/ecs_flat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7980,19 +7980,23 @@ url.domain:
type: wildcard
url.extension:
dashed_name: url-extension
description: 'The field contains the file extension from the original request url.
description: 'The field contains the file extension from the original request url,
excluding the leading dot.

The file extension is only set if it exists, as not every url has a file extension.

The leading period must not be included. For example, the value must be "png",
not ".png".'
not ".png".

Note that when the file name has multiple extensions (example.tar.gz), only the
last one should be captured ("gz", not "tar.gz").'
example: png
flat_name: url.extension
ignore_above: 1024
level: extended
name: extension
normalize: []
short: File extension from the original request url.
short: File extension from the request url, excluding the leading dot.
type: keyword
url.fragment:
dashed_name: url-fragment
Expand Down
9 changes: 6 additions & 3 deletions experimental/generated/ecs/ecs_nested.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9224,19 +9224,22 @@ url:
url.extension:
dashed_name: url-extension
description: 'The field contains the file extension from the original request
url.
url, excluding the leading dot.

The file extension is only set if it exists, as not every url has a file extension.

The leading period must not be included. For example, the value must be "png",
not ".png".'
not ".png".

Note that when the file name has multiple extensions (example.tar.gz), only
the last one should be captured ("gz", not "tar.gz").'
example: png
flat_name: url.extension
ignore_above: 1024
level: extended
name: extension
normalize: []
short: File extension from the original request url.
short: File extension from the request url, excluding the leading dot.
type: keyword
url.fragment:
dashed_name: url-fragment
Expand Down
7 changes: 5 additions & 2 deletions generated/beats/fields.ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5312,12 +5312,15 @@
type: keyword
ignore_above: 1024
description: 'The field contains the file extension from the original request
url.
url, excluding the leading dot.

The file extension is only set if it exists, as not every url has a file extension.

The leading period must not be included. For example, the value must be "png",
not ".png".'
not ".png".

Note that when the file name has multiple extensions (example.tar.gz), only
the last one should be captured ("gz", not "tar.gz").'
example: png
- name: fragment
level: extended
Expand Down
2 changes: 1 addition & 1 deletion generated/csv/fields.csv
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
1.7.0,true,trace,trace.id,keyword,extended,,4bf92f3577b34da6a3ce929d0e0e4736,Unique identifier of the trace.
1.7.0,true,transaction,transaction.id,keyword,extended,,00f067aa0ba902b7,Unique identifier of the transaction within the scope of its trace.
1.7.0,true,url,url.domain,keyword,extended,,www.elastic.co,Domain of the url.
1.7.0,true,url,url.extension,keyword,extended,,png,File extension from the original request url.
1.7.0,true,url,url.extension,keyword,extended,,png,"File extension from the request url, excluding the leading dot."
1.7.0,true,url,url.fragment,keyword,extended,,,Portion of the url after the `#`.
1.7.0,true,url,url.full,keyword,extended,,https://www.elastic.co:443/search?q=elasticsearch#top,Full unparsed URL.
1.7.0,true,url,url.full.text,text,extended,,https://www.elastic.co:443/search?q=elasticsearch#top,Full unparsed URL.
Expand Down
10 changes: 7 additions & 3 deletions generated/ecs/ecs_flat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8064,19 +8064,23 @@ url.domain:
type: keyword
url.extension:
dashed_name: url-extension
description: 'The field contains the file extension from the original request url.
description: 'The field contains the file extension from the original request url,
excluding the leading dot.

The file extension is only set if it exists, as not every url has a file extension.

The leading period must not be included. For example, the value must be "png",
not ".png".'
not ".png".

Note that when the file name has multiple extensions (example.tar.gz), only the
last one should be captured ("gz", not "tar.gz").'
example: png
flat_name: url.extension
ignore_above: 1024
level: extended
name: extension
normalize: []
short: File extension from the original request url.
short: File extension from the request url, excluding the leading dot.
type: keyword
url.fragment:
dashed_name: url-fragment
Expand Down
9 changes: 6 additions & 3 deletions generated/ecs/ecs_nested.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9313,19 +9313,22 @@ url:
url.extension:
dashed_name: url-extension
description: 'The field contains the file extension from the original request
url.
url, excluding the leading dot.

The file extension is only set if it exists, as not every url has a file extension.

The leading period must not be included. For example, the value must be "png",
not ".png".'
not ".png".

Note that when the file name has multiple extensions (example.tar.gz), only
the last one should be captured ("gz", not "tar.gz").'
example: png
flat_name: url.extension
ignore_above: 1024
level: extended
name: extension
normalize: []
short: File extension from the original request url.
short: File extension from the request url, excluding the leading dot.
type: keyword
url.fragment:
dashed_name: url-fragment
Expand Down
8 changes: 6 additions & 2 deletions schemas/url.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,17 @@
- name: extension
level: extended
type: keyword
short: File extension from the original request url.
short: File extension from the request url, excluding the leading dot.
description: >
The field contains the file extension from the original request url.
The field contains the file extension from the original request url,
excluding the leading dot.
The file extension is only set if it exists, as not every url has a file extension.
The leading period must not be included. For example, the value must be "png", not ".png".
Note that when the file name has multiple extensions (example.tar.gz),
only the last one should be captured ("gz", not "tar.gz").
example: png

- name: fragment
Expand Down