Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Support OSS versions of beats #28

Closed
wants to merge 4 commits into from
Closed

Conversation

watsonian
Copy link

This adds a new default variable called use_oss that defaults to false. If you set it to true, then the OSS package repositories are used. It also bumps the default beats version from 7.0.0 to 7.1.1.

@elasticmachine
Copy link
Collaborator

Since this is a community submitted pull request, a Jenkins build has not been kicked off automatically. Can an Elastic organization member please verify the contents of this patch and then kick off a build manually?

@watsonian
Copy link
Author

@jmlrt Any chance of getting some eyes on this? The CLA is submitted now, so we should be good on that front.

@jmlrt
Copy link
Member

jmlrt commented Jun 18, 2019

jenkins test this please

Copy link
Member

@jmlrt jmlrt left a comment

Choose a reason for hiding this comment

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

Hi @watsonian,
Thanks for this great PR.

In elastic/ansible-elasticsearch we use es_enable_xpack variable to choose oss or elastic version. Do you think you could rename use_oss variable to es_enable_xpack so we can have better consistency between these 2 ansible roles.

It would also be great to add documentation and test for oss:

  • for documentation: adding this variable in README.md#role-variables
  • for testing: adding a new oss test in kitchen-test suites with same configuration as standard test plus es_enable_xpack variable set to false would be great

Please tell me if you need help for the kitchen test.

@jmlrt jmlrt self-assigned this Jun 18, 2019
@watsonian
Copy link
Author

@jmlrt Pushed up the changes (less the test) that you mentioned. Is that more or less what you were after? I will say, it does seem very odd to have the config setting you disable to install the OSS version be called beats_enable_xpack. If I were looking for a setting to swap to the OSS version, that is definitely not the first thing I'd look for.

As for the tests, is what I'm looking for here essentially something like this:

test
└── integration
    ├── oss
    │   └── serverspec
    │       └── default_spec.rb
    └── oss.yml

with oss.yml setting beats_enable_xpack to false and then some additional tests in default_spec.rb to check that the oss version was actually installed?

@jmlrt
Copy link
Member

jmlrt commented Jul 10, 2019

Hi @watsonian sorry for the late answer.

I agree with you that beats_enable_xpack is not the more intuitive name but I'd like to keep consistency with equivalent variable name in elastic/ansible-elasticsearch role. Maybe we'll rename both variables in both ansible roles later.

As for the tests, is what I'm looking for here essentially something like this:

test
└── integration
    ├── oss
    │   └── serverspec
    │       └── default_spec.rb
   └── oss.yml

with oss.yml setting beats_enable_xpack to false and then some additional tests in default_spec.rb to check that the oss version was actually installed?

As for the test, it is exactly that.

@nimmortal
Copy link

Hello guys, any progress on that?

@jmlrt jmlrt removed their assignment Sep 12, 2019
@jmlrt jmlrt added feature and removed enhancement labels Sep 17, 2019
@jmlrt jmlrt mentioned this pull request Sep 17, 2019
@botelastic
Copy link

botelastic bot commented Dec 11, 2019

This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.
To track this PR (even if closed), please open a corresponding issue if one does not already exist.

@jmlrt
Copy link
Member

jmlrt commented Dec 11, 2019

Implemented in #61

@jmlrt jmlrt closed this Dec 11, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants