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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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/28] 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 46000c0a4d96ba34cac4cafffdafbd678d2db795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 29 Jul 2022 07:59:38 -0300 Subject: [PATCH 22/28] Quotes added to repo vars files --- roles/wazuh/vars/repo.yml | 2 +- roles/wazuh/vars/repo_dev.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/wazuh/vars/repo.yml b/roles/wazuh/vars/repo.yml index ae6ea0a6..2ec55ff1 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.3 diff --git a/roles/wazuh/vars/repo_dev.yml b/roles/wazuh/vars/repo_dev.yml index ca9feec0..6dd08dc6 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.3 From 0430b443cc0cb8c4094824648bb75b517e4ad977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 29 Jul 2022 08:21:13 -0300 Subject: [PATCH 23/28] Braces removed from include vars condition --- roles/wazuh/ansible-wazuh-agent/tasks/main.yml | 4 ++-- roles/wazuh/ansible-wazuh-manager/tasks/main.yml | 4 ++-- roles/wazuh/wazuh-dashboard/tasks/main.yml | 4 ++-- roles/wazuh/wazuh-indexer/tasks/main.yml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) 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-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/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-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: From d0327844bc1c604e711439989d98b581a7453966 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Fri, 12 Aug 2022 12:51:13 -0300 Subject: [PATCH 24/28] Bump to 4.3.7 --- CHANGELOG.md | 6 ++++++ README.md | 1 + VERSION | 4 ++-- 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 | 4 ++-- 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 +- 12 files changed, 24 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf41a62..282e3ff5 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.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 2c2dbad5..bdf5a837 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.7 | | | | v4.3.6 | | | | v4.3.5 | | | | v4.3.4 | | | diff --git a/VERSION b/VERSION index d91ea838..99e6531b 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.3.6" -REVISION="40318" +WAZUH-ANSIBLE_VERSION="v4.3.7" +REVISION="40319" diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 26d8c728..2296fd34 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.6" + return "4.3.7" diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index f90b467d..fa07b228 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.6 +indexer_version: 4.3.7 filebeat_version: 7.10.2 -wazuh_version: 4.3.6 +wazuh_version: 4.3.7 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.6 -wazuh_agent_version: 4.3.6 +wazuh_manager_version: 4.3.7 +wazuh_agent_version: 4.3.7 diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py index d796a0a3..5891c86b 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.6" + return "4.3.7" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index a0a6b319..08af24c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.3.6" +version = "4.3.7" description = "" authors = ["neonmei "] diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 48a30ba1..4191122e 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.6 +wazuh_agent_version: 4.3.7 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.3.6" + branch: "v4.3.7" user_language: "y" user_no_stop: "y" user_install_type: "agent" diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 536ab7f5..ea9d3067 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.6 +wazuh_manager_version: 4.3.7 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.6" + branch: "v4.3.7" 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 c90e8083..666d0146 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.6 +wazuh_version: 4.3.7 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.3.6" +dashboard_version: "4.3.7" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 91466899..855788a9 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.6 \ No newline at end of file +dashboard_version: 4.3.7 \ 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 4770b1cc..63e36e59 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.6 +indexer_version: 4.3.7 single_node: false indexer_node_name: node-1 From e7c104b2569ee5baba3dbe2b6d879a5ac5a3e94e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Wed, 24 Aug 2022 10:26:12 -0300 Subject: [PATCH 25/28] Win agent md5sum updated --- 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 4191122e..e5a613a1 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: cf18c7a255dc076c5a7f78490f9c4628 + md5: d7c1d0fecff396094dd1d3b54e6c4d2b wazuh_dir: "/var/ossec" From d4a1493cddaa27ab73ef0b9cdfaa2b603e173188 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 8 Sep 2022 15:45:11 -0300 Subject: [PATCH 26/28] add Double quote in wazuh.yml --- roles/wazuh/wazuh-dashboard/templates/wazuh.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 %} From e354d33ce9cc9aed48c1a669cc32a44c8388b938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Mon, 12 Sep 2022 09:43:58 -0300 Subject: [PATCH 27/28] Bump to 4.3.8 --- CHANGELOG.md | 6 ++++++ VERSION | 4 ++-- 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 | 4 ++-- 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, 23 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 282e3ff5..03cda9e7 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.8] + +### Added + +- Update to [Wazuh v4.3.8](https://github.com/wazuh/wazuh/blob/v4.3.8/CHANGELOG.md#v438) + ## [v4.3.7] ### Added diff --git a/VERSION b/VERSION index 99e6531b..8ff6c514 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.3.7" -REVISION="40319" +WAZUH-ANSIBLE_VERSION="v4.3.8" +REVISION="40321" diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 2296fd34..47b73fee 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.7" + return "4.3.8" diff --git a/molecule/distributed-wazuh/group_vars/all.yml b/molecule/distributed-wazuh/group_vars/all.yml index fa07b228..29dfc36f 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.7 +indexer_version: 4.3.8 filebeat_version: 7.10.2 -wazuh_version: 4.3.7 +wazuh_version: 4.3.8 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.3.7 -wazuh_agent_version: 4.3.7 +wazuh_manager_version: 4.3.8 +wazuh_agent_version: 4.3.8 diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py index 5891c86b..ef1b6c14 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.7" + return "4.3.8" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index 08af24c9..f6e2278d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.3.7" +version = "4.3.8" description = "" authors = ["neonmei "] diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index e5a613a1..fd758977 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.7 +wazuh_agent_version: 4.3.8 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.3.7" + branch: "v4.3.8" user_language: "y" user_no_stop: "y" user_install_type: "agent" diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index ea9d3067..b9e93fb4 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.7 +wazuh_manager_version: 4.3.8 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.7" + branch: "v4.3.8" 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 666d0146..41c9aae0 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.7 +wazuh_version: 4.3.8 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.3.7" +dashboard_version: "4.3.8" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index 855788a9..28aa8773 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.7 \ No newline at end of file +dashboard_version: 4.3.8 \ 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 63e36e59..dbcaf2df 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.7 +indexer_version: 4.3.8 single_node: false indexer_node_name: node-1 From d004da421c9da32a3f7aa1996adb32d264f586e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= Date: Thu, 15 Sep 2022 14:51:20 -0300 Subject: [PATCH 28/28] Poetry lock updated --- poetry.lock | 179 +++++++++++++--------------------------------------- 1 file changed, 44 insertions(+), 135 deletions(-) diff --git a/poetry.lock b/poetry.lock index f477391c..f91817c3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -49,8 +49,7 @@ wcmatch = ">=7.0" community = ["ansible (>=2.10)"] core = ["ansible-core (>=2.11.4)"] test = ["coverage (>=6.2,<6.3)", "tomli (>=1.2.3,<2.0.0)", "flaky (>=3.7.0)", "pytest (>=6.0.1)", "pytest-cov (>=2.10.1)", "pytest-xdist (>=2.1.0)", "psutil"] -yamllint = ["yamllint (>=1.25.0)"] -typing-extensions = {version = "*", markers = "python_version < \"3.8\""} +cyamllint = ["yamllint (>=1.25.0)"] [[package]] name = "arrow" @@ -173,19 +172,6 @@ description = "Composable command line interface toolkit" category = "dev" optional = false python-versions = ">=3.6" -optional = false -python-versions = ">=3.5.0" - -[package.extras] -unicode_backport = ["unicodedata2"] - -[[package]] -name = "click-completion" -version = "0.5.2" -description = "Fish, Bash, Zsh and PowerShell completion for Click" -category = "dev" -optional = false -python-versions = "*" [package.dependencies] colorama = {version = "*", markers = "platform_system == \"Windows\""} @@ -235,9 +221,8 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.dependencies] binaryornot = ">=0.4.4" click = ">=7.0" -Jinja2 = "<3.0.0" +Jinja2 = ">=2.7,<4.0.0" jinja2-time = ">=0.2.0" -MarkupSafe = "<2.0.0" poyo = ">=0.5.0" python-slugify = ">=4.0.0" requests = ">=2.23.0" @@ -245,14 +230,14 @@ six = ">=1.10" [[package]] name = "cryptography" -version = "3.3.2" +version = "3.2.1" description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." category = "main" optional = false -python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*" +python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*" [package.dependencies] -cffi = ">=1.12" +cffi = ">=1.8,<1.11.3 || >1.11.3" six = ">=1.4.1" [package.extras] @@ -287,7 +272,7 @@ optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [package.dependencies] -pypiwin32 = {version = "223", markers = "sys_platform == \"win32\" and python_version >= \"3.6\""} +pywin32 = {version = "227", markers = "sys_platform == \"win32\""} requests = ">=2.14.2,<2.18.0 || >2.18.0" six = ">=1.4.0" websocket-client = ">=0.32.0" @@ -465,7 +450,7 @@ six = "*" [[package]] name = "paramiko" -version = "2.10.1" +version = "2.7.2" description = "SSH2 protocol library" category = "dev" optional = false @@ -475,7 +460,6 @@ python-versions = "*" bcrypt = ">=3.1.3" cryptography = ">=2.5" pynacl = ">=1.0.1" -six = "*" [package.extras] all = ["pyasn1 (>=0.1.7)", "pynacl (>=1.0.1)", "bcrypt (>=3.1.3)", "invoke (>=1.3)", "gssapi (>=1.4.1)", "pywin32 (>=2.1.8)"] @@ -491,17 +475,6 @@ category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -[[package]] -name = "pexpect" -version = "4.8.0" -description = "Pexpect allows easy control of interactive console applications." -category = "dev" -optional = false -python-versions = "*" - -[package.dependencies] -ptyprocess = ">=0.5" - [[package]] name = "pluggy" version = "0.13.1" @@ -523,16 +496,6 @@ description = "A lightweight YAML Parser for Python. 🐓" category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "ptyprocess" -version = "0.6.0" -description = "Run a subprocess in a pseudo terminal" -category = "dev" -optional = false -python-versions = "*" [[package]] name = "py" @@ -648,24 +611,6 @@ python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" [package.dependencies] six = ">=1.5" -[[package]] -name = "python-gilt" -version = "1.2.3" -description = "gilt - A GIT layering tool." -category = "dev" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -click = "*" -colorama = "*" -fasteners = "*" -PyYAML = "*" -sh = "*" - -[package.extras] -test = ["black (==19.10b0)", "flake8", "hacking", "pep517", "pytest", "pytest-cov", "pytest-helpers-namespace", "pytest-mock", "twine"] - [[package]] name = "python-slugify" version = "4.0.1" @@ -682,7 +627,7 @@ unidecode = ["Unidecode (>=1.1.1)"] [[package]] name = "pywin32" -version = "301" +version = "227" description = "Python for Window Extensions" category = "dev" optional = false @@ -807,30 +752,6 @@ category = "dev" optional = false python-versions = ">=3.6" -[[package]] -name = "sh" -version = "1.13.1" -description = "Python subprocess replacement" -category = "dev" -optional = false -python-versions = "*" - -[[package]] -name = "shellingham" -version = "1.3.2" -description = "Tool to Detect Surrounding Shell" -category = "dev" -optional = false -python-versions = "!=3.0,!=3.1,!=3.2,!=3.3,>=2.6" - -[[package]] -name = "tabulate" -version = "0.8.9" -description = "Pretty-print tabular data" -category = "dev" -optional = false -python-versions = "*" - [package.extras] doc = ["reno", "sphinx", "tornado (>=4.5)"] @@ -867,17 +788,6 @@ category = "dev" optional = false python-versions = ">=3.6" -[[package]] -name = "tree-format" -version = "0.1.2" -description = "" -category = "dev" -optional = false -python-versions = "*" - -[package.extras] -dev = ["pytest (>=2.7.1)", "testtools (>=1.8.0)"] - [[package]] name = "typing-extensions" version = "3.7.4.3" @@ -910,14 +820,6 @@ python-versions = ">=3.6" [package.dependencies] bracex = ">=2.1.1" -[[package]] -name = "wcwidth" -version = "0.2.5" -description = "Measures the displayed width of unicode strings in a terminal" -category = "dev" -optional = false -python-versions = "*" - [[package]] name = "websocket-client" version = "0.57.0" @@ -1075,20 +977,28 @@ cookiecutter = [ {file = "cookiecutter-2.1.1.tar.gz", hash = "sha256:f3982be8d9c53dac1261864013fdec7f83afd2e42ede6f6dd069c5e149c540d5"}, ] cryptography = [ - {file = "cryptography-3.3.2-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:541dd758ad49b45920dda3b5b48c968f8b2533d8981bcdb43002798d8f7a89ed"}, - {file = "cryptography-3.3.2-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:49570438e60f19243e7e0d504527dd5fe9b4b967b5a1ff21cc12b57602dd85d3"}, - {file = "cryptography-3.3.2-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:a9a4ac9648d39ce71c2f63fe7dc6db144b9fa567ddfc48b9fde1b54483d26042"}, - {file = "cryptography-3.3.2-cp27-cp27m-win32.whl", hash = "sha256:aa4969f24d536ae2268c902b2c3d62ab464b5a66bcb247630d208a79a8098e9b"}, - {file = "cryptography-3.3.2-cp27-cp27m-win_amd64.whl", hash = "sha256:1bd0ccb0a1ed775cd7e2144fe46df9dc03eefd722bbcf587b3e0616ea4a81eff"}, - {file = "cryptography-3.3.2-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:e18e6ab84dfb0ab997faf8cca25a86ff15dfea4027b986322026cc99e0a892da"}, - {file = "cryptography-3.3.2-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:c7390f9b2119b2b43160abb34f63277a638504ef8df99f11cb52c1fda66a2e6f"}, - {file = "cryptography-3.3.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:0d7b69674b738068fa6ffade5c962ecd14969690585aaca0a1b1fc9058938a72"}, - {file = "cryptography-3.3.2-cp36-abi3-manylinux1_x86_64.whl", hash = "sha256:922f9602d67c15ade470c11d616f2b2364950602e370c76f0c94c94ae672742e"}, - {file = "cryptography-3.3.2-cp36-abi3-manylinux2010_x86_64.whl", hash = "sha256:a0f0b96c572fc9f25c3f4ddbf4688b9b38c69836713fb255f4a2715d93cbaf44"}, - {file = "cryptography-3.3.2-cp36-abi3-manylinux2014_aarch64.whl", hash = "sha256:a777c096a49d80f9d2979695b835b0f9c9edab73b59e4ceb51f19724dda887ed"}, - {file = "cryptography-3.3.2-cp36-abi3-win32.whl", hash = "sha256:3c284fc1e504e88e51c428db9c9274f2da9f73fdf5d7e13a36b8ecb039af6e6c"}, - {file = "cryptography-3.3.2-cp36-abi3-win_amd64.whl", hash = "sha256:7951a966613c4211b6612b0352f5bf29989955ee592c4a885d8c7d0f830d0433"}, - {file = "cryptography-3.3.2.tar.gz", hash = "sha256:5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed"}, + {file = "cryptography-3.2.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7"}, + {file = "cryptography-3.2.1-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:75e8e6684cf0034f6bf2a97095cb95f81537b12b36a8fedf06e73050bb171c2d"}, + {file = "cryptography-3.2.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:4e7268a0ca14536fecfdf2b00297d4e407da904718658c1ff1961c713f90fd33"}, + {file = "cryptography-3.2.1-cp27-cp27m-win32.whl", hash = "sha256:7117319b44ed1842c617d0a452383a5a052ec6aa726dfbaffa8b94c910444297"}, + {file = "cryptography-3.2.1-cp27-cp27m-win_amd64.whl", hash = "sha256:a733671100cd26d816eed39507e585c156e4498293a907029969234e5e634bc4"}, + {file = "cryptography-3.2.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:a75f306a16d9f9afebfbedc41c8c2351d8e61e818ba6b4c40815e2b5740bb6b8"}, + {file = "cryptography-3.2.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:5849d59358547bf789ee7e0d7a9036b2d29e9a4ddf1ce5e06bb45634f995c53e"}, + {file = "cryptography-3.2.1-cp35-abi3-macosx_10_10_x86_64.whl", hash = "sha256:bd717aa029217b8ef94a7d21632a3bb5a4e7218a4513d2521c2a2fd63011e98b"}, + {file = "cryptography-3.2.1-cp35-abi3-manylinux1_x86_64.whl", hash = "sha256:efe15aca4f64f3a7ea0c09c87826490e50ed166ce67368a68f315ea0807a20df"}, + {file = "cryptography-3.2.1-cp35-abi3-manylinux2010_x86_64.whl", hash = "sha256:32434673d8505b42c0de4de86da8c1620651abd24afe91ae0335597683ed1b77"}, + {file = "cryptography-3.2.1-cp35-abi3-manylinux2014_aarch64.whl", hash = "sha256:7b8d9d8d3a9bd240f453342981f765346c87ade811519f98664519696f8e6ab7"}, + {file = "cryptography-3.2.1-cp35-cp35m-win32.whl", hash = "sha256:d3545829ab42a66b84a9aaabf216a4dce7f16dbc76eb69be5c302ed6b8f4a29b"}, + {file = "cryptography-3.2.1-cp35-cp35m-win_amd64.whl", hash = "sha256:a4e27ed0b2504195f855b52052eadcc9795c59909c9d84314c5408687f933fc7"}, + {file = "cryptography-3.2.1-cp36-abi3-win32.whl", hash = "sha256:13b88a0bd044b4eae1ef40e265d006e34dbcde0c2f1e15eb9896501b2d8f6c6f"}, + {file = "cryptography-3.2.1-cp36-abi3-win_amd64.whl", hash = "sha256:07ca431b788249af92764e3be9a488aa1d39a0bc3be313d826bbec690417e538"}, + {file = "cryptography-3.2.1-cp36-cp36m-win32.whl", hash = "sha256:a035a10686532b0587d58a606004aa20ad895c60c4d029afa245802347fab57b"}, + {file = "cryptography-3.2.1-cp36-cp36m-win_amd64.whl", hash = "sha256:d26a2557d8f9122f9bf445fc7034242f4375bd4e95ecda007667540270965b13"}, + {file = "cryptography-3.2.1-cp37-cp37m-win32.whl", hash = "sha256:545a8550782dda68f8cdc75a6e3bf252017aa8f75f19f5a9ca940772fc0cb56e"}, + {file = "cryptography-3.2.1-cp37-cp37m-win_amd64.whl", hash = "sha256:55d0b896631412b6f0c7de56e12eb3e261ac347fbaa5d5e705291a9016e5f8cb"}, + {file = "cryptography-3.2.1-cp38-cp38-win32.whl", hash = "sha256:3cd75a683b15576cfc822c7c5742b3276e50b21a06672dc3a800a2d5da4ecd1b"}, + {file = "cryptography-3.2.1-cp38-cp38-win_amd64.whl", hash = "sha256:d25cecbac20713a7c3bc544372d42d8eafa89799f492a43b79e1dfd650484851"}, + {file = "cryptography-3.2.1.tar.gz", hash = "sha256:d3d5e10be0cf2a12214ddee45c6bd203dab435e3d83b4560c03066eda600bfe3"}, ] dataclasses = [ {file = "dataclasses-0.7-py3-none-any.whl", hash = "sha256:3459118f7ede7c8bea0fe795bff7c6c2ce287d01dd226202f7c9ebc0610a7836"}, @@ -1218,8 +1128,8 @@ packaging = [ {file = "packaging-20.4.tar.gz", hash = "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"}, ] paramiko = [ - {file = "paramiko-2.10.1-py2.py3-none-any.whl", hash = "sha256:f6cbd3e1204abfdbcd40b3ecbc9d32f04027cd3080fe666245e21e7540ccfc1b"}, - {file = "paramiko-2.10.1.tar.gz", hash = "sha256:443f4da23ec24e9a9c0ea54017829c282abdda1d57110bf229360775ccd27a31"}, + {file = "paramiko-2.7.2-py2.py3-none-any.whl", hash = "sha256:4f3e316fef2ac628b05097a637af35685183111d4bc1b5979bd397c2ab7b5898"}, + {file = "paramiko-2.7.2.tar.gz", hash = "sha256:7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035"}, ] pathspec = [ {file = "pathspec-0.8.0-py2.py3-none-any.whl", hash = "sha256:7d91249d21749788d07a2d0f94147accd8f845507400749ea19c1ec9054a12b0"}, @@ -1293,16 +1203,18 @@ python-slugify = [ {file = "python-slugify-4.0.1.tar.gz", hash = "sha256:69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270"}, ] pywin32 = [ - {file = "pywin32-301-cp35-cp35m-win32.whl", hash = "sha256:93367c96e3a76dfe5003d8291ae16454ca7d84bb24d721e0b74a07610b7be4a7"}, - {file = "pywin32-301-cp35-cp35m-win_amd64.whl", hash = "sha256:9635df6998a70282bd36e7ac2a5cef9ead1627b0a63b17c731312c7a0daebb72"}, - {file = "pywin32-301-cp36-cp36m-win32.whl", hash = "sha256:c866f04a182a8cb9b7855de065113bbd2e40524f570db73ef1ee99ff0a5cc2f0"}, - {file = "pywin32-301-cp36-cp36m-win_amd64.whl", hash = "sha256:dafa18e95bf2a92f298fe9c582b0e205aca45c55f989937c52c454ce65b93c78"}, - {file = "pywin32-301-cp37-cp37m-win32.whl", hash = "sha256:98f62a3f60aa64894a290fb7494bfa0bfa0a199e9e052e1ac293b2ad3cd2818b"}, - {file = "pywin32-301-cp37-cp37m-win_amd64.whl", hash = "sha256:fb3b4933e0382ba49305cc6cd3fb18525df7fd96aa434de19ce0878133bf8e4a"}, - {file = "pywin32-301-cp38-cp38-win32.whl", hash = "sha256:88981dd3cfb07432625b180f49bf4e179fb8cbb5704cd512e38dd63636af7a17"}, - {file = "pywin32-301-cp38-cp38-win_amd64.whl", hash = "sha256:8c9d33968aa7fcddf44e47750e18f3d034c3e443a707688a008a2e52bbef7e96"}, - {file = "pywin32-301-cp39-cp39-win32.whl", hash = "sha256:595d397df65f1b2e0beaca63a883ae6d8b6df1cdea85c16ae85f6d2e648133fe"}, - {file = "pywin32-301-cp39-cp39-win_amd64.whl", hash = "sha256:87604a4087434cd814ad8973bd47d6524bd1fa9e971ce428e76b62a5e0860fdf"}, + {file = "pywin32-227-cp27-cp27m-win32.whl", hash = "sha256:371fcc39416d736401f0274dd64c2302728c9e034808e37381b5e1b22be4a6b0"}, + {file = "pywin32-227-cp27-cp27m-win_amd64.whl", hash = "sha256:4cdad3e84191194ea6d0dd1b1b9bdda574ff563177d2adf2b4efec2a244fa116"}, + {file = "pywin32-227-cp35-cp35m-win32.whl", hash = "sha256:f4c5be1a293bae0076d93c88f37ee8da68136744588bc5e2be2f299a34ceb7aa"}, + {file = "pywin32-227-cp35-cp35m-win_amd64.whl", hash = "sha256:a929a4af626e530383a579431b70e512e736e9588106715215bf685a3ea508d4"}, + {file = "pywin32-227-cp36-cp36m-win32.whl", hash = "sha256:300a2db938e98c3e7e2093e4491439e62287d0d493fe07cce110db070b54c0be"}, + {file = "pywin32-227-cp36-cp36m-win_amd64.whl", hash = "sha256:9b31e009564fb95db160f154e2aa195ed66bcc4c058ed72850d047141b36f3a2"}, + {file = "pywin32-227-cp37-cp37m-win32.whl", hash = "sha256:47a3c7551376a865dd8d095a98deba954a98f326c6fe3c72d8726ca6e6b15507"}, + {file = "pywin32-227-cp37-cp37m-win_amd64.whl", hash = "sha256:31f88a89139cb2adc40f8f0e65ee56a8c585f629974f9e07622ba80199057511"}, + {file = "pywin32-227-cp38-cp38-win32.whl", hash = "sha256:7f18199fbf29ca99dff10e1f09451582ae9e372a892ff03a28528a24d55875bc"}, + {file = "pywin32-227-cp38-cp38-win_amd64.whl", hash = "sha256:7c1ae32c489dc012930787f06244426f8356e129184a02c25aef163917ce158e"}, + {file = "pywin32-227-cp39-cp39-win32.whl", hash = "sha256:c054c52ba46e7eb6b7d7dfae4dbd987a1bb48ee86debe3f245a2884ece46e295"}, + {file = "pywin32-227-cp39-cp39-win_amd64.whl", hash = "sha256:f27cec5e7f588c3d1051651830ecc00294f90728d19c3bf6916e6dba93ea357c"}, ] pyyaml = [ {file = "PyYAML-5.4-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:f7a21e3d99aa3095ef0553e7ceba36fb693998fbb1226f1392ce33681047465f"}, @@ -1391,9 +1303,6 @@ subprocess-tee = [ tenacity = [ {file = "tenacity-8.0.1-py3-none-any.whl", hash = "sha256:f78f4ea81b0fabc06728c11dc2a8c01277bfc5181b321a4770471902e3eb844a"}, {file = "tenacity-8.0.1.tar.gz", hash = "sha256:43242a20e3e73291a28bcbcacfd6e000b02d3857a9a9fff56b297a27afdc932f"}, -tabulate = [ - {file = "tabulate-0.8.9-py3-none-any.whl", hash = "sha256:d7c013fe7abbc5e491394e10fa845f8f32fe54f8dc60c6622c6cf482d25d47e4"}, - {file = "tabulate-0.8.9.tar.gz", hash = "sha256:eb1d13f25760052e8931f2ef80aaf6045a6cceb47514db8beab24cded16f13a7"}, ] testinfra = [ {file = "testinfra-6.0.0-py3-none-any.whl", hash = "sha256:1a75b5025dbe82ffedec50afeaf9a7f96a8cd1e294f0d40de3a089a369ceae0e"},