diff --git a/CHANGELOG.md b/CHANGELOG.md old mode 100755 new mode 100644 index a88f30e2..0ab311dc --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,24 @@ All notable changes to this project will be documented in this file. - Update to [Wazuh v4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440) +## [v4.3.9] + +### Added + +- Update to [Wazuh v4.3.9](https://github.com/wazuh/wazuh/blob/v4.3.9/CHANGELOG.md#v439) + +## [v4.3.8] + +### Added + +- Update to [Wazuh v4.3.8](https://github.com/wazuh/wazuh/blob/v4.3.8/CHANGELOG.md#v438) + +## [v4.3.7] + +### Added + +- Update to [Wazuh v4.3.7](https://github.com/wazuh/wazuh/blob/v4.3.7/CHANGELOG.md#v437) + ## [v4.3.6] ### Added diff --git a/README.md b/README.md index 9298ff12..4bb87955 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,9 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb |---------------|---------|--------| | v4.5.0 | | | | v4.4.0 | | | +| v4.3.9 | | | +| v4.3.8 | | | +| v4.3.7 | | | | v4.3.6 | | | | v4.3.5 | | | | v4.3.4 | | | diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index f0c35076..3368c15f 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -11,7 +11,6 @@ def get_wazuh_version(): return "4.5.0" - def test_wazuh_packages_are_installed(host): """Test the main packages are installed.""" manager = host.package("wazuh-manager") diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 401b1c43..c879b3f0 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -54,7 +54,6 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: 8ffa75d13280f1aa6ffca54f4273df4d -wazuh_winagent_package_name: wazuh-agent-4.5.0-1.msi wazuh_dir: "/var/ossec" diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/main.yml b/roles/wazuh/ansible-wazuh-agent/tasks/main.yml index 10f3ab51..f84d3748 100644 --- a/roles/wazuh/ansible-wazuh-agent/tasks/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/tasks/main.yml @@ -7,10 +7,10 @@ delegate_to: localhost - include_vars: ../../vars/repo.yml - when: "{{ wazuh_latest_release.stdout is version(wazuh_agent_version, operator='ge') }}" + when: "wazuh_latest_release.stdout is version(wazuh_agent_version, operator='ge')" - include_vars: ../../vars/repo_dev.yml - when: "{{ wazuh_latest_release.stdout is version(wazuh_agent_version, operator='lt') }}" + when: "wazuh_latest_release.stdout is version(wazuh_agent_version, operator='lt')" - name: Overlay wazuh_agent_config on top of defaults set_fact: diff --git a/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2 b/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2 index 4a9c8b72..8eef3d1d 100644 --- a/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2 +++ b/roles/wazuh/ansible-wazuh-agent/templates/var-ossec-etc-ossec-agent.conf.j2 @@ -260,7 +260,7 @@ {% endif %} - {% if wazuh_agent_config.syscheck.win_directories is defined and ansible_system == "Windows" %} + {% if wazuh_agent_config.syscheck.win_directories is defined and ansible_os_family == "Windows" %} {% for directory in wazuh_agent_config.syscheck.win_directories %} {{ directory.dirs }} {% endfor %} @@ -280,7 +280,7 @@ {% endfor %} {% endif %} - {% if wazuh_agent_config.syscheck.ignore is defined and ansible_system == "Windows" %} + {% if wazuh_agent_config.syscheck.ignore is defined and ansible_os_family == "Windows" %} {% for ignore in wazuh_agent_config.syscheck.ignore_win %} {{ ignore }} {% endfor %} diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml index b3af417a..e27784ca 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml @@ -14,10 +14,10 @@ register: wazuh_latest_release - include_vars: ../../vars/repo.yml - when: "{{ wazuh_latest_release.stdout is version(wazuh_manager_version, operator='ge') }}" + when: "wazuh_latest_release.stdout is version(wazuh_manager_version, operator='ge')" - include_vars: ../../vars/repo_dev.yml - when: "{{ wazuh_latest_release.stdout is version(wazuh_manager_version, operator='lt') }}" + when: "wazuh_latest_release.stdout is version(wazuh_manager_version, operator='lt')" - name: Overlay wazuh_manager_config on top of defaults set_fact: diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index f97becfe..2dd92669 100644 --- a/roles/wazuh/vars/repo.yml +++ b/roles/wazuh/vars/repo.yml @@ -4,7 +4,7 @@ wazuh_repo: gpg: 'https://packages.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' wazuh_winagent_config_url: "https://packages.wazuh.com/4.x/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi" -wazuh_winagent_package_name: wazuh-agent-{{ wazuh_agent_version }}-1.msi +wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi" certs_gen_tool_version: 4.5 diff --git a/roles/wazuh/vars/repo_dev.yml b/roles/wazuh/vars/repo_dev.yml index c878d755..3eaf6ca1 100644 --- a/roles/wazuh/vars/repo_dev.yml +++ b/roles/wazuh/vars/repo_dev.yml @@ -3,8 +3,8 @@ wazuh_repo: yum: 'https://packages-dev.wazuh.com/pre-release/yum/' gpg: 'https://packages-dev.wazuh.com/key/GPG-KEY-WAZUH' key_id: '0DCFCA5547B19D2A6099506096B3EE5F29111145' -wazuh_winagent_config_url: https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi -wazuh_winagent_package_name: wazuh-agent-{{ wazuh_agent_version }}-1.msi +wazuh_winagent_config_url: "https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi" +wazuh_winagent_package_name: "wazuh-agent-{{ wazuh_agent_version }}-1.msi" certs_gen_tool_version: 4.5 diff --git a/roles/wazuh/wazuh-dashboard/tasks/main.yml b/roles/wazuh/wazuh-dashboard/tasks/main.yml index 6e010d5c..44bcaa1c 100755 --- a/roles/wazuh/wazuh-dashboard/tasks/main.yml +++ b/roles/wazuh/wazuh-dashboard/tasks/main.yml @@ -4,10 +4,10 @@ register: wazuh_latest_release - include_vars: ../../vars/repo.yml - when: "{{ wazuh_latest_release.stdout is version(dashboard_version, operator='ge') }}" + when: "wazuh_latest_release.stdout is version(dashboard_version, operator='ge')" - include_vars: ../../vars/repo_dev.yml - when: "{{ wazuh_latest_release.stdout is version(dashboard_version, operator='lt') }}" + when: "wazuh_latest_release.stdout is version(dashboard_version, operator='lt')" - import_tasks: RedHat.yml when: ansible_os_family == 'RedHat' diff --git a/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 b/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 index 879356ca..030c7506 100644 --- a/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 +++ b/roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 @@ -130,5 +130,5 @@ hosts: url: {{ api['url'] }} port: {{ api['port'] }} username: {{ api['username'] }} - password: {{ api['password'] }} + password: "{{ api['password'] }}" {% endfor %} diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 92f47d64..050a395b 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,3 +1,2 @@ --- - dashboard_version: 4.5.0 diff --git a/roles/wazuh/wazuh-indexer/tasks/main.yml b/roles/wazuh/wazuh-indexer/tasks/main.yml index 0e18d05f..f3afe7f8 100644 --- a/roles/wazuh/wazuh-indexer/tasks/main.yml +++ b/roles/wazuh/wazuh-indexer/tasks/main.yml @@ -4,10 +4,10 @@ register: wazuh_latest_release - include_vars: ../../vars/repo.yml - when: "{{ wazuh_latest_release.stdout is version(indexer_version, operator='ge') }}" + when: "wazuh_latest_release.stdout is version(indexer_version, operator='ge')" - include_vars: ../../vars/repo_dev.yml - when: "{{ wazuh_latest_release.stdout is version(indexer_version, operator='lt') }}" + when: "wazuh_latest_release.stdout is version(indexer_version, operator='lt')" - import_tasks: local_actions.yml when: