Merge 4.7.0 into 4.7.1

CHANGELOG.md

@@ -9,29 +9,29 @@ Release report: TBD
 
 ## [4.7.0] - TBD
 
-Wazuh commit: TBD \
-Release report: TBD
-
 ### Added
 
 - Add callbacks and IT tests for Integratord options tag. ([#4166](https://github.com/wazuh/wazuh-qa/pull/4166)) \- (Framework + tests)
 - Add vulnerability Detector integration tests for Amazon Linux 2023 ([#4482](https://github.com/wazuh/wazuh-qa/pull/4482)) \- (Core)
 
 ### Changed
 
-- Add option to run some logcollector tests isolated (without a manager) [#4226](https://github.com/wazuh/wazuh-qa/pull/4226) \- (Tests + Framework)
-- Update code analysis and dependencies known flaws. [#4083](https://github.com/wazuh/wazuh-qa/pull/4083) \- (Tests)
+- Revert a pattern log in analysisd test ([#4688](https://github.com/wazuh/wazuh-qa/pull/4688)) \- (Framework)
+- Clean environment between basic_cluster tests ([#4656](https://github.com/wazuh/wazuh-qa/pull/4656)) \- (Tests)
+- Upgrade gcc version in system tests image ([#4655](https://github.com/wazuh/wazuh-qa/pull/4655)) \- (Framework)
+- Add option to run some logcollector tests isolated (without a manager) ([#4226](https://github.com/wazuh/wazuh-qa/pull/4226)) \- (Tests + Framework)
+- Update code analysis and dependencies known flaws. ([#4083](https://github.com/wazuh/wazuh-qa/pull/4083)) \- (Tests)
 - Update _wazuh_db_ schema database version([#4405](https://github.com/wazuh/wazuh-qa/pull/4405)) \- (Tests)
 - Update framework known flaws file ([#4313](https://github.com/wazuh/wazuh-qa/pull/4313)) \- (Tests)
 
 ### Fixed
+
+- Deprecate source installation in System Tests ([#4686](https://github.com/wazuh/wazuh-qa/pull/4686)) \- (Framework)
+- Update default vacuum settings in IT ([#4671](https://github.com/wazuh/wazuh-qa/pull/4671)) \- (Tests)
 - Fix registry wildcards path ([#4400](https://github.com/wazuh/wazuh-qa/pull/4400)) \- (Tests)
 - Fix warnings in the rids tests([#4151](https://github.com/wazuh/wazuh-qa/pull/4151)) \- (Framework + Tests)
 
-## [4.6.0] - TBD
-
-Wazuh commit: TBD \
-Release report: TBD
+## [4.6.0] - 31/10/2023
 
 ### Added
 

deps/wazuh_testing/wazuh_testing/modules/analysisd/event_monitor.py

@@ -67,7 +67,8 @@ def check_eps_disabled():
 
 def check_eps_missing_maximum():
     """Check if the eps block has the maximum tag"""
-    check_analysisd_event(callback=r".*WARNING: The EPS maximum value is missing in the configuration block.*",
+    check_analysisd_event(callback=r".*WARNING: EPS limit disabled. "
+                                   "The maximum value is missing in the configuration block.*",
                           timeout=T_10)
 
 

tests/integration/test_wazuh_db/data/global/wazuhdb_getconfig.yaml

@@ -31,7 +31,7 @@
     -
       input: '{"version": 1, "origin": {"module": "api"}, "command": "getconfig", "module": "api", "parameters": {
               "section": "internal"}}'
-      output: '"data":{"wazuh_db":{"commit_time_max":60,"commit_time_min":10,"open_db_limit":64,"worker_pool_size":8,"fragmentation_threshold":80,"fragmentation_delta":5,"free_pages_percentage":5,"max_fragmentation":95,"check_fragmentation_interval":43200}}'
+      output: '"data":{"wazuh_db":{"commit_time_max":60,"commit_time_min":10,"open_db_limit":64,"worker_pool_size":8,"fragmentation_threshold":75,"fragmentation_delta":5,"free_pages_percentage":0,"max_fragmentation":90,"check_fragmentation_interval":7200}}'
 -
   name: Get wdb config
   test_case:

tests/system/README.md

@@ -228,17 +228,15 @@ in `system/provisioning/<specified_cluster_environment>` path:
 ansible-playbook -i inventory.yml playbook.yml
 ```
 
-If you want to specify a particular branch of the Wazuh repository, you will need to include:
-```shell script
-ansible-playbook -i inventory.yml playbook.yml --extra-vars='{"wazuh_branch":"v4.3.0-rc1"}'
-```
-You can also specify a package instead using the `package_repository`, `repository`, `package_version`, `package_revision` parameters:
+You can specify a package as `package_repository`, `repository`, `package_version`, `package_revision` parameters:
 ```shell script
 ansible-playbook -i inventory.yml playbook.yml --extra-vars='{"package_repository":"packages", "repository": "4.x", "package_version": "4.4.0", "package_revision": "1"}'
 ```
-In the **basic cluster**, you also have to specify a branch from the Wazuh QA repository.
+
+In the basic cluster, you also have to specify a branch from the Wazuh QA repository.
+
 ```shell script
-ansible-playbook -i inventory.yml playbook.yml --extra-vars='{"wazuh_branch":"v4.3.0-rc1", "wazuh_qa_branch":"master"}'
+ansible-playbook -i inventory.yml playbook.yml --extra-vars='{"package_repository":"packages", "repository": "4.x", "package_version": "4.4.0", "package_revision": "1", "wazuh_qa_branch":"v4.3.0-rc1"}'
 ```
 
 We use [pytest](https://docs.pytest.org/en/latest/contents.html) to run our cluster system tests. Pytest will

tests/system/provisioning/agentless_cluster/roles/master-role/tasks/main.yml

@@ -22,44 +22,14 @@
     update_cache: yes
     cache_valid_time: 3600
 
-- name: "Clone wazuh repository"
-  git:
-    repo: "https://github.com/wazuh/wazuh"
-    dest: /wazuh
-    version: "{{ wazuh_branch }}"
-  when: wazuh_branch is defined
-
-- name: Install master
-  args:
-    chdir: /wazuh
-    creates: /var/ossec
-  environment:
-    USER_LANGUAGE: "en"
-    USER_NO_STOP: "y"
-    USER_INSTALL_TYPE: "server"
-    USER_DIR: "/var/ossec"
-    USER_ENABLE_EMAIL: "n"
-    USER_ENABLE_SYSCHECK: "n"
-    USER_ENABLE_ROOTCHECK: "n"
-    USER_ENABLE_OPENSCAP: "n"
-    USER_WHITE_LIST: "n"
-    USER_ENABLE_SYSLOG: "y"
-    USER_ENABLE_AUTHD: "y"
-    USER_AUTO_START: "y"
-    USER_UPDATE: "n"
-  shell: "./install.sh"
-  when: wazuh_branch is defined
-
 - name: "Get manager package"
   ansible.builtin.get_url:
     url: "https://{{package_repository}}.wazuh.com/{{repository}}/apt/pool/main/w/wazuh-manager/wazuh-manager_{{package_version}}-{{package_revision}}_amd64.deb"
     dest: /tmp/wazuh-manager.deb
-  when: wazuh_branch is not defined
 
 - name: "Install manager package"
   ansible.builtin.apt:
     deb: /tmp/wazuh-manager.deb
-  when: wazuh_branch is not defined
 
 - name: Copy ossec.conf file
   copy:

tests/system/provisioning/agentless_cluster/roles/worker-role/tasks/main.yml

@@ -22,44 +22,14 @@
     update_cache: yes
     cache_valid_time: 3600
 
-- name: "Clone wazuh repository"
-  git:
-    repo: "https://github.com/wazuh/wazuh"
-    dest: /wazuh
-    version: "{{ wazuh_branch }}"
-  when: wazuh_branch is defined
-
-- name: Install worker
-  args:
-    chdir: /wazuh
-    creates: /var/ossec
-  environment:
-    USER_LANGUAGE: "en"
-    USER_NO_STOP: "y"
-    USER_INSTALL_TYPE: "server"
-    USER_DIR: "/var/ossec"
-    USER_ENABLE_EMAIL: "n"
-    USER_ENABLE_SYSCHECK: "y"
-    USER_ENABLE_ROOTCHECK: "y"
-    USER_ENABLE_OPENSCAP: "y"
-    USER_WHITE_LIST: "n"
-    USER_ENABLE_SYSLOG: "y"
-    USER_ENABLE_AUTHD: "y"
-    USER_AUTO_START: "y"
-    USER_UPDATE: "n"
-  shell: "./install.sh"
-  when: wazuh_branch is defined
-
 - name: "Get manager package"
   ansible.builtin.get_url:
     url: "https://{{package_repository}}.wazuh.com/{{repository}}/apt/pool/main/w/wazuh-manager/wazuh-manager_{{package_version}}-{{package_revision}}_amd64.deb"
     dest: /tmp/wazuh-manager.deb
-  when: wazuh_branch is not defined
 
 - name: "Install manager package"
   ansible.builtin.apt:
     deb: /tmp/wazuh-manager.deb
-  when: wazuh_branch is not defined
 
 - name: Copy ossec.conf file
   copy:

tests/system/provisioning/basic_cluster/README.md

@@ -88,7 +88,7 @@ The base environment defined for Docker provisioning is
 For running the docker provisioning we must execute the following command:
 
 ```shell script
-ansible-playbook -i inventory.yml playbook.yml --extra-vars='{"wazuh_branch": "PUT YOUT wazuh/wazuh BRANCH HERE"}'
+ansible-playbook -i inventory.yml playbook.yml --extra-vars='{"package_repository":"packages", "repository": "4.x", "package_version": "4.4.0", "package_revision": "1", "wazuh_qa_branch":"v4.3.0-rc1"}'
 ```
 
 To destroy it, the command is:

tests/system/provisioning/basic_cluster/roles/agent-role/tasks/main.yml

@@ -22,43 +22,14 @@
     update_cache: yes
     cache_valid_time: 3600
 
-- name: "Clone wazuh repository"
-  git:
-    repo: "https://github.com/wazuh/wazuh"
-    dest: /wazuh
-    version: "{{ wazuh_branch }}"
-  when: wazuh_branch is defined
-
-- name: Install agent
-  args:
-    chdir: /wazuh
-    creates: /var/ossec
-  environment:
-    USER_LANGUAGE: "en"
-    USER_NO_STOP: "y"
-    USER_INSTALL_TYPE: "agent"
-    USER_DIR: "/var/ossec"
-    USER_ENABLE_EMAIL: "n"
-    USER_ENABLE_SYSCHECK: "y"
-    USER_ENABLE_ROOTCHECK: "y"
-    USER_ENABLE_OPENSCAP: "y"
-    USER_WHITE_LIST: "n"
-    USER_ENABLE_SYSLOG: "y"
-    USER_ENABLE_AUTHD: "y"
-    USER_AUTO_START: "y"
-  shell: "./install.sh"
-  when: wazuh_branch is defined
-
 - name: "Get agent package"
   ansible.builtin.get_url:
     url: "https://{{package_repository}}.wazuh.com/{{repository}}/apt/pool/main/w/wazuh-agent/wazuh-agent_{{package_version}}-{{package_revision}}_amd64.deb"
     dest: /tmp/wazuh-agent.deb
-  when: wazuh_branch is not defined
 
 - name: "Install agent package"
   ansible.builtin.apt:
     deb: /tmp/wazuh-agent.deb
-  when: wazuh_branch is not defined
 
 - name: Copy ossec.conf file
   copy:

tests/system/provisioning/basic_cluster/roles/master-role/tasks/main.yml

@@ -23,51 +23,21 @@
     update_cache: yes
     cache_valid_time: 3600
 
-- name: "Clone wazuh repository"
-  git:
-    repo: "https://github.com/wazuh/wazuh"
-    dest: /wazuh
-    version: "{{ wazuh_branch }}"
-  when: wazuh_branch is defined
-
 - name: "Clone wazuh-qa repository"
   git:
     repo: "https://github.com/wazuh/wazuh-qa"
     dest: /wazuh-qa
     version: "{{ wazuh_qa_branch }}"
     depth: '1'
 
-- name: Install master
-  args:
-    chdir: /wazuh
-    creates: /var/ossec
-  environment:
-    USER_LANGUAGE: "en"
-    USER_NO_STOP: "y"
-    USER_INSTALL_TYPE: "server"
-    USER_DIR: "/var/ossec"
-    USER_ENABLE_EMAIL: "n"
-    USER_ENABLE_SYSCHECK: "n"
-    USER_ENABLE_ROOTCHECK: "n"
-    USER_ENABLE_OPENSCAP: "n"
-    USER_WHITE_LIST: "n"
-    USER_ENABLE_SYSLOG: "y"
-    USER_ENABLE_AUTHD: "y"
-    USER_AUTO_START: "y"
-    USER_UPDATE: "n"
-  shell: "./install.sh"
-  when: wazuh_branch is defined
-
 - name: "Get manager package"
   ansible.builtin.get_url:
     url: "https://{{package_repository}}.wazuh.com/{{repository}}/apt/pool/main/w/wazuh-manager/wazuh-manager_{{package_version}}-{{package_revision}}_amd64.deb"
     dest: /tmp/wazuh-manager.deb
-  when: wazuh_branch is not defined
 
 - name: "Install manager package"
   ansible.builtin.apt:
     deb: /tmp/wazuh-manager.deb
-  when: wazuh_branch is not defined
 
 - name: Copy ossec.conf file
   copy:

tests/system/provisioning/basic_cluster/roles/worker-role/tasks/main.yml

@@ -23,51 +23,21 @@
     update_cache: yes
     cache_valid_time: 3600
 
-- name: "Clone wazuh repository"
-  git:
-    repo: "https://github.com/wazuh/wazuh"
-    dest: /wazuh
-    version: "{{ wazuh_branch }}"
-  when: wazuh_branch is defined
-
 - name: "Clone wazuh-qa repository"
   git:
     repo: "https://github.com/wazuh/wazuh-qa"
     dest: /wazuh-qa
     version: "{{ wazuh_qa_branch }}"
     depth: '1'
 
-- name: Install worker
-  args:
-    chdir: /wazuh
-    creates: /var/ossec
-  environment:
-    USER_LANGUAGE: "en"
-    USER_NO_STOP: "y"
-    USER_INSTALL_TYPE: "server"
-    USER_DIR: "/var/ossec"
-    USER_ENABLE_EMAIL: "n"
-    USER_ENABLE_SYSCHECK: "y"
-    USER_ENABLE_ROOTCHECK: "y"
-    USER_ENABLE_OPENSCAP: "y"
-    USER_WHITE_LIST: "n"
-    USER_ENABLE_SYSLOG: "y"
-    USER_ENABLE_AUTHD: "y"
-    USER_AUTO_START: "y"
-    USER_UPDATE: "n"
-  shell: "./install.sh"
-  when: wazuh_branch is defined
-
 - name: "Get manager package"
   ansible.builtin.get_url:
     url: "https://{{package_repository}}.wazuh.com/{{repository}}/apt/pool/main/w/wazuh-manager/wazuh-manager_{{package_version}}-{{package_revision}}_amd64.deb"
     dest: /tmp/wazuh-manager.deb
-  when: wazuh_branch is not defined
 
 - name: "Install manager package"
   ansible.builtin.apt:
     deb: /tmp/wazuh-manager.deb
-  when: wazuh_branch is not defined
 
 - name: Copy ossec.conf file
   copy:

tests/system/provisioning/basic_environment/README.md

@@ -77,7 +77,7 @@ The base environment defined for Docker provisioning is
 For running the docker provisioning we must execute the following command:
 
 ```shell script
-ansible-playbook -i inventory.yml playbook.yml --extra-vars='{"wazuh_branch": "PUT YOUT wazuh/wazuh BRANCH HERE"}'
+ansible-playbook -i inventory.yml playbook.yml --extra-vars='{"package_repository":"packages", "repository": "4.x", "package_version": "4.4.0", "package_revision": "1"}'
 ```
 
 To destroy it, the command is:

tests/system/provisioning/basic_environment/roles/agent-role/tasks/main.yml

@@ -22,43 +22,14 @@
     update_cache: yes
     cache_valid_time: 3600
 
-- name: "Clone wazuh repository"
-  git:
-    repo: "https://github.com/wazuh/wazuh"
-    dest: /wazuh
-    version: "{{ wazuh_branch }}"
-  when: wazuh_branch is defined
-
-- name: Install agent
-  args:
-    chdir: /wazuh
-    creates: /var/ossec
-  environment:
-    USER_LANGUAGE: "en"
-    USER_NO_STOP: "y"
-    USER_INSTALL_TYPE: "agent"
-    USER_DIR: "/var/ossec"
-    USER_ENABLE_EMAIL: "n"
-    USER_ENABLE_SYSCHECK: "y"
-    USER_ENABLE_ROOTCHECK: "y"
-    USER_ENABLE_OPENSCAP: "y"
-    USER_WHITE_LIST: "n"
-    USER_ENABLE_SYSLOG: "y"
-    USER_ENABLE_AUTHD: "y"
-    USER_AUTO_START: "y"
-  shell: "./install.sh"
-  when: wazuh_branch is defined
-
 - name: "Get agent package"
   ansible.builtin.get_url:
     url: "https://{{package_repository}}.wazuh.com/{{repository}}/apt/pool/main/w/wazuh-agent/wazuh-agent_{{package_version}}-{{package_revision}}_amd64.deb"
     dest: /tmp/wazuh-agent.deb
-  when: wazuh_branch is not defined
 
 - name: "Install agent package"
   ansible.builtin.apt:
     deb: /tmp/wazuh-agent.deb
-  when: wazuh_branch is not defined
 
 - name: Copy ossec.conf file
   copy: