-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
Cherry-pick #9761 to 6.6: Allow users to convert timezone in elasticsearch module filesets #10403
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ruflin
reviewed
Jan 29, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Overall LGTM but needs at least a make update
.
@@ -37,6 +37,9 @@ https://github.com/elastic/beats/compare/1035569addc4a3b29ffa14f8a08c27c1ace16ef | |||
*Filebeat* | |||
|
|||
- Fix bad bytes count in `docker` input when filtering by stream. {pull}10211[10211] | |||
- Add `convert_timezone` option to Elasticsearch module to convert dates to UTC. {issue}9756[9756] {pull}9761[9761] | |||
|
|||
*Heartbeat* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Duplicated Heartbeat line
ruflin
approved these changes
Jan 30, 2019
jenkins, test this |
This PR updates the following filesets in the `elasticsearch` Filebeat module to accept a `var.convert_timezone` configuration setting: * [x] server * [x] audit * [x] slowlog * [x] deprecation The `gc` fileset was not modified because Elasticsearch GC logs already emit timestamps with timezone information in them. Fixes partially #9756. Related: #9797. (cherry picked from commit 3559e58)
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…lasticsearch module filesets (elastic#10403) * Allow users to convert timezone in elasticsearch module filesets (elastic#9761) This PR updates the following filesets in the `elasticsearch` Filebeat module to accept a `var.convert_timezone` configuration setting: * [x] server * [x] audit * [x] slowlog * [x] deprecation The `gc` fileset was not modified because Elasticsearch GC logs already emit timestamps with timezone information in them. Fixes partially elastic#9756. Related: elastic#9797. (cherry picked from commit 43d976e) * Regenerating generated files * Fixing duplicated header in CHANGELOG * Updating generated file
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick of PR #9761 to 6.6 branch. Original message:
This PR updates the following filesets in the
elasticsearch
Filebeat module to accept avar.convert_timezone
configuration setting:The
gc
fileset was not modified because Elasticsearch GC logs already emit timestamps with timezone information in them.Fixes partially #9756. Related: #9797.