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.

Sign up for GitHub

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

Jump to bottom

Cherry-pick to 6.x: Support for multi-core thread_id in filebeat postgresql module (#9482) #9528

Merged
merged 3 commits into from
Dec 17, 2018
Merged

Cherry-pick to 6.x: Support for multi-core thread_id in filebeat postgresql module (#9482) #9528

merged 3 commits into from
Dec 17, 2018

Conversation

kaiyan-sheng
Copy link
Contributor

  • Add support for multi-core thread_id in filebeat postgresql module

  • Change timestamp for test log file

  • update changelog and add multi-core.log-expected.json

  • Change timestamp in example log file

  • Update fields.go

(cherry picked from commit 384b11b)

@kaiyan-sheng
Add support for multi-core thread_id in filebeat postgresql module (#…
ebb82a2 
…9482)

* Add support for multi-core thread_id in filebeat postgresql module

* Change timestamp for test log file

* update changelog and add multi-core.log-expected.json

* Change timestamp in example log file

* Update fields.go

(cherry picked from commit 384b11b)
@jsoriano
Copy link
Member

It seems that make update is needed.

@kaiyan-sheng
Copy link
Contributor Author

@jsoriano ha yes! thanks!

@kaiyan-sheng
Copy link
Contributor Author

@jsoriano not good... test_fileset_file_4_postgresql failed. I need to look into this hmm

@ruflin
Copy link
Contributor

ruflin commented Dec 14, 2018

@kaiyan-sheng The data looks a bit different 6.x then master so the generated file might differ. I recommend you to run the tests with the GENERATE=1 flag against a 6.x Elasticsearch instance.

@kaiyan-sheng
Copy link
Contributor Author

@ruflin Thanks! I switched to use 6.x ES and it helped :-) Now there are several tests failed hmm

Blacklist blocks bad configs ... FAIL
Config cache is used if Kibana is not available ... FAIL
Enroll the beat in Kibana Central Management ... FAIL
Config is retrieved from Central Management and updates are applied ... FAIL

@jsoriano
Copy link
Member

Tests are passing in jenkins, I guess failures were something sporadic in travis, I relaunched it.

@kaiyan-sheng
Copy link
Contributor Author

CI failure is tracked by #9597

@kaiyan-sheng kaiyan-sheng merged commit a239cfe into elastic:6.x Dec 17, 2018
@kaiyan-sheng kaiyan-sheng deleted the backport_9482_6.x branch December 17, 2018 20:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsoriano jsoriano jsoriano approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@kaiyan-sheng @jsoriano @ruflin