Merge 4.3.6 into master (conflicts)

wazuh · Jul 22, 2022 · a1b7fa0 · alive1 · Aug 10, 2022 · a1b7fa0
2 parents 3c4ba0e + 9319ff4
commit a1b7fa0
Show file tree

Hide file tree

Showing 18 changed files with 63 additions and 27 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    target-branch: "4.5"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,18 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [v4.5.0]
+
+### Added
+
+- Update to [Wazuh v4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450)
+
+## [v4.4.0]
+
+### Added
+
+- Update to [Wazuh v4.4.0](https://github.com/wazuh/wazuh/blob/v4.4.0/CHANGELOG.md#v440)
+
 ## [v4.3.6]
 
 ### Added
@@ -43,6 +55,12 @@ All notable changes to this project will be documented in this file.
 
 - Update to [Wazuh v4.3.0](https://github.com/wazuh/wazuh/blob/v4.3.0/CHANGELOG.md#v430)
 
+## [v4.2.6]
+
+### Added
+
+- Update to [Wazuh v4.2.6](https://github.com/wazuh/wazuh/blob/v4.2.6/CHANGELOG.md#v426)
+
 ## [v4.2.5]
 
 ### Added

diff --git a/README.md b/README.md
@@ -15,13 +15,16 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb
 
 | Wazuh version | Elastic | ODFE   |
 |---------------|---------|--------|
+| v4.5.0        |         |        |
+| v4.4.0        |         |        |
 | v4.3.6        |         |        |
 | v4.3.5        |         |        |
 | v4.3.4        |         |        |
 | v4.3.3        |         |        |
 | v4.3.2        |         |        |
 | v4.3.1        |         |        |
 | v4.3.0        |         |        |
+| v4.2.6        | 7.10.2  | 1.13.2 |
 | v4.2.5        | 7.10.2  | 1.13.2 |
 | v4.2.4        | 7.10.2  | 1.13.2 |
 | v4.2.3        | 7.10.2  | 1.13.2 |

diff --git a/VERSION b/VERSION
@@ -1,2 +1,2 @@
-WAZUH-ANSIBLE_VERSION="v4.3.6"
-REVISION="40318"
+WAZUH-ANSIBLE_VERSION="v4.5.0"
+REVISION="40500"
diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
@@ -8,7 +8,7 @@
 
 def get_wazuh_version():
     """This return the version of Wazuh."""
-    return "4.3.6"
+    return "4.5.0"
 
 
 

diff --git 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.5.0
 filebeat_version: 7.10.2
-wazuh_version: 4.3.6
+wazuh_version: 4.5.0
 
-# Debian packages need the ${VERSION}-1
-wazuh_manager_version: 4.3.6
-wazuh_agent_version: 4.3.6
+# Debian packages need the ${VERSION}
+wazuh_manager_version: 4.5.0
+wazuh_agent_version: 4.5.0
diff --git a/molecule/distributed-wazuh/tests/test_default.py b/molecule/distributed-wazuh/tests/test_default.py
@@ -8,7 +8,7 @@
 
 def get_wazuh_version():
     """This return the version of Wazuh."""
-    return "4.3.6"
+    return "4.5.0"
 
 
 def test_wazuh_packages_are_installed(host):

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wazuh-ansible"
-version = "4.3.6"
+version = "4.5.0"
 description = ""
 authors = ["neonmei <[email protected]>"]
 

diff --git 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: 4.3
+wazuh_template_branch: 4.5
 
 filebeat_node_name: node-1
 

diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
@@ -1,6 +1,5 @@
 ---
-
-wazuh_agent_version: 4.3.6
+wazuh_agent_version: 4.5.0
 
 # Custom packages installation
 
@@ -12,7 +11,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
 
 wazuh_agent_sources_installation:
   enabled: false
-  branch: "v4.3.6"
+  branch: "v4.5.0"
   user_language: "y"
   user_no_stop: "y"
   user_install_type: "agent"
@@ -54,7 +53,8 @@ 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: 8ffa75d13280f1aa6ffca54f4273df4d
+wazuh_winagent_package_name: wazuh-agent-4.5.0-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
@@ -1,6 +1,5 @@
 ---
-
-wazuh_manager_version: 4.3.6
+wazuh_manager_version: 4.5.0
 
 wazuh_manager_fqdn: "wazuh-server"
 wazuh_manager_package_state: present
@@ -13,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.3.6"
+  branch: "v4.5.0"
   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
@@ -6,7 +6,7 @@ wazuh_repo:
 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
+certs_gen_tool_version: 4.5
 
 # Url of certificates generator tool
 certs_gen_tool_url: "https://packages.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
diff --git a/roles/wazuh/vars/repo_dev.yml b/roles/wazuh/vars/repo_dev.yml
@@ -6,7 +6,7 @@ wazuh_repo:
 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
+certs_gen_tool_version: 4.5
 
 # Url of certificates generator tool
 certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh"
diff --git 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.5.0
 indexer_cluster_nodes:
   - 127.0.0.1
 
 # The Wazuh dashboard package repository
-dashboard_version: "4.3.6"
+dashboard_version: "4.5.0"
 
 # API credentials
 wazuh_api_credentials:

diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml
@@ -1,3 +1,7 @@
 ---
 
-dashboard_version: 4.3.6
+<<<<<<< HEAD
+dashboard_version: 4.3.6
+=======
+dashboard_version: 4.5.0
+>>>>>>> master
diff --git 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.5.0
 
 single_node: false
 indexer_node_name: node-1

diff --git a/roles/wazuh/wazuh-indexer/tasks/local_actions.yml b/roles/wazuh/wazuh-indexer/tasks/local_actions.yml
@@ -30,8 +30,8 @@
 
   - name: Local action | Prepare the certificates generation template file
     template:
-      src: "templates/config.yml.j2"
-      dest: "{{ local_certs_path }}/config.yml"
+      src: "templates/wazuh-config.yml.j2"
+      dest: "{{ local_certs_path }}/wazuh-config.yml"
       mode: 0644
     register: tlsconfig_template