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.

Sign up for GitHub

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

Jump to bottom

Add images compatible with xpack #409

Merged
merged 15 commits into from
Feb 5, 2021
Merged

Add images compatible with xpack #409

merged 15 commits into from
Feb 5, 2021

Conversation

xr09
Copy link
Contributor

@xr09 xr09 commented Nov 23, 2020 •
edited
Loading

This PR closes #398

Changes

  • Backport kibana-xpack image
  • Add the ARG FILEBEAT_CHANNEL on the wazuh-odfe Dockefile to allow for both regular filebeat and oss versions.
  • Add xpack-compose.yml with sample deployment
  • Add generate-elasticsearch-certs.yml and xpack/instances.yml for SSL cert generation

@xr09 xr09 self-assigned this Nov 23, 2020
@xr09 xr09 force-pushed the feature-xpack-4.0 branch from a4f007b to 2db277e Compare December 1, 2020 17:24
@xr09 xr09 marked this pull request as ready for review December 1, 2020 18:00
@xr09 xr09 requested review from manuasir, Zenidd and neonmei December 1, 2020 18:00
@xr09 xr09 marked this pull request as draft December 1, 2020 18:00
@Zenidd Zenidd added this to the Sprint 123 - DevOps milestone Dec 23, 2020
@Zenidd Zenidd removed this from the Sprint 123 - DevOps milestone Jan 5, 2021
@xr09 xr09 force-pushed the feature-xpack-4.0 branch from e8a1282 to 0d5d167 Compare January 26, 2021 14:30
@xr09 xr09 removed request for manuasir and neonmei January 26, 2021 14:39
@xr09 xr09 marked this pull request as ready for review February 5, 2021 15:12
Zenidd
Zenidd approved these changes Feb 5, 2021
View reviewed changes
Copy link
Contributor

@Zenidd Zenidd left a comment

Choose a reason for hiding this comment

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

Ready to merge, Big Ups!

@xr09 xr09 merged commit 5313c60 into master Feb 5, 2021
@xr09 xr09 deleted the feature-xpack-4.0 branch February 5, 2021 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zenidd Zenidd Zenidd approved these changes

Assignees

@xr09 xr09

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Create images compatible with Elasticsearch (xpack)
2 participants
@xr09 @Zenidd