Skip to content

Cherry-pick #15957 to 7.6: Fix packaging of OSS light modules#15987

Merged
jsoriano merged 1 commit intoelastic:7.6from
jsoriano:backport_15957_7.6
Jan 31, 2020
Merged

Cherry-pick #15957 to 7.6: Fix packaging of OSS light modules#15987
jsoriano merged 1 commit intoelastic:7.6from
jsoriano:backport_15957_7.6

Conversation

@jsoriano
Copy link
Copy Markdown
Member

Cherry-pick of PR #15957 to 7.6 branch. Original message:

What does this PR do?

Move light modules packaging code in Metricbeat to common methods for X-Pack and OSS, so they are properly packaged in both cases.

Add a check to OSS metricbeat packaging test to check that it includes at least one light module.

Why is it important?

Metricbeat 7.6.0 includes OSS light modules, but they are not being packaged.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works

How to test this PR locally

  • Check that OSS Metricbeat packages include OSS light modules, but not X-Pack light modules.
  • Check that X-Pack Metricbeat packages include OSS and x-pack light modules.

Packages can be built with mage package

Related issues

(cherry picked from commit 2cde4ce)
@jsoriano jsoriano merged commit b538346 into elastic:7.6 Jan 31, 2020
@jsoriano jsoriano deleted the backport_15957_7.6 branch January 31, 2020 15:10
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.

2 participants