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: Elasticsearch server fileset: Add paths for Mac OSX and Windows #8891

Merged

Conversation

ycombinator
Copy link
Contributor

Resolves #8887.

This PR makes the elasticsearch/server fileset paths for Mac OSX and Windows consistent with other filesets' paths in the module. This also means that a user can now install Filebeat, enable the Elasticsearch module, and run Filebeat without any errors.

@ycombinator ycombinator added module review Filebeat Filebeat needs_backport PR is waiting to be backported to other branches. v7.0.0-alpha1 v6.6.0 labels Nov 1, 2018
@ycombinator ycombinator requested a review from ruflin November 1, 2018 18:29
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. Should we add a changelog for this?

For the OS X default path: Is that when installed with brew?

@ycombinator
Copy link
Contributor Author

Should we add a changelog for this?

Sure, I'll add to this PR.

For the OS X default path: Is that when installed with brew?

TBH, I don't know. It was the same path used in other elasticsearch filesets so I just made this fileset consistent with those ones.

@ycombinator
Copy link
Contributor Author

jenkins, test this

@ruflin
Copy link
Contributor

ruflin commented Nov 2, 2018

@ycombinator Can you follow up on this one after merging and see if the path is correct for OS X?

@ycombinator
Copy link
Contributor Author

Hey @radoondas In this PR I've set the Mac OSX logfile paths for the elasticsearch/server fileset to /usr/local/elasticsearch/*.log. I got that base directory (/usr/local/elasticsearch/) from other filesets in the elasticsearch module.

Looking at the commits on those other filesets, I see that you set the logfile paths on those. @ruflin and I were wondering how you chose /usr/local/elasticsearch/ as the base directory path for Elasticsearch logs on Mac OSX. Is this the path that Homebrew installs in or something else?

@ycombinator ycombinator force-pushed the filebeat-elasticsearch-server-log-ootb branch from 34a8d7c to b046ffd Compare November 5, 2018 21:11
@radoondas
Copy link
Member

@ycombinator Thanks for fixing this. It looks like I did not check paths in modules's metricset.

@ycombinator ycombinator merged commit aec847a into elastic:master Nov 6, 2018
@ycombinator ycombinator deleted the filebeat-elasticsearch-server-log-ootb branch November 6, 2018 00:29
@ycombinator ycombinator removed the needs_backport PR is waiting to be backported to other branches. label Nov 6, 2018
ycombinator added a commit that referenced this pull request Nov 6, 2018
…dows (#8891) (#8937)

Resolves #8887.

This PR makes the `elasticsearch/server` fileset paths for Mac OSX and Windows consistent with other filesets' paths in the module. This also means that a user can now install Filebeat, enable the Elasticsearch module, and run Filebeat without any errors.

(cherry picked from commit aec847a)
@urso urso mentioned this pull request Nov 28, 2018
6 tasks
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