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

Adding Filebeat module and adapted Elasticsearch IP #144

Merged
merged 11 commits into from
Aug 9, 2019

Conversation

rshad
Copy link
Contributor

@rshad rshad commented Aug 8, 2019

Hi all!

Resolution for #145

This PR includes the corresponding changes to add Filebeat module to Wazuh installation using Puppet. We also adapted Elasticsearch IP so to not be assigned as localhost due to proven errors we got during the installation.

Filebeat module installation

exec { 'Installing filebeat module ... Downloading package':
path => '/usr/bin',
command => "curl -o /root/${$wazuh_module_filebeat_module} https://packages-dev.wazuh.com/3.x/filebeat/${$wazuh_module_filebeat_module}",
}
exec { 'Unpackaging ...':
command => "/bin/tar -xzvf /root/wazuh-filebeat-0.1.tar.gz -C /usr/share/filebeat/module",
notify => Service['filebeat']
}
file { '/usr/share/filebeat/module/wazuh':
ensure => 'directory',
mode => '0755',
}

Adapting Elasticsearch IP in [Filebeat, Elasticsearch and Kibana] manifests

$filebeat_elasticsearch_ip = '<YOUR_ELASTICSEARCH_IP>',

$elasticsearch_ip = '<YOUR_ELASTICSEARCH_IP>',

$kibana_elasticsearch_ip = '<YOUR_ELASTICSEARCH_IP>',

Kind regards,

Rshad

@rshad rshad changed the base branch from master to 3.9.4_7.2.0 August 8, 2019 13:16
@jm404 jm404 self-requested a review August 8, 2019 13:21
manifests/elasticsearch.pp Outdated Show resolved Hide resolved
manifests/filebeat.pp Outdated Show resolved Hide resolved
manifests/filebeat.pp Outdated Show resolved Hide resolved
manifests/kibana.pp Outdated Show resolved Hide resolved
Copy link
Contributor

@jm404 jm404 left a comment

Choose a reason for hiding this comment

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

Hi @rshad ,

Please review the changes requested!

Thanks

CHANGELOG.md Outdated Show resolved Hide resolved
@jm404 jm404 removed the enhancement label Aug 8, 2019
@jm404 jm404 added this to the 32th week sprint milestone Aug 8, 2019
@@ -10,8 +10,11 @@
$filebeat_version = '7.2.0',
$wazuh_app_version = '3.9.4_7.2.0',
$wazuh_extensions_version = 'v3.9.4',
$wazuh_module_filebeat_module = 'wazuh-filebeat-0.1.tar.gz',
Copy link
Contributor

Choose a reason for hiding this comment

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

Lets change this to wazuh_filebeat_module I think it clearer

@@ -32,10 +35,23 @@
notify => Service['filebeat']
}

exec { 'Installing filebeat module ... Downloading package':
path => '/usr/bin',
command => "curl -o /root/${$wazuh_module_filebeat_module} https://packages-dev.wazuh.com/3.x/filebeat/${$wazuh_module_filebeat_module}",
Copy link
Contributor

Choose a reason for hiding this comment

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

Also changing here for wazuh_filebeat_module

Copy link
Contributor

@jm404 jm404 left a comment

Choose a reason for hiding this comment

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

Hi @rshad please have a look at the little changes.

Thanks!

Copy link
Contributor

@jm404 jm404 left a comment

Choose a reason for hiding this comment

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

LGTM!

@jm404 jm404 merged commit a781c9c into 3.9.4_7.2.0 Aug 9, 2019
@jm404 jm404 deleted the 3.9.4_7.2.0_install_filebeat branch August 9, 2019 09:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants