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

Cherry-pick #9761 to 6.6: Allow users to convert timezone in elasticsearch module filesets #10403

Merged
merged 4 commits into from
Jan 30, 2019
Merged

Cherry-pick #9761 to 6.6: Allow users to convert timezone in elasticsearch module filesets #10403

merged 4 commits into from
Jan 30, 2019

Conversation

ycombinator
Copy link
Contributor

Cherry-pick of PR #9761 to 6.6 branch. Original message:

This PR updates the following filesets in the elasticsearch Filebeat module to accept a var.convert_timezone configuration setting:

  • server
  • audit
  • slowlog
  • deprecation

The gc fileset was not modified because Elasticsearch GC logs already emit timestamps with timezone information in them.

Fixes partially #9756. Related: #9797.

Copy link
Contributor

@ruflin ruflin left a 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*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicated Heartbeat line

@ycombinator
Copy link
Contributor Author

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)
@ycombinator ycombinator merged commit fc17d76 into elastic:6.6 Jan 30, 2019
@ycombinator ycombinator deleted the backport_9761_6.6 branch December 25, 2019 11:15
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants