From 20c2abceeafc6c79813a7610cf3214fe2a54d978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 12 May 2022 14:37:57 -0300 Subject: [PATCH 01/22] Dashboard dependencies added --- roles/wazuh/wazuh-dashboard/tasks/Debian.yml | 7 +++++++ roles/wazuh/wazuh-dashboard/tasks/RedHat.yml | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/roles/wazuh/wazuh-dashboard/tasks/Debian.yml b/roles/wazuh/wazuh-dashboard/tasks/Debian.yml index 7525a10c..e80b605f 100644 --- a/roles/wazuh/wazuh-dashboard/tasks/Debian.yml +++ b/roles/wazuh/wazuh-dashboard/tasks/Debian.yml @@ -13,6 +13,13 @@ state: present update_cache: yes + - name: Install Wazuh dashboard dependencies + apt: + name: [ + 'libnss3-dev', 'fonts-liberation', 'libfontconfig1' + ] + state: present + - name: Install Wazuh dashboard apt: name: "wazuh-dashboard={{ dashboard_version }}-*" diff --git a/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml b/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml index 39900d43..ac1cae5b 100644 --- a/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml +++ b/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml @@ -10,6 +10,14 @@ gpgkey: "{{ wazuh_repo.gpg }}" gpgcheck: true + - name: Install Dashboard dependencies + yum: + name: [ + 'libnss3.so', 'xorg-x11-fonts-100dpi', 'xorg-x11-fonts-75dpi', 'xorg-x11-utils', 'xorg-x11-fonts-cyrillic', 'xorg-x11-fonts-Type1', 'xorg-x11-fonts-misc', 'fontconfig', 'freetype' + ] + state: present + ignore_errors: yes + - name: Install Wazuh dashboard package: name: "wazuh-dashboard-{{ dashboard_version }}" From 7a7203f9d3e1bd8c30b9954141d19d5de68b3370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 12 May 2022 16:07:40 -0300 Subject: [PATCH 02/22] Task name changed --- roles/wazuh/wazuh-dashboard/tasks/RedHat.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml b/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml index ac1cae5b..7ba36704 100644 --- a/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml +++ b/roles/wazuh/wazuh-dashboard/tasks/RedHat.yml @@ -10,7 +10,7 @@ gpgkey: "{{ wazuh_repo.gpg }}" gpgcheck: true - - name: Install Dashboard dependencies + - name: Install Wazuh dashboard dependencies yum: name: [ 'libnss3.so', 'xorg-x11-fonts-100dpi', 'xorg-x11-fonts-75dpi', 'xorg-x11-utils', 'xorg-x11-fonts-cyrillic', 'xorg-x11-fonts-Type1', 'xorg-x11-fonts-misc', 'fontconfig', 'freetype' From 7ccba7b9e8bb33623c2d7c338c9c6cffa53832cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 2 Jun 2022 11:13:16 -0300 Subject: [PATCH 03/22] Revision updated --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2b2335f3..a9f44c43 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.3.3" -REVISION="40314" +REVISION="40315" From e9e56ff2488f51300b32d832b30bcb8ec9112257 Mon Sep 17 00:00:00 2001 From: Alberto R Date: Wed, 8 Jun 2022 10:26:39 +0200 Subject: [PATCH 04/22] Bumped version --- CHANGELOG.md | 6 ++++++ README.md | 1 + VERSION | 2 +- molecule/default/tests/test_default.py | 2 +- molecule/distributed-wazuh/group_vars/all.yml | 8 ++++---- molecule/distributed-wazuh/tests/test_default.py | 2 +- pyproject.toml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 6 +++--- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 4 ++-- roles/wazuh/vars/repo.yml | 2 +- roles/wazuh/vars/repo_dev.yml | 2 +- roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 14 files changed, 26 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4532ef74..1dc8cde4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.3.4] + +### Added + +- Update to [Wazuh v4.3.4](https://github.com/wazuh/wazuh/blob/v4.3.4/CHANGELOG.md#v434 +) ## [v4.3.3] ### Added diff --git a/README.md b/README.md index 9039cda1..60b1bca2 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.3.4 | | | | v4.3.3 | | | | v4.3.2 | | | | v4.3.1 | | | diff --git a/VERSION b/VERSION index a9f44c43..caaba12c 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.3.3" +WAZUH-ANSIBLE_VERSION="v4.3.4" REVISION="40315" diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index eea733e1..c7ab588e 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -8,7 +8,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.3.3" + return "4.3.4" diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index c40eaf61..0c53ee07 100644 --- a/molecule/distributed-wazuh/group_vars/all.yml +++ b/molecule/distributed-wazuh/group_vars/all.yml @@ -30,10 +30,10 @@ indexer_node_name: '{{ ansible_facts.hostname }}' dashboard_node_name: '{{ ansible_facts.hostname }}' filebeat_node_name: '{{ ansible_facts.hostname }}' -indexer_version: 4.3.3 +indexer_version: 4.3.4 filebeat_version: 7.10.2 -wazuh_version: 4.3.3 +wazuh_version: 4.3.4 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.3-1 -wazuh_agent_version: 4.3.3-1 +wazuh_manager_version: 4.3.4-1 +wazuh_agent_version: 4.3.4-1 diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py index f482bcaa..e6f1bc9e 100644 --- a/molecule/distributed-wazuh/tests/test_default.py +++ b/molecule/distributed-wazuh/tests/test_default.py @@ -8,7 +8,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.3.3" + return "4.3.4" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index b6ba1b26..68cdb587 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.3.3" +version = "4.3.4" description = "" authors = ["neonmei "] diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 2d5347f5..09864abb 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_agent_version: 4.3.3-1 +wazuh_agent_version: 4.3.4-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.3.3" + branch: "v4.3.4" user_language: "y" user_no_stop: "y" user_install_type: "agent" @@ -55,7 +55,7 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: 337ab33c31e3bc1d688cd903be3691fc -wazuh_winagent_package_name: wazuh-agent-4.3.3-1.msi +wazuh_winagent_package_name: wazuh-agent-4.3.4-1.msi wazuh_dir: "/var/ossec" diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 049eb9fc..e9bef23f 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_manager_version: 4.3.3-1 +wazuh_manager_version: 4.3.4-1 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present @@ -13,7 +13,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon # Sources installation wazuh_manager_sources_installation: enabled: false - branch: "v4.3.3" + branch: "v4.3.4" user_language: "en" user_no_stop: "y" user_install_type: "server" diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index b4db9ad9..7a1290f9 100644 --- a/roles/wazuh/vars/repo.yml +++ b/roles/wazuh/vars/repo.yml @@ -3,7 +3,7 @@ wazuh_repo: yum: 'https://packages.wazuh.com/4.x/yum/' 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-4.3.3-1.msi +wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.3.4-1.msi certs_gen_tool_version: 4.3 diff --git a/roles/wazuh/vars/repo_dev.yml b/roles/wazuh/vars/repo_dev.yml index d373ccc8..00580ac8 100644 --- a/roles/wazuh/vars/repo_dev.yml +++ b/roles/wazuh/vars/repo_dev.yml @@ -3,7 +3,7 @@ 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-4.3.3-1.msi +wazuh_winagent_config_url: https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-4.3.4-1.msi certs_gen_tool_version: 4.3 diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index 6e76ac30..601fbecd 100644 --- a/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -8,12 +8,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: 4.3.3 +wazuh_version: 4.3.4 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.3.3" +dashboard_version: "4.3.4" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 9eb6cba6..9d224c36 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,3 +1,3 @@ --- -dashboard_version: 4.3.3 \ No newline at end of file +dashboard_version: 4.3.4 \ No newline at end of file diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index 8e899a94..9755721f 100644 --- a/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -1,6 +1,6 @@ --- # Cluster Settings -indexer_version: 4.3.3 +indexer_version: 4.3.4 single_node: false indexer_node_name: node-1 From 86030edfecf0c658aae4ef6c8cc0719cdb774622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Wed, 8 Jun 2022 09:20:09 -0300 Subject: [PATCH 05/22] REVISION updated --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index caaba12c..de841430 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ WAZUH-ANSIBLE_VERSION="v4.3.4" -REVISION="40315" +REVISION="40316" From 64e9ac4f61bf34e86bef72687def0ec2aae48965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Wed, 8 Jun 2022 09:28:24 -0300 Subject: [PATCH 06/22] MD5 updated for Win agent package --- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 09864abb..b0f74a10 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -54,7 +54,7 @@ wazuh_winagent_config: # Adding quotes to auth_path_x86 since win_shell outputs error otherwise auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True - md5: 337ab33c31e3bc1d688cd903be3691fc + md5: 10dd8f5210e709c684a5e40ecb4ec159 wazuh_winagent_package_name: wazuh-agent-4.3.4-1.msi wazuh_dir: "/var/ossec" From 6f9c186e56b0a9223be64658d1c4f73d4cb31c7d Mon Sep 17 00:00:00 2001 From: Stephan Eicher Date: Thu, 9 Jun 2022 11:34:36 +0200 Subject: [PATCH 07/22] Fix to be able to set complex passwords with symbols too --- roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 | 2 +- roles/wazuh/wazuh-dashboard/tasks/main.yml | 2 +- roles/wazuh/wazuh-indexer/tasks/security_actions.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 b/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 index 558b5cf8..e5665b61 100644 --- a/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 +++ b/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 @@ -21,7 +21,7 @@ output.elasticsearch: {% if filebeat_security %} username: {{ indexer_security_user }} - password: {{ indexer_security_password }} + password: "{{ indexer_security_password }}" protocol: https ssl.certificate_authorities: - {{ filebeat_ssl_dir }}/root-ca.pem diff --git a/roles/wazuh/wazuh-dashboard/tasks/main.yml b/roles/wazuh/wazuh-dashboard/tasks/main.yml index ac451b3d..6e010d5c 100755 --- a/roles/wazuh/wazuh-dashboard/tasks/main.yml +++ b/roles/wazuh/wazuh-dashboard/tasks/main.yml @@ -83,7 +83,7 @@ - name: Configure opensearch.password in opensearch_dashboards.keystore shell: >- - echo {{ dashboard_password }} | /usr/share/wazuh-dashboard/bin/opensearch-dashboards-keystore --allow-root add -f --stdin opensearch.password + echo '{{ dashboard_password }}' | /usr/share/wazuh-dashboard/bin/opensearch-dashboards-keystore --allow-root add -f --stdin opensearch.password args: executable: /bin/bash become: yes diff --git a/roles/wazuh/wazuh-indexer/tasks/security_actions.yml b/roles/wazuh/wazuh-indexer/tasks/security_actions.yml index 3921db2d..2b481cc2 100644 --- a/roles/wazuh/wazuh-indexer/tasks/security_actions.yml +++ b/roles/wazuh/wazuh-indexer/tasks/security_actions.yml @@ -49,7 +49,7 @@ - name: Hashing the custom admin password shell: | export JAVA_HOME=/usr/share/wazuh-indexer/jdk - {{ indexer_sec_plugin_tools_path }}/hash.sh -p {{ indexer_admin_password }} + {{ indexer_sec_plugin_tools_path }}/hash.sh -p '{{ indexer_admin_password }}' register: indexer_admin_password_hashed no_log: '{{ indexer_nolog_sensible | bool }}' @@ -65,7 +65,7 @@ - name: Hash the kibanaserver role/user pasword shell: | export JAVA_HOME=/usr/share/wazuh-indexer/jdk - {{ indexer_sec_plugin_tools_path }}/hash.sh -p {{ dashboard_password }} + {{ indexer_sec_plugin_tools_path }}/hash.sh -p '{{ dashboard_password }}' register: indexer_kibanaserver_password_hashed no_log: '{{ indexer_nolog_sensible | bool }}' From 1ce75b807cee22532abc11dae34306d4a38d6643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 9 Jun 2022 14:35:02 -0300 Subject: [PATCH 08/22] Ignore time option removed from VD config --- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 1 - .../templates/var-ossec-etc-ossec-server.conf.j2 | 3 --- 2 files changed, 4 deletions(-) diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index e9bef23f..97edd6d0 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -174,7 +174,6 @@ wazuh_manager_sca: wazuh_manager_vulnerability_detector: enabled: 'no' interval: '5m' - ignore_time: '6h' run_on_start: 'yes' providers: - enabled: 'no' diff --git a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 index 7fafc465..cf87a44c 100644 --- a/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 +++ b/roles/wazuh/ansible-wazuh-manager/templates/var-ossec-etc-ossec-server.conf.j2 @@ -265,9 +265,6 @@ {% if wazuh_manager_config.vulnerability_detector.interval is defined %} {{ wazuh_manager_config.vulnerability_detector.interval }} {% endif %} - {% if wazuh_manager_config.vulnerability_detector.ignore_time is defined %} - {{ wazuh_manager_config.vulnerability_detector.ignore_time }} - {% endif %} {% if wazuh_manager_config.vulnerability_detector.run_on_start is defined %} {{ wazuh_manager_config.vulnerability_detector.run_on_start }} {% endif %} From 25e68f53d81c49f8c1d5d44e6710f11fb6211c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 23 Jun 2022 15:13:52 -0300 Subject: [PATCH 09/22] Bump to 4.3.5 --- CHANGELOG.md | 10 ++++++++-- README.md | 1 + VERSION | 4 ++-- molecule/distributed-wazuh/group_vars/all.yml | 8 ++++---- molecule/distributed-wazuh/tests/test_default.py | 2 +- pyproject.toml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 6 +++--- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 4 ++-- roles/wazuh/vars/repo.yml | 2 +- roles/wazuh/vars/repo_dev.yml | 2 +- roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 13 files changed, 28 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dc8cde4..4c32b385 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,18 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.3.5] + +### Added + +- Update to [Wazuh v4.3.5](https://github.com/wazuh/wazuh/blob/v4.3.5/CHANGELOG.md#v435) + ## [v4.3.4] ### Added -- Update to [Wazuh v4.3.4](https://github.com/wazuh/wazuh/blob/v4.3.4/CHANGELOG.md#v434 -) +- Update to [Wazuh v4.3.4](https://github.com/wazuh/wazuh/blob/v4.3.4/CHANGELOG.md#v434) + ## [v4.3.3] ### Added diff --git a/README.md b/README.md index 60b1bca2..d20088de 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.3.5 | | | | v4.3.4 | | | | v4.3.3 | | | | v4.3.2 | | | diff --git a/VERSION b/VERSION index de841430..32896bc8 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.3.4" -REVISION="40316" +WAZUH-ANSIBLE_VERSION="v4.3.5" +REVISION="40317" diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index 0c53ee07..682e6516 100644 --- a/molecule/distributed-wazuh/group_vars/all.yml +++ b/molecule/distributed-wazuh/group_vars/all.yml @@ -30,10 +30,10 @@ indexer_node_name: '{{ ansible_facts.hostname }}' dashboard_node_name: '{{ ansible_facts.hostname }}' filebeat_node_name: '{{ ansible_facts.hostname }}' -indexer_version: 4.3.4 +indexer_version: 4.3.5 filebeat_version: 7.10.2 -wazuh_version: 4.3.4 +wazuh_version: 4.3.5 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.4-1 -wazuh_agent_version: 4.3.4-1 +wazuh_manager_version: 4.3.5-1 +wazuh_agent_version: 4.3.5-1 diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py index e6f1bc9e..bdc74db2 100644 --- a/molecule/distributed-wazuh/tests/test_default.py +++ b/molecule/distributed-wazuh/tests/test_default.py @@ -8,7 +8,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.3.4" + return "4.3.5" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index 68cdb587..26a91f07 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.3.4" +version = "4.3.5" description = "" authors = ["neonmei "] diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index b0f74a10..8cb950ae 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_agent_version: 4.3.4-1 +wazuh_agent_version: 4.3.5-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.3.4" + branch: "v4.3.5" user_language: "y" user_no_stop: "y" user_install_type: "agent" @@ -55,7 +55,7 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: 10dd8f5210e709c684a5e40ecb4ec159 -wazuh_winagent_package_name: wazuh-agent-4.3.4-1.msi +wazuh_winagent_package_name: wazuh-agent-4.3.5-1.msi wazuh_dir: "/var/ossec" diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 97edd6d0..54002f06 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_manager_version: 4.3.4-1 +wazuh_manager_version: 4.3.5-1 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present @@ -13,7 +13,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon # Sources installation wazuh_manager_sources_installation: enabled: false - branch: "v4.3.4" + branch: "v4.3.5" user_language: "en" user_no_stop: "y" user_install_type: "server" diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index 7a1290f9..50d7ab3c 100644 --- a/roles/wazuh/vars/repo.yml +++ b/roles/wazuh/vars/repo.yml @@ -3,7 +3,7 @@ wazuh_repo: yum: 'https://packages.wazuh.com/4.x/yum/' 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-4.3.4-1.msi +wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.3.5-1.msi certs_gen_tool_version: 4.3 diff --git a/roles/wazuh/vars/repo_dev.yml b/roles/wazuh/vars/repo_dev.yml index 00580ac8..76e8c0c4 100644 --- a/roles/wazuh/vars/repo_dev.yml +++ b/roles/wazuh/vars/repo_dev.yml @@ -3,7 +3,7 @@ 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-4.3.4-1.msi +wazuh_winagent_config_url: https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-4.3.5-1.msi certs_gen_tool_version: 4.3 diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index 601fbecd..0ec15cbe 100644 --- a/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -8,12 +8,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: 4.3.4 +wazuh_version: 4.3.5 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.3.4" +dashboard_version: "4.3.5" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 9d224c36..26c7afb6 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,3 +1,3 @@ --- -dashboard_version: 4.3.4 \ No newline at end of file +dashboard_version: 4.3.5 \ No newline at end of file diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index 9755721f..40175ed5 100644 --- a/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -1,6 +1,6 @@ --- # Cluster Settings -indexer_version: 4.3.4 +indexer_version: 4.3.5 single_node: false indexer_node_name: node-1 From e26945bc11058ea3bc5bd461c6543e9495dccf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 24 Jun 2022 10:07:40 -0300 Subject: [PATCH 10/22] Wazuh agent and manager version updated --- molecule/distributed-wazuh/group_vars/all.yml | 4 ++-- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml | 2 +- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index 682e6516..35d570fe 100644 --- a/molecule/distributed-wazuh/group_vars/all.yml +++ b/molecule/distributed-wazuh/group_vars/all.yml @@ -35,5 +35,5 @@ filebeat_version: 7.10.2 wazuh_version: 4.3.5 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.5-1 -wazuh_agent_version: 4.3.5-1 +wazuh_manager_version: 4.3.5 +wazuh_agent_version: 4.3.5 diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 8cb950ae..ed631724 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_agent_version: 4.3.5-1 +wazuh_agent_version: 4.3.5 # Custom packages installation diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml index ad381eac..1348f3e1 100644 --- a/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml +++ b/roles/wazuh/ansible-wazuh-agent/tasks/Linux.yml @@ -27,7 +27,7 @@ - name: Linux Debian | Install wazuh-agent apt: - name: "wazuh-agent={{ wazuh_agent_version }}" + name: "wazuh-agent={{ wazuh_agent_version }}-*" state: present cache_valid_time: 3600 when: diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 54002f06..9d221417 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_manager_version: 4.3.5-1 +wazuh_manager_version: 4.3.5 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml index ee903eb9..1079f8d2 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml @@ -107,7 +107,7 @@ - name: Debian/Ubuntu | Install wazuh-manager apt: name: - - "wazuh-manager={{ wazuh_manager_version }}" + - "wazuh-manager={{ wazuh_manager_version }}-*" state: present tags: init when: From a27dfa157f7f45c334bcf67ce16c3f1eade89cbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Tue, 28 Jun 2022 10:20:37 -0300 Subject: [PATCH 11/22] Win agent variables updated --- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 2 +- roles/wazuh/vars/repo.yml | 2 +- roles/wazuh/vars/repo_dev.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index ed631724..69bfb9c1 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -55,7 +55,7 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: 10dd8f5210e709c684a5e40ecb4ec159 -wazuh_winagent_package_name: wazuh-agent-4.3.5-1.msi +wazuh_winagent_package_name: wazuh-agent-{{ wazuh_agent_version }}-1.msi wazuh_dir: "/var/ossec" diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index 50d7ab3c..c3f0d5b7 100644 --- a/roles/wazuh/vars/repo.yml +++ b/roles/wazuh/vars/repo.yml @@ -3,7 +3,7 @@ wazuh_repo: yum: 'https://packages.wazuh.com/4.x/yum/' 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-4.3.5-1.msi +wazuh_winagent_config_url: "https://packages.wazuh.com/4.x/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi" certs_gen_tool_version: 4.3 diff --git a/roles/wazuh/vars/repo_dev.yml b/roles/wazuh/vars/repo_dev.yml index 76e8c0c4..e150b87a 100644 --- a/roles/wazuh/vars/repo_dev.yml +++ b/roles/wazuh/vars/repo_dev.yml @@ -3,7 +3,7 @@ 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-4.3.5-1.msi +wazuh_winagent_config_url: https://packages-dev.wazuh.com/pre-release/windows/wazuh-agent-{{ wazuh_agent_version }}-1.msi certs_gen_tool_version: 4.3 From 80e7dfca649fd068db1e56d0db4ca1e0f942f06c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Tue, 28 Jun 2022 13:48:47 -0300 Subject: [PATCH 12/22] Win package name var update --- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 1 - roles/wazuh/vars/repo.yml | 1 + roles/wazuh/vars/repo_dev.yml | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 69bfb9c1..088c2855 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -55,7 +55,6 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: 10dd8f5210e709c684a5e40ecb4ec159 -wazuh_winagent_package_name: wazuh-agent-{{ wazuh_agent_version }}-1.msi wazuh_dir: "/var/ossec" diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index c3f0d5b7..ae6ea0a6 100644 --- a/roles/wazuh/vars/repo.yml +++ b/roles/wazuh/vars/repo.yml @@ -4,6 +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 certs_gen_tool_version: 4.3 diff --git a/roles/wazuh/vars/repo_dev.yml b/roles/wazuh/vars/repo_dev.yml index e150b87a..ca9feec0 100644 --- a/roles/wazuh/vars/repo_dev.yml +++ b/roles/wazuh/vars/repo_dev.yml @@ -4,6 +4,7 @@ wazuh_repo: 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 certs_gen_tool_version: 4.3 From 1e032c9ebb120f7520483af55d7a1dfb3b7a98db Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Mon, 4 Jul 2022 11:38:05 -0300 Subject: [PATCH 13/22] disable filebeat metrics --- roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 b/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 index e5665b61..fe457a59 100644 --- a/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 +++ b/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 @@ -30,4 +30,6 @@ output.elasticsearch: {% endif %} # Optional. Send events to Logstash instead of Wazuh indexer -#output.logstash.hosts: ["YOUR_LOGSTASH_SERVER_IP:5000"] \ No newline at end of file +#output.logstash.hosts: ["YOUR_LOGSTASH_SERVER_IP:5000"] + +logging.metrics.enabled: false From 7ddb4b552cbfd6fb3e0dcc937d29f9d4b888219c Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 4 Jul 2022 11:57:55 -0300 Subject: [PATCH 14/22] change cookiecutter version --- poetry.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index 403a69df..3cbf642f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -212,7 +212,7 @@ test = ["flake8 (==3.7.8)", "hypothesis (==3.55.3)"] [[package]] name = "cookiecutter" -version = "1.7.3" +version = "2.1.1" description = "A command-line utility that creates projects from project templates, e.g. creating a Python package project from a Python package project template." category = "dev" optional = false From e97bd370ca0d07c61f904e9f2fba042e1501e4d2 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 4 Jul 2022 12:13:35 -0300 Subject: [PATCH 15/22] change cookiecutter version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 26a91f07..7eabe948 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,5 +24,5 @@ molecule = {extras = ["docker"], version = "==3.3.4"} testinfra = "^6.0.0" [build-system] -requires = ["poetry>=0.12"] +requires = ["poetry>=1.1"] build-backend = "poetry.masonry.api" From 121fe19c1215aa87fef94151157ad91021328943 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 4 Jul 2022 15:09:25 -0300 Subject: [PATCH 16/22] change cookiecutter version --- poetry.lock | 6 +++--- pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/poetry.lock b/poetry.lock index 3cbf642f..88b2b4c5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -395,7 +395,7 @@ ansible-lint = ">=5.0.12" cerberus = ">=1.3.1,<1.3.3 || >1.3.3,<1.3.4 || >1.3.4" click = ">=8.0,<9" click-help-colors = ">=0.9" -cookiecutter = ">=1.7.3" +cookiecutter = ">=2.1.1" dataclasses = {version = "*", markers = "python_version < \"3.7\""} enrich = ">=1.2.5" Jinja2 = ">=2.10.1" @@ -973,8 +973,8 @@ commonmark = [ {file = "commonmark-0.9.1.tar.gz", hash = "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60"}, ] cookiecutter = [ - {file = "cookiecutter-1.7.3-py2.py3-none-any.whl", hash = "sha256:f8671531fa96ab14339d0c59b4f662a4f12a2ecacd94a0f70a3500843da588e2"}, - {file = "cookiecutter-1.7.3.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"}, + {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:f8671531fa96ab14339d0c59b4f662a4f12a2ecacd94a0f70a3500843da588e2"}, + {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"}, ] cryptography = [ {file = "cryptography-3.2.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7"}, diff --git a/pyproject.toml b/pyproject.toml index 7eabe948..e524abad 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,5 +24,5 @@ molecule = {extras = ["docker"], version = "==3.3.4"} testinfra = "^6.0.0" [build-system] -requires = ["poetry>=1.1"] +requires = ["poetry>=1.1.8"] build-backend = "poetry.masonry.api" From 7bfc2012bc66ac10237776d2a48b3216104cff24 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Mon, 4 Jul 2022 15:10:43 -0300 Subject: [PATCH 17/22] change cookiecutter version --- poetry.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index 88b2b4c5..b9b97d38 100644 --- a/poetry.lock +++ b/poetry.lock @@ -974,7 +974,7 @@ commonmark = [ ] cookiecutter = [ {file = "cookiecutter-2.1.1-py2.py3-none-any.whl", hash = "sha256:f8671531fa96ab14339d0c59b4f662a4f12a2ecacd94a0f70a3500843da588e2"}, - {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:6b9a4d72882e243be077a7397d0f1f76fe66cf3df91f3115dbb5330e214fa457"}, + {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"}, ] cryptography = [ {file = "cryptography-3.2.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7"}, From 8952c81610d8085525189656ca3eacad88a0eecb Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 6 Jul 2022 17:40:25 -0300 Subject: [PATCH 18/22] Add fix to avoid GLIBC crash --- roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 b/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 index fe457a59..1020393b 100644 --- a/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 +++ b/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 @@ -33,3 +33,10 @@ output.elasticsearch: #output.logstash.hosts: ["YOUR_LOGSTASH_SERVER_IP:5000"] logging.metrics.enabled: false + +seccomp: +default_action: allow +syscalls: +- action: allow + names: + - rseq From b3d6cdff57fc5aed678ef0e9cad37e3d3050bf9f Mon Sep 17 00:00:00 2001 From: fcaffieri Date: Wed, 6 Jul 2022 18:03:49 -0300 Subject: [PATCH 19/22] Add fix to avoid GLIBC crash, fix identation --- .../ansible-filebeat-oss/templates/filebeat.yml.j2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 b/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 index 1020393b..aeeab17d 100644 --- a/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 +++ b/roles/wazuh/ansible-filebeat-oss/templates/filebeat.yml.j2 @@ -35,8 +35,8 @@ output.elasticsearch: logging.metrics.enabled: false seccomp: -default_action: allow -syscalls: -- action: allow - names: - - rseq + default_action: allow + syscalls: + - action: allow + names: + - rseq From dcdcb4d8b46e1d98d60df05b353cb50a8c631717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Mon, 18 Jul 2022 10:04:58 -0300 Subject: [PATCH 20/22] Bump to 4.3.6 --- CHANGELOG.md | 6 ++++++ README.md | 1 + VERSION | 4 ++-- molecule/distributed-wazuh/group_vars/all.yml | 8 ++++---- molecule/distributed-wazuh/tests/test_default.py | 2 +- pyproject.toml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 6 +++--- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/defaults/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/vars/debian.yml | 2 +- roles/wazuh/wazuh-indexer/defaults/main.yml | 2 +- 11 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c32b385..ecf41a62 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. +## [v4.3.6] + +### Added + +- Update to [Wazuh v4.3.6](https://github.com/wazuh/wazuh/blob/v4.3.6/CHANGELOG.md#v436) + ## [v4.3.5] ### Added diff --git a/README.md b/README.md index d20088de..2c2dbad5 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.3.6 | | | | v4.3.5 | | | | v4.3.4 | | | | v4.3.3 | | | diff --git a/VERSION b/VERSION index 32896bc8..d91ea838 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.3.5" -REVISION="40317" +WAZUH-ANSIBLE_VERSION="v4.3.6" +REVISION="40318" diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index 35d570fe..f90b467d 100644 --- a/molecule/distributed-wazuh/group_vars/all.yml +++ b/molecule/distributed-wazuh/group_vars/all.yml @@ -30,10 +30,10 @@ indexer_node_name: '{{ ansible_facts.hostname }}' dashboard_node_name: '{{ ansible_facts.hostname }}' filebeat_node_name: '{{ ansible_facts.hostname }}' -indexer_version: 4.3.5 +indexer_version: 4.3.6 filebeat_version: 7.10.2 -wazuh_version: 4.3.5 +wazuh_version: 4.3.6 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.5 -wazuh_agent_version: 4.3.5 +wazuh_manager_version: 4.3.6 +wazuh_agent_version: 4.3.6 diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py index bdc74db2..d796a0a3 100644 --- a/molecule/distributed-wazuh/tests/test_default.py +++ b/molecule/distributed-wazuh/tests/test_default.py @@ -8,7 +8,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.3.5" + return "4.3.6" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index e524abad..a0a6b319 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.3.5" +version = "4.3.6" description = "" authors = ["neonmei "] diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 088c2855..48a30ba1 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_agent_version: 4.3.5 +wazuh_agent_version: 4.3.6 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.3.5" + branch: "v4.3.6" user_language: "y" user_no_stop: "y" user_install_type: "agent" @@ -54,7 +54,7 @@ wazuh_winagent_config: # Adding quotes to auth_path_x86 since win_shell outputs error otherwise auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True - md5: 10dd8f5210e709c684a5e40ecb4ec159 + md5: cf18c7a255dc076c5a7f78490f9c4628 wazuh_dir: "/var/ossec" diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 9d221417..536ab7f5 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,6 +1,6 @@ --- -wazuh_manager_version: 4.3.5 +wazuh_manager_version: 4.3.6 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present @@ -13,7 +13,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon # Sources installation wazuh_manager_sources_installation: enabled: false - branch: "v4.3.5" + branch: "v4.3.6" user_language: "en" user_no_stop: "y" user_install_type: "server" diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index 0ec15cbe..c90e8083 100644 --- a/roles/wazuh/wazuh-dashboard/defaults/main.yml +++ b/roles/wazuh/wazuh-dashboard/defaults/main.yml @@ -8,12 +8,12 @@ dashboard_node_name: node-1 dashboard_server_host: "0.0.0.0" dashboard_server_port: "443" dashboard_server_name: "dashboard" -wazuh_version: 4.3.5 +wazuh_version: 4.3.6 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.3.5" +dashboard_version: "4.3.6" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 26c7afb6..91466899 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,3 +1,3 @@ --- -dashboard_version: 4.3.5 \ No newline at end of file +dashboard_version: 4.3.6 \ No newline at end of file diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index 40175ed5..4770b1cc 100644 --- a/roles/wazuh/wazuh-indexer/defaults/main.yml +++ b/roles/wazuh/wazuh-indexer/defaults/main.yml @@ -1,6 +1,6 @@ --- # Cluster Settings -indexer_version: 4.3.5 +indexer_version: 4.3.6 single_node: false indexer_node_name: node-1 From 3c4ba0ef613bf3ed61e347aa343b52265f6ac5c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 22 Jul 2022 12:11:05 -0300 Subject: [PATCH 21/22] Wazuh version 4.3.6 bump --- molecule/default/tests/test_default.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index c7ab588e..26d8c728 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -8,7 +8,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( def get_wazuh_version(): """This return the version of Wazuh.""" - return "4.3.4" + return "4.3.6" From 794222dc821ae58c2a37aba5d3c904616a4fd5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Mon, 25 Jul 2022 08:07:06 -0300 Subject: [PATCH 22/22] Conflicts 4.3.6 --- roles/wazuh/wazuh-dashboard/vars/debian.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index de72d4ec..92f47d64 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,7 +1,3 @@ --- -<<<<<<< HEAD -dashboard_version: 4.3.6 -======= dashboard_version: 4.5.0 ->>>>>>> master