Merge branch '4.8.0' into enhancement/4763-fix-onemanager-agent-env-t…

…ests

CHANGELOG.md

@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - Fix one_manager_agent_env pytest marker for System Tests ([#4782](https:/wazuh/wazuh-qa/pull/4782)) \- (Tests)
+- Updated Filebeat module to 0.4 ([#4775](https:/wazuh/wazuh-qa/pull/4775)) \- (Framework)
 - Include ATP repository update before the installation of Ubuntu E2E agent installation ([#4761](https:/wazuh/wazuh-qa/pull/4761)) \- (Framework)
 - Enhance macOS deployment ansible taks ([#4685](https:/wazuh/wazuh-qa/pull/4685)) \- (Framework)
 - Updated Filebeat module to 0.3 ([#4700](https:/wazuh/wazuh-qa/pull/4700)) \- (Framework)
@@ -32,6 +33,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Fix macOS agents provision to enable registration and connection with managers. ([#4770](https:/wazuh/wazuh-qa/pull/4770/)) \- (Framework)
 - Fix hardcoded python interpreter in qa_framework role. ([#4658](https:/wazuh/wazuh-qa/pull/4658)) \- (Framework)
 - Fix duplicated jq dependency ([#4678](https:/wazuh/wazuh-qa/pull/4678)) \- (Framework)
 

provisioning/playbooks/wazuh_environment.yaml

@@ -53,19 +53,8 @@
  username: wazuh
  password: wazuh
 
-# Agent
 - hosts: agent
- tasks:
- - name: Agents
- block:
- - name: Install UNIX based agents
- become: true
- become_user: root
- import_role:
- name: "../roles/wazuh/ansible-wazuh-agent"
- when: ansible_os_family != "Windows"
-
- - name: Install Windows based agents
- import_role:
- name: "../roles/wazuh/ansible-wazuh-agent"
- when: ansible_os_family == "Windows"
+ roles:
+ - role: "../roles/wazuh/ansible-wazuh-agent"
+ become: "{{ ansible_os_family != 'Windows' }}"
+ become_user: root

provisioning/roles/wazuh/ansible-filebeat-oss/defaults/main.yml

@@ -9,7 +9,7 @@ filebeat_output_indexer_hosts:
  - "localhost:9200"
 
 filebeat_module_package_url: https://packages.wazuh.com/4.x/filebeat
-filebeat_module_package_name: wazuh-filebeat-0.3.tar.gz
+filebeat_module_package_name: wazuh-filebeat-0.4.tar.gz
 filebeat_module_package_path: /tmp/
 filebeat_module_destination: /usr/share/filebeat/module
 filebeat_module_folder: /usr/share/filebeat/module/wazuh

provisioning/roles/wazuh/ansible-wazuh-agent/handlers/main.yml

@@ -4,3 +4,6 @@
 
 - name: Windows | Restart Wazuh Agent
  win_service: name=WazuhSvc start_mode=auto state=restarted
+
+- name: macOS | Restart Wazuh Agent
+ command: /Library/Ossec/bin/wazuh-control restart

provisioning/roles/wazuh/ansible-wazuh-agent/tasks/MacOS.yml

@@ -14,7 +14,7 @@
  owner: root
  group: wazuh
  mode: 0644
- notify: restart wazuh-agent
+ notify: macOS | Restart Wazuh Agent
  tags:
  - init
  - config
@@ -33,7 +33,7 @@
  owner: root
  group: wazuh
  mode: 0640
- notify: restart wazuh-agent
+ notify: macOS | Restart Wazuh Agent
  tags:
  - init
  - config