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

Filebeat: Add option to convert kafka module timezones to UTC #7578

Merged
merged 1 commit into from
Jul 16, 2018

Conversation

jsoriano
Copy link
Member

Fixes #7546

@jsoriano jsoriano added enhancement in progress Pull request is currently in progress. module Filebeat Filebeat labels Jul 12, 2018
@jsoriano jsoriano force-pushed the filebeat-kafka-timezone branch 2 times, most recently from 3478d4c to 6d33214 Compare July 12, 2018 10:22
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.

LGTM. Can you rebase on master to get CI green?

Is the in progress label intentional?

default: false
# if ES < 6.1.0, this flag switches to false automatically when evaluating the
# pipeline
min_elasticsearch_version:
Copy link
Contributor

Choose a reason for hiding this comment

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

I completely forgot we have this feature. Nice.

Copy link
Member Author

Choose a reason for hiding this comment

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

I copied this part from the system module 😄

@jsoriano jsoriano force-pushed the filebeat-kafka-timezone branch from 6d33214 to 4238480 Compare July 13, 2018 17:54
@jsoriano jsoriano added review and removed in progress Pull request is currently in progress. labels Jul 13, 2018
@jsoriano
Copy link
Member Author

Rebased

@ruflin ruflin merged commit fda0ec0 into elastic:master Jul 16, 2018
@@ -216,6 +216,7 @@ https://github.com/elastic/beats/compare/v6.2.3...master[Check the HEAD diff]
- Add Audit log fileset to the Elasticsearch module. {pull}7365[7365]
- Add Slow log fileset to the Elasticsearch module. {pull}7473[7473]
- Add deprecation fileset to the Elasticsearch module. {pull}7474[7474]
- Add `config_timezone` option to Kafka module to convert dates to UTC. {issue}7546[7546] {pull}7578[7578]
Copy link
Contributor

Choose a reason for hiding this comment

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

@jsoriano I think this line should say convert_timezone, not config_timezone, correct?

Copy link
Member Author

Choose a reason for hiding this comment

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

Correct, I'll open a PR to fix this.

Copy link
Member Author

Choose a reason for hiding this comment

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

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.

3 participants