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

[docs] Change timezone to time zone #18144

Merged
merged 5 commits into from
May 4, 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
2 changes: 1 addition & 1 deletion filebeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -4152,7 +4152,7 @@ type: date
*`cef.extensions.deviceTimeZone`*::
+
--
The timezone for the device generating the event.
The time zone for the device generating the event.

type: keyword

Expand Down
12 changes: 6 additions & 6 deletions filebeat/docs/include/timezone-support.asciidoc
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[float]
==== Timezone support
==== Time zone support

This module parses logs that don't contain timezone information. For these logs,
Filebeat reads the local timezone and uses it when parsing to convert the
timestamp to UTC. The timezone to be used for parsing is included in the event
This module parses logs that don't contain time zone information. For these logs,
Filebeat reads the local time zone and uses it when parsing to convert the
timestamp to UTC. The time zone to be used for parsing is included in the event
in the `event.timezone` field.

To disable this conversion, the `event.timezone` field can be removed with
the `drop_fields` processor.

If logs are originated from systems or applications with a different timezone to
If logs are originated from systems or applications with a different time zone to
the local one, the `event.timezone` field can be overwritten with the original
timezone using the `add_fields` processor.
time zone using the `add_fields` processor.

See <<filtering-and-enhancing-data>> for information about specifying
processors in your config.
2 changes: 1 addition & 1 deletion filebeat/module/elasticsearch/deprecation/config/log.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ multiline:
match: after

processors:
# Locale for timezone is only needed in non-json logs
# Locale for time zone is only needed in non-json logs
- add_locale.when.not.regexp.message: "^{"
4 changes: 2 additions & 2 deletions filebeat/module/elasticsearch/server/config/log.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ multiline:
match: after

processors:
# Locale for timezone is only needed in non-json logs
- add_locale.when.not.regexp.message: "^{"
# Locale for time zone is only needed in non-json logs
- add_locale.when.not.regexp.message: "^{"
2 changes: 1 addition & 1 deletion filebeat/module/elasticsearch/slowlog/config/slowlog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ multiline:
match: after

processors:
# Locale for timezone is only needed in non-json logs
# Locale for time zone is only needed in non-json logs
- add_locale.when.not.regexp.message: "^{"
2 changes: 1 addition & 1 deletion filebeat/module/logstash/log/config/log.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ multiline:
{{ end }}

processors:
# Locale for timezone is only needed in non-json logs
# Locale for time zone is only needed in non-json logs
- add_locale.when.not.regexp.message: "^{"
2 changes: 1 addition & 1 deletion filebeat/module/logstash/slowlog/config/slowlog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ paths:
exclude_files: [".gz$"]

processors:
# Locale for timezone is only needed in non-json logs
# Locale for time zone is only needed in non-json logs
- add_locale.when.not.regexp.message: "^{"
2 changes: 1 addition & 1 deletion heartbeat/_meta/beat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -266,5 +266,5 @@ heartbeat.scheduler:
# disabled if set to 0. The default is 0.
#limit: 0

# Set the scheduler it's timezone
# Set the scheduler it's time zone
#location: ''
2 changes: 1 addition & 1 deletion heartbeat/docs/heartbeat-scheduler.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ specify for `limit` should be below the configured ulimit.
[[heartbeat-scheduler-location]]
==== `location`

The timezone for the scheduler. By default the scheduler uses localtime.
The time zone for the scheduler. By default the scheduler uses localtime.

2 changes: 1 addition & 1 deletion heartbeat/heartbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ heartbeat.scheduler:
# disabled if set to 0. The default is 0.
#limit: 0

# Set the scheduler it's timezone
# Set the scheduler it's time zone
#location: ''

#================================ General ======================================
Expand Down
2 changes: 1 addition & 1 deletion libbeat/processors/timestamp/docs/timestamp.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ If a layout does not contain a year then the current year in the specified
| `field` | yes | | Source field containing the time to be parsed. |
| `target_field` | no | @timestamp | Target field for the parsed time value. The target value is always written as UTC. |
| `layouts` | yes | | Timestamp layouts that define the expected time value format. In addition layouts, `UNIX` and `UNIX_MS` are accepted. |
| `timezone` | no | UTC | Timezone (e.g. America/New_York) to use when parsing a timestamp not containing a timezone. |
| `timezone` | no | UTC | Time zone (e.g. America/New_York) to use when parsing a timestamp not containing a time zone. |
| `ignore_missing` | no | false | Ignore errors when the source field is missing. |
| `ignore_failure` | no | false | Ignore all errors produced by the processor. |
| `test` | no | | A list of timestamps that must parse successfully when loading the processor. |
Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/processors/decode_cef/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@

- name: deviceTimeZone
type: keyword
description: The timezone for the device generating the event.
description: The time zone for the device generating the event.

- name: deviceTranslatedAddress
type: ip
Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/processors/decode_cef/fields.go

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