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

Move Metricbeat modules.d dir to /etc/metricbeat #8105

Merged
merged 2 commits into from
Aug 29, 2018

Conversation

andrewkroh
Copy link
Member

This fixes the location of the Metricbeat modules.d directory as installed by .deb and .rpm packages.

Fixes #8104

This fixes the location of the Metricbeat modules.d directory as installed by .deb and .rpm packages.

Fixes elastic#8104
@andrewkroh andrewkroh added bug review Metricbeat Metricbeat needs_backport PR is waiting to be backported to other branches. Packaging labels Aug 27, 2018
Copy link
Contributor

@tsg tsg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@tsg
Copy link
Contributor

tsg commented Aug 27, 2018

jenkins, package it

@@ -126,9 +126,8 @@ func GoTestIntegration(ctx context.Context) error {
// not supported.
func customizePackaging() {
var (
archiveModulesDir = "modules.d"
linuxPkgModulesDir = "/usr/share/{{.BeatName}}/modules.d"
darwinDMGModulesDir = "/Library/Application Support/{{.BeatVendor}}/{{.BeatName}}/modules.d"
Copy link
Contributor

@ruflin ruflin Aug 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it on purpose that now the Mac files are placed under a different location?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new MacOS installer puts our typical path.home files into /Library/Application Support because this is conventional (it's like /usr/share).

The config and logs go to /etc and /var just like Linux. So the modules.d was wrong for MacOS too.

andrewkroh added a commit to andrewkroh/beats-tester that referenced this pull request Aug 27, 2018
Test that the `filebeat modules list` and `metricbeat modules list` commands are working.

Relates elastic/beats#7488 elastic/beats#8105
andrewkroh added a commit to andrewkroh/beats-tester that referenced this pull request Aug 27, 2018
Test that the `filebeat modules list` and `metricbeat modules list` commands are working.

Relates elastic/beats#7488 elastic/beats#8105
@tsg
Copy link
Contributor

tsg commented Aug 28, 2018

jenkins, package it

@ruflin
Copy link
Contributor

ruflin commented Aug 28, 2018

Trying to trigger a packaging build here: https://beats-ci.elastic.co/job/elastic+beats+pull-request+package/47/console

@andrewkroh andrewkroh merged commit ac96597 into elastic:master Aug 29, 2018
andrewkroh added a commit to elastic/beats-tester that referenced this pull request Aug 29, 2018
Test that the `filebeat modules list` and `metricbeat modules list` commands are working.

Relates elastic/beats#7488 elastic/beats#8105
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Aug 29, 2018
This fixes the location of the Metricbeat modules.d directory as installed by .deb and .rpm packages.

Fixes elastic#8104

(cherry picked from commit ac96597)
@andrewkroh andrewkroh added v6.5.0 and removed needs_backport PR is waiting to be backported to other branches. labels Aug 29, 2018
andrewkroh added a commit to andrewkroh/beats that referenced this pull request Aug 29, 2018
This fixes the location of the Metricbeat modules.d directory as installed by .deb and .rpm packages.

Fixes elastic#8104

(cherry picked from commit ac96597)
andrewkroh added a commit that referenced this pull request Aug 30, 2018
This fixes the location of the Metricbeat modules.d directory as installed by .deb and .rpm packages.

Fixes #8104

(cherry picked from commit ac96597)
exekias pushed a commit that referenced this pull request Sep 3, 2018
This fixes the location of the Metricbeat modules.d directory as installed by .deb and .rpm packages.

Fixes #8104

(cherry picked from commit ac96597)
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
…tic#8152)

This fixes the location of the Metricbeat modules.d directory as installed by .deb and .rpm packages.

Fixes elastic#8104

(cherry picked from commit b62f374)
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.

[Metricbeat] modules.d installed to wrong location
4 participants