Skip to content
New issue

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

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

Already on GitHub? # to your account

Update log.origin.file.line from integer to long #1533

Merged
merged 3 commits into from
Jul 26, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.next.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Thanks, you're awesome :-) -->
* Removing use-cases directory #1405
* Remove `host.user.*` field reuse. #1439
* Remove deprecation notice on `http.request.method`. #1443
* Migrate `log.origin.file.line` from `integer` to `long`. #1533

#### Bugfixes

Expand Down
4 changes: 2 additions & 2 deletions code/go/ecs/log.go

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

4 changes: 2 additions & 2 deletions docs/field-details.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4673,7 +4673,7 @@ example: `org.elasticsearch.bootstrap.Bootstrap`

| The line number of the file containing the source code which originated the log event.

type: integer
type: long



Expand Down Expand Up @@ -4721,7 +4721,7 @@ example: `init`
[[field-log-original]]
<<field-log-original, log.original>>

| Deprecated for removal in next major version release. This field is superseded by `event.original`.
| Deprecated for removal in next major version release. This field is superseded by `event.original`.

This is the original log message and contains the full log message before splitting it up in multiple parts.

Expand Down
4 changes: 2 additions & 2 deletions experimental/generated/beats/fields.ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3583,7 +3583,7 @@
example: org.elasticsearch.bootstrap.Bootstrap
- name: origin.file.line
level: extended
type: integer
type: long
description: The line number of the file containing the source code which originated
the log event.
example: 42
Expand All @@ -3607,7 +3607,7 @@
level: core
type: keyword
description: 'Deprecated for removal in next major version release. This field
is superseded by `event.original`.
is superseded by `event.original`.

This is the original log message and contains the full log message before
splitting it up in multiple parts.
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 @@ -392,7 +392,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
8.0.0-dev+exp,true,log,log.file.path,keyword,extended,,/var/log/fun-times.log,Full path to the log file this event came from.
8.0.0-dev+exp,true,log,log.level,keyword,core,,error,Log level of the log event.
8.0.0-dev+exp,true,log,log.logger,keyword,core,,org.elasticsearch.bootstrap.Bootstrap,Name of the logger.
8.0.0-dev+exp,true,log,log.origin.file.line,integer,extended,,42,The line number of the file which originated the log event.
8.0.0-dev+exp,true,log,log.origin.file.line,long,extended,,42,The line number of the file which originated the log event.
8.0.0-dev+exp,true,log,log.origin.file.name,keyword,extended,,Bootstrap.java,The code file which originated the log event.
8.0.0-dev+exp,true,log,log.origin.function,keyword,extended,,init,The function which originated the log event.
8.0.0-dev+exp,false,log,log.original,keyword,core,,Sep 19 08:26:10 localhost My log,"Deprecated original log message with light interpretation only (encoding, newlines)."
Expand Down
4 changes: 2 additions & 2 deletions experimental/generated/ecs/ecs_flat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5226,7 +5226,7 @@ log.origin.file.line:
name: origin.file.line
normalize: []
short: The line number of the file which originated the log event.
type: integer
type: long
log.origin.file.name:
dashed_name: log-origin-file-name
description: 'The name of the file containing the source code which originated the
Expand Down Expand Up @@ -5256,7 +5256,7 @@ log.origin.function:
log.original:
dashed_name: log-original
description: 'Deprecated for removal in next major version release. This field is
superseded by `event.original`.
superseded by `event.original`.

This is the original log message and contains the full log message before splitting
it up in multiple parts.
Expand Down
4 changes: 2 additions & 2 deletions experimental/generated/ecs/ecs_nested.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6441,7 +6441,7 @@ log:
name: origin.file.line
normalize: []
short: The line number of the file which originated the log event.
type: integer
type: long
log.origin.file.name:
dashed_name: log-origin-file-name
description: 'The name of the file containing the source code which originated
Expand Down Expand Up @@ -6471,7 +6471,7 @@ log:
log.original:
dashed_name: log-original
description: 'Deprecated for removal in next major version release. This field
is superseded by `event.original`.
is superseded by `event.original`.

This is the original log message and contains the full log message before
splitting it up in multiple parts.
Expand Down
2 changes: 1 addition & 1 deletion experimental/generated/elasticsearch/7/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -1812,7 +1812,7 @@
"file": {
"properties": {
"line": {
"type": "integer"
"type": "long"
},
"name": {
"ignore_above": 1024,
Expand Down
2 changes: 1 addition & 1 deletion experimental/generated/elasticsearch/component/log.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"file": {
"properties": {
"line": {
"type": "integer"
"type": "long"
},
"name": {
"ignore_above": 1024,
Expand Down
4 changes: 2 additions & 2 deletions generated/beats/fields.ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3163,7 +3163,7 @@
example: org.elasticsearch.bootstrap.Bootstrap
- name: origin.file.line
level: extended
type: integer
type: long
description: The line number of the file containing the source code which originated
the log event.
example: 42
Expand All @@ -3187,7 +3187,7 @@
level: core
type: keyword
description: 'Deprecated for removal in next major version release. This field
is superseded by `event.original`.
is superseded by `event.original`.

This is the original log message and contains the full log message before
splitting it up in multiple parts.
Expand Down
2 changes: 1 addition & 1 deletion generated/csv/fields.csv
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
8.0.0-dev,true,log,log.file.path,keyword,extended,,/var/log/fun-times.log,Full path to the log file this event came from.
8.0.0-dev,true,log,log.level,keyword,core,,error,Log level of the log event.
8.0.0-dev,true,log,log.logger,keyword,core,,org.elasticsearch.bootstrap.Bootstrap,Name of the logger.
8.0.0-dev,true,log,log.origin.file.line,integer,extended,,42,The line number of the file which originated the log event.
8.0.0-dev,true,log,log.origin.file.line,long,extended,,42,The line number of the file which originated the log event.
8.0.0-dev,true,log,log.origin.file.name,keyword,extended,,Bootstrap.java,The code file which originated the log event.
8.0.0-dev,true,log,log.origin.function,keyword,extended,,init,The function which originated the log event.
8.0.0-dev,false,log,log.original,keyword,core,,Sep 19 08:26:10 localhost My log,"Deprecated original log message with light interpretation only (encoding, newlines)."
Expand Down
4 changes: 2 additions & 2 deletions generated/ecs/ecs_flat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4484,7 +4484,7 @@ log.origin.file.line:
name: origin.file.line
normalize: []
short: The line number of the file which originated the log event.
type: integer
type: long
log.origin.file.name:
dashed_name: log-origin-file-name
description: 'The name of the file containing the source code which originated the
Expand Down Expand Up @@ -4514,7 +4514,7 @@ log.origin.function:
log.original:
dashed_name: log-original
description: 'Deprecated for removal in next major version release. This field is
superseded by `event.original`.
superseded by `event.original`.

This is the original log message and contains the full log message before splitting
it up in multiple parts.
Expand Down
4 changes: 2 additions & 2 deletions generated/ecs/ecs_nested.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5697,7 +5697,7 @@ log:
name: origin.file.line
normalize: []
short: The line number of the file which originated the log event.
type: integer
type: long
log.origin.file.name:
dashed_name: log-origin-file-name
description: 'The name of the file containing the source code which originated
Expand Down Expand Up @@ -5727,7 +5727,7 @@ log:
log.original:
dashed_name: log-original
description: 'Deprecated for removal in next major version release. This field
is superseded by `event.original`.
is superseded by `event.original`.

This is the original log message and contains the full log message before
splitting it up in multiple parts.
Expand Down
2 changes: 1 addition & 1 deletion generated/elasticsearch/6/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -1549,7 +1549,7 @@
"file": {
"properties": {
"line": {
"type": "integer"
"type": "long"
},
"name": {
"ignore_above": 1024,
Expand Down
2 changes: 1 addition & 1 deletion generated/elasticsearch/7/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -1540,7 +1540,7 @@
"file": {
"properties": {
"line": {
"type": "integer"
"type": "long"
},
"name": {
"ignore_above": 1024,
Expand Down
2 changes: 1 addition & 1 deletion generated/elasticsearch/component/log.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"file": {
"properties": {
"line": {
"type": "integer"
"type": "long"
},
"name": {
"ignore_above": 1024,
Expand Down
4 changes: 2 additions & 2 deletions schemas/log.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
doc_values: false
short: Deprecated original log message with light interpretation only (encoding, newlines).
description: >
Deprecated for removal in next major version release. This field is superseded by
Deprecated for removal in next major version release. This field is superseded by
`event.original`.

This is the original log message and contains the full log message
Expand Down Expand Up @@ -85,7 +85,7 @@

- name: origin.file.line
level: extended
type: integer
type: long
example: 42
short: The line number of the file which originated the log event.
description: >
Expand Down