Merge pull request #138 from wazuh/137-release-4.2.4

Release v4.2.4

Author: teddytpc1

CHANGELOG.md

@@ -1,6 +1,17 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## Wazuh Chef v4.2.4
+
+### Added
+
+- Update to Wazuh [v4.2.4](https://github.com/wazuh/wazuh/blob/v4.2.4/CHANGELOG.md#v424) 
+
+### Fixed
+
+- References to ossec- files were modified by the new wazuh- nomenclature.
+- Checks on the ossec-init.conf file, which does not exist since version 4.1.0, have been removed.
+
 ## Wazuh Chef v4.0.4_1.11.0
 
 ### Added

README.md

@@ -11,6 +11,7 @@ Deploy the Wazuh platform using Chef cookbooks. Chef recipes are prepared for in
 
 | Wazuh version | Elastic | ODFE   |
 |---------------|---------|--------|
+| v4.2.4        | v7.10.2 | v1.13.2|
 | v4.0.4        | v7.9.3  | v1.11.0|
 
 ## Dependencies

cookbooks/elastic-stack/attributes/versions.rb

@@ -6,12 +6,12 @@
 
 # ELK
 default['elk']['major_version'] = '7.x'
-default['elk']['patch_version'] = '7.9.3'
+default['elk']['patch_version'] = '7.11.2'
 
 # Wazuh
 default['wazuh']['major_version'] = '4.x'
-default['wazuh']['minor_version'] = '4.0'
-default['wazuh']['patch_version'] = '4.0.4'
+default['wazuh']['minor_version'] = '4.2'
+default['wazuh']['patch_version'] = '4.2.4'
 
 # Kibana
-default['wazuh']['kibana_plugin_version'] = '4.0.4_7.9.3'
+default['wazuh']['kibana_plugin_version'] = '4.2.4_7.10.2'

cookbooks/elastic-stack/recipes/kibana.rb

@@ -35,7 +35,7 @@
   source 'kibana.yml.erb'
   owner 'kibana'
   group 'kibana'
-  mode 0o755
+  mode 0755
   variables({
               server_port: node['kibana']['yml']['server']['port'],
               server_host: node['kibana']['yml']['server']['host'],

cookbooks/filebeat-oss/attributes/versions.rb

@@ -4,9 +4,9 @@
 
 # ELK 
 default['elk']['major_version'] = "7.x" 
-default['elk']['patch_version'] = "7.9.1"
+default['elk']['patch_version'] = "7.10.2"
 
 # Wazuh
 default['wazuh']['major_version'] = "4.x"
-default['wazuh']['minor_version'] = "4.0"
-default['wazuh']['patch_version'] = "4.0.4"
+default['wazuh']['minor_version'] = "4.2"
+default['wazuh']['patch_version'] = "4.2.4"

cookbooks/filebeat/attributes/versions.rb

@@ -4,9 +4,9 @@
 
 # ELK 
 default['elk']['major_version'] = "7.x" 
-default['elk']['patch_version'] = "7.9.3"
+default['elk']['patch_version'] = "7.10.2"
 
 # Wazuh
 default['wazuh']['major_version'] = "4.x"
-default['wazuh']['minor_version'] = "4.0"
-default['wazuh']['patch_version'] = "4.0.4"
+default['wazuh']['minor_version'] = "4.2"
+default['wazuh']['patch_version'] = "4.2.4"

cookbooks/opendistro/attributes/versions.rb

@@ -5,18 +5,18 @@
 # Author:: Wazuh <[email protected]>
 
 # Elastic Stack
-default['elk']['patch_version'] = '7.9.1'
+default['elk']['patch_version'] = '7.10.2'
 
 # Opendistro
-default['odfe']['patch_version'] = '1.11.0'
+default['odfe']['patch_version'] = '1.13.2'
 
 # Wazuh
 default['wazuh']['major_version'] = '4.x'
-default['wazuh']['minor_version'] = '4.0'
-default['wazuh']['patch_version'] = '4.0.4'
+default['wazuh']['minor_version'] = '4.2'
+default['wazuh']['patch_version'] = '4.2.4'
 
 # Kibana
-default['wazuh']['kibana_plugin_version'] = '4.0.4_7.9.1'
+default['wazuh']['kibana_plugin_version'] = '4.2.4_7.10.2'
 
 # Search guard
 default['searchguard']['version'] = '1.8'

cookbooks/opendistro/recipes/kibana.rb

@@ -40,7 +40,7 @@
               server_host: (node['kibana']['yml']['server']['host']).to_s,
               elasticsearch_hosts: node['kibana']['yml']['elasticsearch']['hosts']
             })
-  mode 0o755
+  mode 0755
 end
 
 # Update the optimize and plugins directories permissions

cookbooks/opendistro/recipes/prerequisites.rb

@@ -52,19 +52,19 @@
 
   if node['platform_version'] >= '8'
     dnf_package 'Install prerequisites packages' do
-      package_name %w[java-11-openjdk-devel libcap]
+      package_name %w[java-11-openjdk libcap]
       action :install
     end
   else
     yum_package 'Install prerequisites packages' do
-      package_name %w[java-11-openjdk-devel libcap]
+      package_name %w[java-11-openjdk libcap]
       action :install
     end
   end
 when 'opensuseleap', 'suse'
   # Install zypper prerequisites
   zypper_package 'Install prerequisites packages' do
-    package_name %w[libcap2 java-11-openjdk-devel]
+    package_name %w[libcap2 java-11-openjdk]
   end
 else
   raise 'Currently platforn not supported yet. Feel free to open an issue on https://www.github.com/wazuh/wazuh-chef if you consider that support for a specific OS should be added'

cookbooks/opendistro/test/integration/opendistro/prerequisites_test.rb

@@ -36,15 +36,15 @@
       it { should be_installed }
     end
 
-    describe package('java-11-openjdk-devel') do
+    describe package('java-11-openjdk') do
       it { should be_installed }
     end
   when 'suse'
     describe package('libcap2') do
       it { should be_installed }
     end
 
-    describe package('java-11-openjdk-devel') do
+    describe package('java-11-openjdk') do
       it { should be_installed }
     end
   end

cookbooks/wazuh_agent/attributes/version.rb

@@ -3,5 +3,5 @@
 # Author:: Wazuh <[email protected]
 
 default['wazuh']['major_version'] = "4.x"
-default['wazuh']['minor_version'] = "4.0"
-default['wazuh']['patch_version'] = "4.0.4"
+default['wazuh']['minor_version'] = "4.2"
+default['wazuh']['patch_version'] = "4.2.4"

cookbooks/wazuh_agent/recipes/common.rb

@@ -17,19 +17,6 @@
 # limitations under the License.
 #
 
-ruby_block 'ossec install_type' do
-  block do
-    File.open('/var/ossec/etc/ossec-init.conf') do |file|
-      file.each_line do |line|
-        if line =~ /^TYPE="([^"]+)"/
-          type = Regexp.last_match(1)
-          break
-        end
-      end
-    end
-  end
-end
-
 # Gyoku renders the XML.
 chef_gem 'gyoku' do
   compile_time false if respond_to?(:compile_time)

cookbooks/wazuh_agent/test/integration/wazuh_agent/common_test.rb

@@ -9,28 +9,24 @@
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-logcollector') do
+describe command('ps -ef | grep wazuh-logcollector') do
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-syscheckd') do
+describe command('ps -ef | grep wazuh-syscheckd') do
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-execd') do
+describe command('ps -ef | grep wazuh-execd') do
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-agentd') do
+describe command('ps -ef | grep wazuh-agentd') do
     its('exit_status') { should eq 0 }
 end 
 
 # Check OSSEC dir
 
-describe file('/var/ossec/etc/ossec-init.conf') do
-    it { should be_symlink }
-end
-
 describe file('/var/ossec') do
     it { should be_directory }
     its('mode') { should cmp '0750' }
@@ -45,13 +41,6 @@
     its('group') { should cmp 'ossec' }
 end
 
-describe file('/etc/ossec-init.conf') do 
-    it { should exist }
-    its('owner') { should cmp 'root' }
-    its('group') { should cmp 'ossec' }
-    its('mode') { should cmp '0640' }
-end
-
 describe file('/var/ossec/etc/ossec.conf') do 
     it { should exist }
     its('owner') { should cmp 'root' }

cookbooks/wazuh_manager/attributes/versions.rb

@@ -3,5 +3,5 @@
 # Author:: Wazuh <[email protected]
 
 default['wazuh']['major_version'] = "4.x"
-default['wazuh']['minor_version'] = "4.0"
-default['wazuh']['patch_version'] = "4.0.4"
+default['wazuh']['minor_version'] = "4.2"
+default['wazuh']['patch_version'] = "4.2.4"

cookbooks/wazuh_manager/recipes/common.rb

@@ -8,15 +8,6 @@
       type = 'local'
     else
       type = "test"
-
-      File.open('/var/ossec/etc/ossec-init.conf') do |file|
-        file.each_line do |line|
-          if line =~ /^TYPE="([^"]+)"/
-            type = Regexp.last_match(1)
-            break
-          end
-        end
-       end
     end
 
     node.normal['ossec']['install_type'] = type

cookbooks/wazuh_manager/recipes/manager.rb

@@ -45,8 +45,8 @@
 # Auth need to be enable only in master node.
 if node['ossec']['conf']['cluster']['node_type'] == 'master'
   execute 'Enable Authd' do
-    command '/var/ossec/bin/ossec-control enable auth'
-    not_if "ps axu | grep ossec-authd | grep -v grep"
+    command '/var/ossec/bin/wazuh-control enable auth'
+    not_if "ps axu | grep wazuh-authd | grep -v grep"
   end
 end
 

cookbooks/wazuh_manager/templates/default/api.yaml.erb

@@ -3,19 +3,6 @@
 host: <%= @host %>
 port: <%= @port %>
 
-# Set this option to "yes" in case the API is running behind a proxy server. Values: yes, no
-behind_proxy_server: no
-
-# Advanced configuration
-
-https:
-  enabled: yes
-  key: "api/configuration/ssl/server.key"
-  cert: "api/configuration/ssl/server.crt"
-  use_ca: False
-  ca: "api/configuration/ssl/ca.crt"
-  ssl_cipher: "TLSv1.2"
-
 # Logging configuration
 # Values for API log level: disabled, info, warning, error, debug, debug2 (each level includes the previous level).
 logs:

cookbooks/wazuh_manager/test/integration/wazuh_manager/common_test.rb

@@ -17,48 +17,44 @@
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-monitord') do
+describe command('ps -ef | grep wazuh-monitord') do
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-logcollector') do
+describe command('ps -ef | grep wazuh-logcollector') do
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-remoted') do
+describe command('ps -ef | grep wazuh-remoted') do
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-syscheckd') do
+describe command('ps -ef | grep wazuh-syscheckd') do
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-analysisd') do
+describe command('ps -ef | grep wazuh-analysisd') do
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-execd') do
+describe command('ps -ef | grep wazuh-execd') do
     its('exit_status') { should eq 0 }
 end 
 
 describe command('ps -ef | grep wazuh-db') do
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-authd') do
+describe command('ps -ef | grep wazuh-authd') do
     its('exit_status') { should eq 0 }
 end 
 
-describe command('ps -ef | grep ossec-apid') do
+describe command('ps -ef | grep wazuh-apid') do
     its('exit_status') { should eq 0 }
 end 
 
 # Check OSSEC dir
 
-describe file('/var/ossec/etc/ossec-init.conf') do
-    it { should be_symlink }
-end
-
 describe file('/var/ossec') do
     it { should be_directory }
     its('mode') { should cmp '0750' }
@@ -73,13 +69,6 @@
     its('group') { should cmp 'ossec' }
 end
 
-describe file('/etc/ossec-init.conf') do 
-    it { should exist }
-    its('owner') { should cmp 'root' }
-    its('group') { should cmp 'ossec' }
-    its('mode') { should cmp '0640' }
-end
-
 describe file('/var/ossec/etc/shared/default/agent.conf') do 
     it { should exist }
     its('owner') { should cmp 'ossec' }

cookbooks/wazuh_manager/test/integration/wazuh_manager/manager_test.rb

@@ -15,10 +15,10 @@
 
 describe port(1515) do
     it { should be_listening }
-    its('processes') {should include 'ossec-authd'}
+    its('processes') {should include 'wazuh-authd'}
 end
 
 describe port(1514) do
     it { should be_listening }
-    its('processes') {should include 'ossec-remoted'}
+    its('processes') {should include 'wazuh-remoted'}
 end

metadata.rb

@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs/Configures Wazuh with chef cookbooks'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '4.0.4'
+version          '4.2.4'
 chef_version     '>= 15.0'
 
 %w(redhat centos oracle).each do |el|