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

Support different timestamp format in postgresql module #9650

Merged
merged 2 commits into from
Dec 26, 2018
Merged

Support different timestamp format in postgresql module #9650

merged 2 commits into from
Dec 26, 2018

Conversation

kaiyan-sheng
Copy link
Contributor

@kaiyan-sheng kaiyan-sheng commented Dec 18, 2018

In current postgresql module, if the log timestamp does not match yyyy-MM-dd HH:mm:ss.SSS, then instead of using the timestamp from the log, it uses current timestamp. To fix this, I think adding yyyy-MM-dd HH:mm:ss into the timestamp/date formats list should work. Now postgresql module will know both timestamps are expected.

closes #9494

@kaiyan-sheng kaiyan-sheng requested a review from a team as a code owner December 18, 2018 23:17
@ruflin ruflin added module review Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. Team:Integrations Label for the Integrations team labels Dec 19, 2018
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. I suggest we backport this to 6.x.

@jsoriano
Copy link
Member

+1 to backporting it

@kaiyan-sheng kaiyan-sheng merged commit 9d60da5 into elastic:master Dec 26, 2018
@kaiyan-sheng kaiyan-sheng deleted the postgresql_timestamp branch December 26, 2018 15:19
kaiyan-sheng added a commit that referenced this pull request Dec 27, 2018
…odule (#9650) (#9794)

* Support different timestamp format in postgresql module (#9650)

* Support different timestamp format in postgresql module

* Update changelog

(cherry picked from commit 9d60da5)

* Rerun test with 6.x ES
@ruflin
Copy link
Contributor

ruflin commented Dec 27, 2018

@kaiyan-sheng This PR accidentially broke CI as since the approval it seems some ECS changes went in on the postgres side (see fix here): #9777 Make sure in the backport that the data structure is correct (it should be). I'm suprised you didn't have a conflict. As CI was green and no conflicts, you couldn't know 👍

@kaiyan-sheng kaiyan-sheng removed the needs_backport PR is waiting to be backported to other branches. label Jan 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Filebeat Filebeat module review Team:Integrations Label for the Integrations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Filebeat postgresql module @timestamp field changed based on timestamp format
3 participants