From 85682c5e7362c17940bcda40efcfa1a260d81e28 Mon Sep 17 00:00:00 2001 From: VictorMorenoJimenez Date: Mon, 19 Apr 2021 09:42:09 +0200 Subject: [PATCH 01/16] #570. Rename Windows agent from OssecSvc to WazuhSvc --- roles/wazuh/ansible-wazuh-agent/handlers/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-wazuh-agent/handlers/main.yml b/roles/wazuh/ansible-wazuh-agent/handlers/main.yml index 1858906b..84f3ff45 100644 --- a/roles/wazuh/ansible-wazuh-agent/handlers/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/handlers/main.yml @@ -3,4 +3,4 @@ service: name=wazuh-agent state=restarted enabled=yes - name: Windows | Restart Wazuh Agent - win_service: name=OssecSvc start_mode=auto state=restarted + win_service: name=WazuhSvc start_mode=auto state=restarted From ab3d36f5cd1ca821ac57541f6546d0d40b83e704 Mon Sep 17 00:00:00 2001 From: VictorMorenoJimenez Date: Tue, 20 Apr 2021 15:59:12 +0200 Subject: [PATCH 02/16] #497. Change firewall-drop.sh according to new active-response changes. Now script is a C binary instead --- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index c6c4e956..261c8e50 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -259,7 +259,7 @@ wazuh_manager_commands: executable: 'restart-ossec.sh' expect: '' - name: 'firewall-drop' - executable: 'firewall-drop.sh' + executable: 'firewall-drop' expect: 'srcip' timeout_allowed: 'yes' - name: 'host-deny' From 1b447e1bffd55f00b2b416a4f9ad08418f9e40b4 Mon Sep 17 00:00:00 2001 From: VictorMorenoJimenez Date: Thu, 22 Apr 2021 10:28:53 +0200 Subject: [PATCH 03/16] #514. Remove conditional from task, config file is not being removed --- roles/opendistro/opendistro-kibana/tasks/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/opendistro/opendistro-kibana/tasks/main.yml b/roles/opendistro/opendistro-kibana/tasks/main.yml index 8a169664..acfd1f90 100755 --- a/roles/opendistro/opendistro-kibana/tasks/main.yml +++ b/roles/opendistro/opendistro-kibana/tasks/main.yml @@ -19,7 +19,6 @@ # noqa 503 path: "{{ kibana_conf_path }}/kibana.yml" state: absent - when: install.changed tags: install - import_tasks: security_actions.yml From a8b41363874dbe94312584be1653a546eb07e081 Mon Sep 17 00:00:00 2001 From: VictorMorenoJimenez Date: Thu, 22 Apr 2021 13:03:34 +0200 Subject: [PATCH 04/16] #514. Remove conditional from task certs were not copied to kibana folder --- roles/opendistro/opendistro-kibana/tasks/security_actions.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/opendistro/opendistro-kibana/tasks/security_actions.yml b/roles/opendistro/opendistro-kibana/tasks/security_actions.yml index d5b784cf..e96bdfa5 100644 --- a/roles/opendistro/opendistro-kibana/tasks/security_actions.yml +++ b/roles/opendistro/opendistro-kibana/tasks/security_actions.yml @@ -10,5 +10,4 @@ - "{{ kibana_node_name }}_http.key" - "{{ kibana_node_name }}_http.pem" tags: - - security - when: install.changed \ No newline at end of file + - security \ No newline at end of file From 3232b6802b052de748d1415b8dbb05170065be69 Mon Sep 17 00:00:00 2001 From: VictorMorenoJimenez Date: Thu, 22 Apr 2021 16:55:41 +0200 Subject: [PATCH 05/16] Change win_template to template, due to permission WinRMError --- roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml b/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml index 66d962cc..bcf6e1f0 100644 --- a/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml +++ b/roles/wazuh/ansible-wazuh-agent/tasks/Windows.yml @@ -84,7 +84,7 @@ - config - name: Windows | Installing local_internal_options.conf - win_template: + template: src: var-ossec-etc-local-internal-options.conf.j2 dest: "{{ wazuh_agent_win_path }}local_internal_options.conf" notify: Windows | Restart Wazuh Agent From 656c963438182bc79a4b721be912dda9885472b7 Mon Sep 17 00:00:00 2001 From: VictorMorenoJimenez Date: Tue, 27 Apr 2021 11:23:39 +0200 Subject: [PATCH 06/16] Use localhost for elasticsearch and filebeat on single node setup --- playbooks/wazuh-odfe-single.yml | 6 +++--- roles/opendistro/opendistro-elasticsearch/tasks/main.yml | 4 ++-- .../opendistro-elasticsearch/tasks/security_actions.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/playbooks/wazuh-odfe-single.yml b/playbooks/wazuh-odfe-single.yml index d3543aa4..7c655c27 100644 --- a/playbooks/wazuh-odfe-single.yml +++ b/playbooks/wazuh-odfe-single.yml @@ -12,11 +12,11 @@ single_node: true minimum_master_nodes: 1 elasticsearch_node_master: true - elasticsearch_network_host: + elasticsearch_network_host: 127.0.0.1 filebeat_node_name: node-1 - filebeat_output_elasticsearch_hosts: + filebeat_output_elasticsearch_hosts: 127.0.0.1 instances: node1: name: node-1 # Important: must be equal to elasticsearch_node_name. - ip: + ip: 127.0.0.1 ansible_shell_allow_world_readable_temp: true \ No newline at end of file diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml index e3b9aceb..e451cdaa 100644 --- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml +++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml @@ -51,7 +51,7 @@ - name: Wait for Elasticsearch API uri: - url: "https://{{ inventory_hostname }}:{{ opendistro_http_port }}/_cluster/health/" + url: "https://{{ inventory_hostname if not single_node else elasticsearch_network_host }}:{{ opendistro_http_port }}/_cluster/health/" user: "admin" # Default OpenDistro user is always "admin" password: "{{ opendistro_admin_password }}" validate_certs: no @@ -70,7 +70,7 @@ - name: Wait for Elasticsearch API (Private IP) uri: - url: "https://{{ hostvars[inventory_hostname]['private_ip'] }}:{{ opendistro_http_port }}/_cluster/health/" + url: "https://{{ hostvars[inventory_hostname]['private_ip'] if not single_node else elasticsearch_network_host }}:{{ opendistro_http_port }}/_cluster/health/" user: "admin" # Default OpenDistro user is always "admin" password: "{{ opendistro_admin_password }}" validate_certs: no diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml b/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml index e09bdf96..56d13ae9 100644 --- a/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml +++ b/roles/opendistro/opendistro-elasticsearch/tasks/security_actions.yml @@ -10,13 +10,13 @@ - name: Configure IP (Private address) set_fact: - target_address: "{{ hostvars[inventory_hostname]['private_ip'] }}" + target_address: "{{ hostvars[inventory_hostname]['private_ip'] if not single_node else elasticsearch_network_host }}" when: - hostvars[inventory_hostname]['private_ip'] is defined - name: Configure IP (Public address) set_fact: - target_address: "{{ inventory_hostname }}" + target_address: "{{ inventory_hostname if not single_node else elasticsearch_network_host }}" when: - hostvars[inventory_hostname]['private_ip'] is not defined From 6e38123d15d599713fcd8ab971ea9e063075d7a5 Mon Sep 17 00:00:00 2001 From: dfolcha Date: Mon, 24 May 2021 15:49:37 +0200 Subject: [PATCH 07/16] Change OD version --- README.md | 4 +++- molecule/default/tests/test_default.py | 2 +- molecule/distributed-wazuh-odfe/group_vars/all.yml | 8 ++++---- molecule/distributed-wazuh-odfe/tests/test_default.py | 2 +- roles/opendistro/opendistro-kibana/defaults/main.yml | 4 ++-- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 76a308ce..e3da20dc 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,9 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack. | Wazuh version | Elastic | ODFE | |---------------|---------|--------| -| v4.2.0 | 7.10.0 | 1.12.0 | +| v4.2.0 | 7.10.2 | 1.13.2 | +|---------------|---------|--------| +| v4.1.5 | 7.10.2 | 1.13.2 | |---------------|---------|--------| | v4.1.4 | 7.10.0 | 1.12.0 | |---------------|---------|--------| diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index 07b66ff0..f84cbb7a 100644 --- a/molecule/default/tests/test_default.py +++ b/molecule/default/tests/test_default.py @@ -61,4 +61,4 @@ def test_filebeat_is_installed(host): """Test the elasticsearch package is installed.""" filebeat = host.package("filebeat") assert filebeat.is_installed - assert filebeat.version.startswith('7.10.0') + assert filebeat.version.startswith('7.10.2') diff --git a/molecule/distributed-wazuh-odfe/group_vars/all.yml b/molecule/distributed-wazuh-odfe/group_vars/all.yml index c58872e5..a001f2bb 100644 --- a/molecule/distributed-wazuh-odfe/group_vars/all.yml +++ b/molecule/distributed-wazuh-odfe/group_vars/all.yml @@ -34,10 +34,10 @@ filebeat_node_name: '{{ ansible_hostname }}' # Versions # See: https://opendistro.github.io/for-elasticsearch-docs/version-history/ -elastic_stack_version: 7.10.0 -opendistro_version: 1.12.0 -filebeat_version: 7.10.0 -kibana_opendistro_version: 1.12.0-1 +elastic_stack_version: 7.10.2 +opendistro_version: 1.13.2 +filebeat_version: 7.10.2 +kibana_opendistro_version: 1.13.2-1 # Debian packages need the ${VERSION}-1 wazuh_manager_version: 4.2.0-1 diff --git a/molecule/distributed-wazuh-odfe/tests/test_default.py b/molecule/distributed-wazuh-odfe/tests/test_default.py index 07b66ff0..f84cbb7a 100644 --- a/molecule/distributed-wazuh-odfe/tests/test_default.py +++ b/molecule/distributed-wazuh-odfe/tests/test_default.py @@ -61,4 +61,4 @@ def test_filebeat_is_installed(host): """Test the elasticsearch package is installed.""" filebeat = host.package("filebeat") assert filebeat.is_installed - assert filebeat.version.startswith('7.10.0') + assert filebeat.version.startswith('7.10.2') diff --git a/roles/opendistro/opendistro-kibana/defaults/main.yml b/roles/opendistro/opendistro-kibana/defaults/main.yml index dffa0fc1..00030645 100644 --- a/roles/opendistro/opendistro-kibana/defaults/main.yml +++ b/roles/opendistro/opendistro-kibana/defaults/main.yml @@ -9,12 +9,12 @@ kibana_server_host: "0.0.0.0" kibana_server_port: "5601" kibana_server_name: "kibana" kibana_max_payload_bytes: 1048576 -elastic_stack_version: 7.10.0 +elastic_stack_version: 7.10.2 wazuh_version: 4.2.0 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana # The OpenDistro package repository -kibana_opendistro_version: 1.12.0-1 # Version includes the - for RedHat family compatibility, replace with = for Debian hosts +kibana_opendistro_version: 1.13.2-1 # Version includes the - for RedHat family compatibility, replace with = for Debian hosts package_repos: yum: diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index b452e481..4fe7ea39 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,5 +1,5 @@ --- -filebeat_version: 7.10.0 +filebeat_version: 7.10.2 wazuh_template_branch: v4.2.0 From 33a47974ba9c78ceeece5aa349833b14acdcc918 Mon Sep 17 00:00:00 2001 From: dfolcha Date: Mon, 24 May 2021 16:24:48 +0200 Subject: [PATCH 08/16] Fix compatibility matrix --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index e3da20dc..944c1661 100644 --- a/README.md +++ b/README.md @@ -15,15 +15,10 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack. | Wazuh version | Elastic | ODFE | |---------------|---------|--------| | v4.2.0 | 7.10.2 | 1.13.2 | -|---------------|---------|--------| | v4.1.5 | 7.10.2 | 1.13.2 | -|---------------|---------|--------| | v4.1.4 | 7.10.0 | 1.12.0 | -|---------------|---------|--------| | v4.1.3 | 7.10.0 | 1.12.0 | -|---------------|---------|--------| | v4.1.1 | 7.10.0 | 1.12.0 | -|---------------|---------|--------| ## Documentation From 1195f1e4424ef4df250a5dd034bf79e6d9b2feab Mon Sep 17 00:00:00 2001 From: dfolcha Date: Mon, 24 May 2021 16:24:48 +0200 Subject: [PATCH 09/16] Fix compatibility matrix --- README.md | 5 ----- roles/opendistro/opendistro-elasticsearch/defaults/main.yml | 2 +- roles/opendistro/opendistro-kibana/vars/debian.yml | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e3da20dc..944c1661 100644 --- a/README.md +++ b/README.md @@ -15,15 +15,10 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack. | Wazuh version | Elastic | ODFE | |---------------|---------|--------| | v4.2.0 | 7.10.2 | 1.13.2 | -|---------------|---------|--------| | v4.1.5 | 7.10.2 | 1.13.2 | -|---------------|---------|--------| | v4.1.4 | 7.10.0 | 1.12.0 | -|---------------|---------|--------| | v4.1.3 | 7.10.0 | 1.12.0 | -|---------------|---------|--------| | v4.1.1 | 7.10.0 | 1.12.0 | -|---------------|---------|--------| ## Documentation diff --git a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml index 232f3a20..2a6b7043 100644 --- a/roles/opendistro/opendistro-elasticsearch/defaults/main.yml +++ b/roles/opendistro/opendistro-elasticsearch/defaults/main.yml @@ -1,6 +1,6 @@ --- # Cluster Settings -opendistro_version: 1.12.0 +opendistro_version: 1.13.2 single_node: false elasticsearch_node_name: node-1 diff --git a/roles/opendistro/opendistro-kibana/vars/debian.yml b/roles/opendistro/opendistro-kibana/vars/debian.yml index 14c7aa99..9edcdddc 100644 --- a/roles/opendistro/opendistro-kibana/vars/debian.yml +++ b/roles/opendistro/opendistro-kibana/vars/debian.yml @@ -1,3 +1,3 @@ --- -kibana_opendistro_version: 1.12.0 \ No newline at end of file +kibana_opendistro_version: 1.13.2 \ No newline at end of file From 4ffb2e0790d0637f0d13881eb4e1c5d1faedd2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez?= Date: Tue, 22 Jun 2021 17:48:46 +0200 Subject: [PATCH 10/16] Fixed multi tenant and performance analyzer --- roles/elastic-stack/ansible-kibana/templates/kibana.yml.j2 | 4 +++- roles/opendistro/opendistro-elasticsearch/tasks/main.yml | 3 +++ .../opendistro-kibana/templates/opendistro_kibana.yml.j2 | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/roles/elastic-stack/ansible-kibana/templates/kibana.yml.j2 b/roles/elastic-stack/ansible-kibana/templates/kibana.yml.j2 index 62f6e9eb..2de3d3e9 100644 --- a/roles/elastic-stack/ansible-kibana/templates/kibana.yml.j2 +++ b/roles/elastic-stack/ansible-kibana/templates/kibana.yml.j2 @@ -116,4 +116,6 @@ elasticsearch.ssl.certificateAuthorities: ["{{ node_certs_destination }}/ca.crt" {% elif generate_CA == false %} elasticsearch.ssl.certificateAuthorities: ["{{ node_certs_destination }}/{{ca_cert_name}}"] {% endif %} -{% endif %} \ No newline at end of file +{% endif %} + +server.defaultRoute: /app/wazuh \ No newline at end of file diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml index e451cdaa..0470e477 100644 --- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml +++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml @@ -11,6 +11,9 @@ - import_tasks: Debian.yml when: ansible_os_family == 'Debian' + - name: Remove Performance analyzer plugin + command: "/usr/share/elasticsearch/bin/elasticsearch-plugin remove opendistro-performance-analyzer" + - name: Remove elasticsearch configuration file file: path: "{{ opendistro_conf_path }}/elasticsearch.yml" diff --git a/roles/opendistro/opendistro-kibana/templates/opendistro_kibana.yml.j2 b/roles/opendistro/opendistro-kibana/templates/opendistro_kibana.yml.j2 index bc166988..2255f026 100644 --- a/roles/opendistro/opendistro-kibana/templates/opendistro_kibana.yml.j2 +++ b/roles/opendistro/opendistro-kibana/templates/opendistro_kibana.yml.j2 @@ -25,7 +25,7 @@ elasticsearch.hosts: "http://{{ elasticsearch_network_host }}:{{ elasticsearch_h {% endif %} elasticsearch.requestHeadersWhitelist: ["securitytenant","Authorization"] -opendistro_security.multitenancy.enabled: false # FIXME: should be enabled starting with Wazuh App v3.13 +opendistro_security.multitenancy.enabled: true opendistro_security.multitenancy.tenants.preferred: ["Private", "Global"] opendistro_security.readonly_mode.roles: ["kibana_read_only"] @@ -33,4 +33,6 @@ newsfeed.enabled: {{ kibana_newsfeed_enabled }} telemetry.optIn: {{ kibana_telemetry_optin }} telemetry.enabled: {{ kibana_telemetry_enabled }} +server.defaultRoute: /app/wazuh?security_tenant=global + From 8582b0954e3148eec6d8b3c24c04e3580528a9ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Fern=C3=A1ndez=20Aguilera?= Date: Thu, 29 Jul 2021 14:14:41 +0200 Subject: [PATCH 11/16] Improved removal of performance-analyzer plugin --- roles/opendistro/opendistro-elasticsearch/tasks/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml index 0470e477..bea869a9 100644 --- a/roles/opendistro/opendistro-elasticsearch/tasks/main.yml +++ b/roles/opendistro/opendistro-elasticsearch/tasks/main.yml @@ -11,8 +11,11 @@ - import_tasks: Debian.yml when: ansible_os_family == 'Debian' - - name: Remove Performance analyzer plugin - command: "/usr/share/elasticsearch/bin/elasticsearch-plugin remove opendistro-performance-analyzer" + - name: Remove performance analyzer plugin from elasticsearch + become: true + command: ./elasticsearch-plugin remove opendistro-performance-analyzer + args: + chdir: /usr/share/elasticsearch/bin/ - name: Remove elasticsearch configuration file file: From 5f238f4185fba9e7ce1802fd62aecf2762f9337e Mon Sep 17 00:00:00 2001 From: dfolcha Date: Thu, 26 Aug 2021 10:50:30 +0200 Subject: [PATCH 12/16] Update manager conf --- .../ansible-wazuh-manager/defaults/main.yml | 29 +++++-------------- .../var-ossec-etc-ossec-server.conf.j2 | 1 - 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml index 261c8e50..b285f5eb 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -252,39 +252,24 @@ wazuh_manager_syscheck: ## Command wazuh_manager_commands: - name: 'disable-account' - executable: 'disable-account.sh' - expect: 'user' + executable: 'disable-account' timeout_allowed: 'yes' - - name: 'restart-ossec' - executable: 'restart-ossec.sh' - expect: '' + - name: 'restart-wazuh' + executable: 'restart-wazuh' - name: 'firewall-drop' executable: 'firewall-drop' - expect: 'srcip' timeout_allowed: 'yes' - name: 'host-deny' - executable: 'host-deny.sh' - expect: 'srcip' + executable: 'host-deny' timeout_allowed: 'yes' - name: 'route-null' - executable: 'route-null.sh' - expect: 'srcip' + executable: 'route-null' timeout_allowed: 'yes' - name: 'win_route-null' - executable: 'route-null.cmd' - expect: 'srcip' - timeout_allowed: 'yes' - - name: 'win_route-null-2012' - executable: 'route-null-2012.cmd' - expect: 'srcip' + executable: 'route-null.exe' timeout_allowed: 'yes' - name: 'netsh' - executable: 'netsh.cmd' - expect: 'srcip' - timeout_allowed: 'yes' - - name: 'netsh-win-2016' - executable: 'netsh-win-2016.cmd' - expect: 'srcip' + executable: 'netsh.exe' timeout_allowed: 'yes' ## Localfile 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 3242e88b..39050d09 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 @@ -369,7 +369,6 @@ {{ command.name }} {{ command.executable }} - {{ command.expect }} {% if command.timeout_allowed is defined %} {{ command.timeout_allowed }} {% endif %} From 0c665f5536c83f901b1f1e0cfb3e0930d37f10c1 Mon Sep 17 00:00:00 2001 From: dfolcha Date: Thu, 26 Aug 2021 14:12:09 +0200 Subject: [PATCH 13/16] Use root to install agent and fix problem with kibana user --- playbooks/wazuh-agent.yml | 2 ++ roles/opendistro/opendistro-kibana/defaults/main.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/playbooks/wazuh-agent.yml b/playbooks/wazuh-agent.yml index be73e030..22fcfa77 100644 --- a/playbooks/wazuh-agent.yml +++ b/playbooks/wazuh-agent.yml @@ -1,5 +1,7 @@ --- - hosts: + become: yes + become_user: root roles: - ../roles/wazuh/ansible-wazuh-agent vars: diff --git a/roles/opendistro/opendistro-kibana/defaults/main.yml b/roles/opendistro/opendistro-kibana/defaults/main.yml index 00030645..7b0d2763 100644 --- a/roles/opendistro/opendistro-kibana/defaults/main.yml +++ b/roles/opendistro/opendistro-kibana/defaults/main.yml @@ -41,7 +41,7 @@ kibana_telemetry_optin: "false" kibana_telemetry_enabled: "false" opendistro_admin_password: changeme -opendistro_kibana_user: changeme +opendistro_kibana_user: kibanaserver opendistro_kibana_password: changeme local_certs_path: "{{ playbook_dir }}/opendistro/certificates" From 29e84158a99b3dff5c2f7260d1f16906c20c8911 Mon Sep 17 00:00:00 2001 From: Nicolas Lastra Date: Thu, 9 Sep 2021 15:13:25 -0300 Subject: [PATCH 14/16] 4.2.1 tag update --- CHANGELOG.md | 6 ++++++ README.md | 1 + molecule/default/tests/test_default.py | 2 +- molecule/distributed-wazuh-elk-xpack/group_vars/all.yml | 6 +++--- .../distributed-wazuh-elk-xpack/tests/test_default.py | 2 +- molecule/distributed-wazuh-elk/group_vars/all.yml | 6 +++--- molecule/distributed-wazuh-elk/tests/test_default.py | 2 +- molecule/distributed-wazuh-odfe/group_vars/all.yml | 6 +++--- molecule/distributed-wazuh-odfe/tests/test_default.py | 2 +- pyproject.toml | 2 +- roles/elastic-stack/ansible-kibana/defaults/main.yml | 2 +- roles/opendistro/opendistro-kibana/defaults/main.yml | 2 +- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- roles/wazuh/ansible-filebeat/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 8 ++++---- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 4 ++-- 16 files changed, 31 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0456219e..68cccde3 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.2.1] + +### Added + +- Update to [Wazuh v4.2.1](https://github.com/wazuh/wazuh/blob/v4.2.1/CHANGELOG.md#v420) + ## [v4.2.0] ### Added diff --git a/README.md b/README.md index 944c1661..6f7b6fd9 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack. | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.2.1 | 7.10.2 | 1.13.2 | | v4.2.0 | 7.10.2 | 1.13.2 | | v4.1.5 | 7.10.2 | 1.13.2 | | v4.1.4 | 7.10.0 | 1.12.0 | diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index f84cbb7a..db20ee04 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.2.0" + return "4.2.1" def test_wazuh_packages_are_installed(host): diff --git a/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml b/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml index 8c5b9a7a..ff802f94 100644 --- a/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml +++ b/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml @@ -18,11 +18,11 @@ elastic_stack_version: 7.10.2 filebeat_version: 7.10.2 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.2.0-1 -wazuh_agent_version: 4.2.0-1 +wazuh_manager_version: 4.2.1-1 +wazuh_agent_version: 4.2.1-1 # Kibana role appends it automatically. -wazuh_version: 4.2.0 +wazuh_version: 4.2.1 ######################################################## diff --git a/molecule/distributed-wazuh-elk-xpack/tests/test_default.py b/molecule/distributed-wazuh-elk-xpack/tests/test_default.py index f84cbb7a..db20ee04 100644 --- a/molecule/distributed-wazuh-elk-xpack/tests/test_default.py +++ b/molecule/distributed-wazuh-elk-xpack/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.2.0" + return "4.2.1" def test_wazuh_packages_are_installed(host): diff --git a/molecule/distributed-wazuh-elk/group_vars/all.yml b/molecule/distributed-wazuh-elk/group_vars/all.yml index bfb56ca5..77cbb3dc 100644 --- a/molecule/distributed-wazuh-elk/group_vars/all.yml +++ b/molecule/distributed-wazuh-elk/group_vars/all.yml @@ -16,8 +16,8 @@ elastic_stack_version: 7.10.2 filebeat_version: 7.10.2 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.2.0-1 -wazuh_agent_version: 4.2.0-1 +wazuh_manager_version: 4.2.1-1 +wazuh_agent_version: 4.2.1-1 # Kibana role appends it automatically. -wazuh_version: 4.2.0 +wazuh_version: 4.2.1 diff --git a/molecule/distributed-wazuh-elk/tests/test_default.py b/molecule/distributed-wazuh-elk/tests/test_default.py index f84cbb7a..db20ee04 100644 --- a/molecule/distributed-wazuh-elk/tests/test_default.py +++ b/molecule/distributed-wazuh-elk/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.2.0" + return "4.2.1" def test_wazuh_packages_are_installed(host): diff --git a/molecule/distributed-wazuh-odfe/group_vars/all.yml b/molecule/distributed-wazuh-odfe/group_vars/all.yml index a001f2bb..600a6cb4 100644 --- a/molecule/distributed-wazuh-odfe/group_vars/all.yml +++ b/molecule/distributed-wazuh-odfe/group_vars/all.yml @@ -40,8 +40,8 @@ filebeat_version: 7.10.2 kibana_opendistro_version: 1.13.2-1 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.2.0-1 -wazuh_agent_version: 4.2.0-1 +wazuh_manager_version: 4.2.1-1 +wazuh_agent_version: 4.2.1-1 # Kibana role appends it automatically. -wazuh_version: 4.2.0 +wazuh_version: 4.2.1 diff --git a/molecule/distributed-wazuh-odfe/tests/test_default.py b/molecule/distributed-wazuh-odfe/tests/test_default.py index f84cbb7a..db20ee04 100644 --- a/molecule/distributed-wazuh-odfe/tests/test_default.py +++ b/molecule/distributed-wazuh-odfe/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.2.0" + return "4.2.1" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index ec1c35e3..fd1122bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.2.0" +version = "4.2.1" description = "" authors = ["neonmei "] diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml index 916b4aa2..be586dc4 100644 --- a/roles/elastic-stack/ansible-kibana/defaults/main.yml +++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml @@ -7,7 +7,7 @@ kibana_server_host: "0.0.0.0" kibana_server_port: "5601" kibana_conf_path: /etc/kibana elastic_stack_version: 7.10.2 -wazuh_version: 4.2.0 +wazuh_version: 4.2.1 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana elasticrepo: diff --git a/roles/opendistro/opendistro-kibana/defaults/main.yml b/roles/opendistro/opendistro-kibana/defaults/main.yml index 7b0d2763..be58db06 100644 --- a/roles/opendistro/opendistro-kibana/defaults/main.yml +++ b/roles/opendistro/opendistro-kibana/defaults/main.yml @@ -10,7 +10,7 @@ kibana_server_port: "5601" kibana_server_name: "kibana" kibana_max_payload_bytes: 1048576 elastic_stack_version: 7.10.2 -wazuh_version: 4.2.0 +wazuh_version: 4.2.1 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana # The OpenDistro package repository diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index 4fe7ea39..c148390c 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: v4.2.0 +wazuh_template_branch: v4.2.1 filebeat_output_elasticsearch_hosts: - "localhost:9200" diff --git a/roles/wazuh/ansible-filebeat/defaults/main.yml b/roles/wazuh/ansible-filebeat/defaults/main.yml index ca375b6f..a1b2778a 100644 --- a/roles/wazuh/ansible-filebeat/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: v4.2.0 +wazuh_template_branch: v4.2.1 filebeat_create_config: true diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index 8fc9007b..b1766a76 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_agent_version: 4.2.0-1 +wazuh_agent_version: 4.2.1-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.2.0" + branch: "v4.2.1" user_language: "y" user_no_stop: "y" user_install_type: "agent" @@ -55,8 +55,8 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: 8ffa75d13280f1aa6ffca54f4273df4d -wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.0-1.msi -wazuh_winagent_package_name: wazuh-agent-4.2.0-1.msi +wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.1-1.msi +wazuh_winagent_package_name: wazuh-agent-4.2.1-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 b285f5eb..80368ef8 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_manager_version: 4.2.0-1 +wazuh_manager_version: 4.2.1-1 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon # Sources installation wazuh_manager_sources_installation: enabled: false - branch: "v4.2.0" + branch: "v4.2.1" user_language: "en" user_no_stop: "y" user_install_type: "server" From f55390c527b532a4141e27e6184ae42a30d6e062 Mon Sep 17 00:00:00 2001 From: Nicolas Lastra Date: Tue, 14 Sep 2021 15:56:49 -0300 Subject: [PATCH 15/16] 4.2.2 tag update --- CHANGELOG.md | 6 ++++++ README.md | 1 + molecule/default/tests/test_default.py | 2 +- molecule/distributed-wazuh-elk-xpack/group_vars/all.yml | 6 +++--- .../distributed-wazuh-elk-xpack/tests/test_default.py | 2 +- molecule/distributed-wazuh-elk/group_vars/all.yml | 6 +++--- molecule/distributed-wazuh-elk/tests/test_default.py | 2 +- molecule/distributed-wazuh-odfe/group_vars/all.yml | 6 +++--- molecule/distributed-wazuh-odfe/tests/test_default.py | 2 +- pyproject.toml | 2 +- roles/elastic-stack/ansible-kibana/defaults/main.yml | 2 +- roles/opendistro/opendistro-kibana/defaults/main.yml | 2 +- roles/wazuh/ansible-filebeat-oss/defaults/main.yml | 2 +- roles/wazuh/ansible-filebeat/defaults/main.yml | 2 +- roles/wazuh/ansible-wazuh-agent/defaults/main.yml | 8 ++++---- roles/wazuh/ansible-wazuh-manager/defaults/main.yml | 4 ++-- 16 files changed, 31 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68cccde3..86d82633 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.2.2] + +### Added + +- Update to [Wazuh v4.2.2](https://github.com/wazuh/wazuh/blob/v4.2.2/CHANGELOG.md#v420) + ## [v4.2.1] ### Added diff --git a/README.md b/README.md index 6f7b6fd9..ee8d13a9 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ These playbooks install and configure Wazuh agent, manager and Elastic Stack. | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.2.2 | 7.10.2 | 1.13.2 | | v4.2.1 | 7.10.2 | 1.13.2 | | v4.2.0 | 7.10.2 | 1.13.2 | | v4.1.5 | 7.10.2 | 1.13.2 | diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py index db20ee04..56c46fa3 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.2.1" + return "4.2.2" def test_wazuh_packages_are_installed(host): diff --git a/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml b/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml index ff802f94..7decae41 100644 --- a/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml +++ b/molecule/distributed-wazuh-elk-xpack/group_vars/all.yml @@ -18,11 +18,11 @@ elastic_stack_version: 7.10.2 filebeat_version: 7.10.2 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.2.1-1 -wazuh_agent_version: 4.2.1-1 +wazuh_manager_version: 4.2.2-1 +wazuh_agent_version: 4.2.2-1 # Kibana role appends it automatically. -wazuh_version: 4.2.1 +wazuh_version: 4.2.2 ######################################################## diff --git a/molecule/distributed-wazuh-elk-xpack/tests/test_default.py b/molecule/distributed-wazuh-elk-xpack/tests/test_default.py index db20ee04..56c46fa3 100644 --- a/molecule/distributed-wazuh-elk-xpack/tests/test_default.py +++ b/molecule/distributed-wazuh-elk-xpack/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.2.1" + return "4.2.2" def test_wazuh_packages_are_installed(host): diff --git a/molecule/distributed-wazuh-elk/group_vars/all.yml b/molecule/distributed-wazuh-elk/group_vars/all.yml index 77cbb3dc..969c0f6c 100644 --- a/molecule/distributed-wazuh-elk/group_vars/all.yml +++ b/molecule/distributed-wazuh-elk/group_vars/all.yml @@ -16,8 +16,8 @@ elastic_stack_version: 7.10.2 filebeat_version: 7.10.2 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.2.1-1 -wazuh_agent_version: 4.2.1-1 +wazuh_manager_version: 4.2.2-1 +wazuh_agent_version: 4.2.2-1 # Kibana role appends it automatically. -wazuh_version: 4.2.1 +wazuh_version: 4.2.2 diff --git a/molecule/distributed-wazuh-elk/tests/test_default.py b/molecule/distributed-wazuh-elk/tests/test_default.py index db20ee04..56c46fa3 100644 --- a/molecule/distributed-wazuh-elk/tests/test_default.py +++ b/molecule/distributed-wazuh-elk/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.2.1" + return "4.2.2" def test_wazuh_packages_are_installed(host): diff --git a/molecule/distributed-wazuh-odfe/group_vars/all.yml b/molecule/distributed-wazuh-odfe/group_vars/all.yml index 600a6cb4..38ba8d23 100644 --- a/molecule/distributed-wazuh-odfe/group_vars/all.yml +++ b/molecule/distributed-wazuh-odfe/group_vars/all.yml @@ -40,8 +40,8 @@ filebeat_version: 7.10.2 kibana_opendistro_version: 1.13.2-1 # Debian packages need the ${VERSION}-1 -wazuh_manager_version: 4.2.1-1 -wazuh_agent_version: 4.2.1-1 +wazuh_manager_version: 4.2.2-1 +wazuh_agent_version: 4.2.2-1 # Kibana role appends it automatically. -wazuh_version: 4.2.1 +wazuh_version: 4.2.2 diff --git a/molecule/distributed-wazuh-odfe/tests/test_default.py b/molecule/distributed-wazuh-odfe/tests/test_default.py index db20ee04..56c46fa3 100644 --- a/molecule/distributed-wazuh-odfe/tests/test_default.py +++ b/molecule/distributed-wazuh-odfe/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.2.1" + return "4.2.2" def test_wazuh_packages_are_installed(host): diff --git a/pyproject.toml b/pyproject.toml index fd1122bc..9eeeaf7d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "wazuh-ansible" -version = "4.2.1" +version = "4.2.2" description = "" authors = ["neonmei "] diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml index be586dc4..704b0a7e 100644 --- a/roles/elastic-stack/ansible-kibana/defaults/main.yml +++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml @@ -7,7 +7,7 @@ kibana_server_host: "0.0.0.0" kibana_server_port: "5601" kibana_conf_path: /etc/kibana elastic_stack_version: 7.10.2 -wazuh_version: 4.2.1 +wazuh_version: 4.2.2 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana elasticrepo: diff --git a/roles/opendistro/opendistro-kibana/defaults/main.yml b/roles/opendistro/opendistro-kibana/defaults/main.yml index be58db06..bcd6bac6 100644 --- a/roles/opendistro/opendistro-kibana/defaults/main.yml +++ b/roles/opendistro/opendistro-kibana/defaults/main.yml @@ -10,7 +10,7 @@ kibana_server_port: "5601" kibana_server_name: "kibana" kibana_max_payload_bytes: 1048576 elastic_stack_version: 7.10.2 -wazuh_version: 4.2.1 +wazuh_version: 4.2.2 wazuh_app_url: https://packages.wazuh.com/4.x/ui/kibana/wazuh_kibana # The OpenDistro package repository diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index c148390c..54bf9e2a 100644 --- a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: v4.2.1 +wazuh_template_branch: v4.2.2 filebeat_output_elasticsearch_hosts: - "localhost:9200" diff --git a/roles/wazuh/ansible-filebeat/defaults/main.yml b/roles/wazuh/ansible-filebeat/defaults/main.yml index a1b2778a..33fa46f5 100644 --- a/roles/wazuh/ansible-filebeat/defaults/main.yml +++ b/roles/wazuh/ansible-filebeat/defaults/main.yml @@ -1,7 +1,7 @@ --- filebeat_version: 7.10.2 -wazuh_template_branch: v4.2.1 +wazuh_template_branch: v4.2.2 filebeat_create_config: true diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml index b1766a76..fedd2e0f 100644 --- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_agent_version: 4.2.1-1 +wazuh_agent_version: 4.2.2-1 # Custom packages installation @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.2.1" + branch: "v4.2.2" user_language: "y" user_no_stop: "y" user_install_type: "agent" @@ -55,8 +55,8 @@ wazuh_winagent_config: auth_path_x86: C:\'Program Files (x86)'\ossec-agent\agent-auth.exe check_md5: True md5: 8ffa75d13280f1aa6ffca54f4273df4d -wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.1-1.msi -wazuh_winagent_package_name: wazuh-agent-4.2.1-1.msi +wazuh_winagent_config_url: https://packages.wazuh.com/4.x/windows/wazuh-agent-4.2.2-1.msi +wazuh_winagent_package_name: wazuh-agent-4.2.2-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 80368ef8..d0fe6016 100644 --- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml @@ -1,5 +1,5 @@ --- -wazuh_manager_version: 4.2.1-1 +wazuh_manager_version: 4.2.2-1 wazuh_manager_fqdn: "wazuh-server" wazuh_manager_package_state: present @@ -12,7 +12,7 @@ wazuh_custom_packages_installation_manager_rpm_url: "https://s3-us-west-1.amazon # Sources installation wazuh_manager_sources_installation: enabled: false - branch: "v4.2.1" + branch: "v4.2.2" user_language: "en" user_no_stop: "y" user_install_type: "server" From b0df88cb430b076ef6468f22c822633976533472 Mon Sep 17 00:00:00 2001 From: Nicolas Lastra Date: Thu, 16 Sep 2021 15:53:19 -0300 Subject: [PATCH 16/16] 4.2.2 tag update ansible version --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 61785a6e..b5f0aa38 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4" -REVISION="40000" +WAZUH-ANSIBLE_VERSION="v4.2.2" +REVISION="40215"