-
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
Allow users to convert timezone in elasticsearch module filesets #9761
Conversation
Pinging @elastic/stack-monitoring |
I think this needs a |
CI failures are related. Looking into them now. |
jenkins, test this |
@ruflin CI is green now, if you want to review the PR. |
"input.type": "log", | ||
"log.offset": 0, | ||
"message": "[2018-06-19T05:16:15,549] [rest] [authentication_failed] origin_address=[147.107.128.77], principal=[i030648], uri=[/_xpack/security/_authenticate]", | ||
"@timestamp": "2018-06-19T05:16:15.549Z", |
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.
I'm surprised by the end line space diff as this file is auto generated there should not be a difference. Did you touch this file manually perhaps?
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.
I did manually touch it, to update the @timestamp
values in each expected document.
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.
Why not generate it?
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.
Sure, I can regenerate them. It was a small change that I could make it global search replace so I didn't bother, but I'll regenerate them now.
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.
Regenerated in d9a2bac.
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.
Code LGTM. Can you fix the changelog?
CHANGELOG.asciidoc
Outdated
@@ -202,6 +202,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha1...v7.0.0-alpha2[Check the | |||
- Rename many `icinga.*` fields to map to ECS. {pull}9294[9294] | |||
- Rename many `postgresql.log.*` fields to map to ECS. {pull}9303[9303] | |||
- Rename many `kafka.log.*` fields to map to ECS. {pull}9297[9297] | |||
- Add `convert_timezone` option to Elasticsearch module to convert dates to UTC. {issue}9756[9756] {pull}9761[9761] |
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.
I think this changelog is in the wrong place as alpha2 is already shipped. Best directly add it to .next
changelog.
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.
Moved in d9f5f1f.
jenkins, test this |
…earch module filesets (#9830) Cherry-pick of PR #9761 to 6.x branch. Original message: 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.
…earch module filesets (#10403) * Allow users to convert timezone in elasticsearch module filesets (#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 #9756. Related: #9797. (cherry picked from commit 3559e58) * Regenerating generated files * Fixing duplicated header in CHANGELOG * Updating generated file
…ogstash module filesets (elastic#10407) Cherry-pick of PR elastic#9797 to 6.6 branch. Original message: This PR updates the following filesets in the `logstash` Filebeat module to accept a `var.convert_timezone` configuration setting: * [x] log * [x] slowlog Fixes partially elastic#9756. Related: elastic#9761
…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
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.