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

Bring back prospector.type which went missing #4361

Merged
merged 1 commit into from May 22, 2017

Conversation

Projects
None yet
4 participants
@ruflin
Copy link
Collaborator

commented May 19, 2017

It seems in one of the recent refactorings prospector.type went missing. Test added to make sure it will not go missing again.

@ruflin

This comment has been minimized.

Copy link
Collaborator Author

commented May 19, 2017

@vjsamuel As you are working off master, this could interest you.

@vjsamuel

This comment has been minimized.

Copy link
Contributor

commented May 19, 2017

@ruflin, i did notice that prospector.type was missing. i thought that i was not looking at it properly :)

filebeat.check_kill_and_wait()

output = self.read_output()[0]
assert "@timestamp" in output

This comment has been minimized.

Copy link
@glefloch

glefloch May 22, 2017

Contributor

Shouldn't we assert that prospector.type is in the output ?

This comment has been minimized.

Copy link
@ruflin

ruflin May 22, 2017

Author Collaborator

YES. I'm not really confused to not see it here, because that is the reason I added this test. Not sure what I was doing. Thanks for spotting this.

This comment has been minimized.

Copy link
@ruflin

ruflin May 22, 2017

Author Collaborator

Fixed

Bring back prospector.type which went missing
It seems in one of the recent refactorings prospector.type went missing. Test added to make sure it will not go missing again.

@ruflin ruflin force-pushed the ruflin:bring-back-prospector-type branch from 32349bc to 47cf36f May 22, 2017

Test if the basic fields exist.
"""
self.render_config_template(
path=os.path.abspath(self.working_dir) + "/test.log",

This comment has been minimized.

Copy link
@andrewkroh

andrewkroh May 22, 2017

Member

After dealing with weird path issues lately, I recommend using os.path.join over string concat to join paths. Or even just putting the + "/test.log" inside the abspath() call would fix the problem because abspath normalizes the path that it returns.

@andrewkroh andrewkroh merged commit b1e44a5 into elastic:master May 22, 2017

4 checks passed

CLA Commit author has signed the CLA
Details
beats-ci Build finished.
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

ramon-garcia added a commit to ramon-garcia/beats that referenced this pull request Dec 5, 2017

Bring back prospector.type which went missing (elastic#4361)
It seems in one of the recent refactorings prospector.type went missing. Test added to make sure it will not go missing again.

athom added a commit to athom/beats that referenced this pull request Jan 25, 2018

Bring back prospector.type which went missing (elastic#4361)
It seems in one of the recent refactorings prospector.type went missing. Test added to make sure it will not go missing again.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.