diff --git a/CHANGELOG.md b/CHANGELOG.md index 53623763..a832d636 100644 --- 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.6.0] + +### Added + +- Update to [Wazuh v4.6.0](https://github.com/wazuh/wazuh/blob/v4.6.0/CHANGELOG.md#v460) + +## [v4.5.0] + +### Added + +- Update to [Wazuh v4.5.0](https://github.com/wazuh/wazuh/blob/v4.5.0/CHANGELOG.md#v450) + ## [v4.4.1] ### Added diff --git a/README.md b/README.md index 1c5692d2..fb33b61a 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,12 @@ These playbooks install and configure Wazuh agent, manager and indexer and dashb | Wazuh version | Elastic | ODFE | |---------------|---------|--------| +| v4.6.0 | | | +| v4.5.0 | | | | v4.4.1 | | | | v4.4.0 | | | | v4.3.10 | | | +| v4.4.0 | | | | v4.3.9 | | | | v4.3.8 | | | | v4.3.7 | | | diff --git a/VERSION b/VERSION index 85c37c37..a434bd26 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -WAZUH-ANSIBLE_VERSION="v4.4.1" -REVISION="40406" +WAZUH-ANSIBLE_VERSION="v4.6.0" +REVISION="40600" diff --git a/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml b/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml deleted file mode 100644 index 5b490844..00000000 --- a/roles/opendistro/opendistro-elasticsearch/tasks/Debian.yml +++ /dev/null @@ -1,57 +0,0 @@ - ---- - -- name: Update cache - apt: - update_cache: yes - -- name: Debian 9 (Stretch) - when: (ansible_facts['distribution'] == "Debian" and ansible_facts['distribution_major_version'] == "9") - block: - - - name: Install OpenDistro dependencies - apt: - name: [ - 'unzip', 'wget', 'curl', 'apt-transport-https', software-properties-common - ] - state: present - - - name: Add the repository key for Debian's Stretch Backports repository - ansible.builtin.apt_key: - keyserver: keyserver.ubuntu.com - id: 648ACFD622F3D138 - - - name: Add openjdk repository - apt_repository: - repo: "{{ package_repos.apt.openjdk.baseurl }}" - state: present - update_cache: yes - filename: 'wazuh-openjdk' - -- name: Install openjdk-11-jdk - apt: - name: openjdk-11-jdk - state: present - environment: - JAVA_HOME: /usr - -- name: Add Opendistro repository - block: - - name: Add apt repository signing key - apt_key: - url: "{{ package_repos.apt.opendistro.gpg }}" - state: present - - - name: Add Opendistro repository - apt_repository: - repo: "{{ package_repos.apt.opendistro.baseurl }}" - state: present - filename: 'wazuh-opendistro' - update_cache: yes - -- name: Install OpenDistro - apt: - name: opendistroforelasticsearch={{ opendistro_version }}-1 - state: present - register: install - tags: install \ No newline at end of file diff --git a/roles/opendistro/opendistro-kibana/tasks/main.yml b/roles/opendistro/opendistro-kibana/tasks/main.yml deleted file mode 100755 index acfd1f90..00000000 --- a/roles/opendistro/opendistro-kibana/tasks/main.yml +++ /dev/null @@ -1,124 +0,0 @@ ---- - -- name: Stopping early, trying to compile Wazuh Kibana Plugin on Debian 10 is not possible - fail: - msg: "It's not possible to compile the Wazuh Kibana plugin on Debian 10 due to: https://github.com/wazuh/wazuh-kibana-app/issues/1924" - when: - - build_from_sources - - ansible_distribution == "Debian" - - ansible_distribution_major_version == "10" - -- import_tasks: RedHat.yml - when: ansible_os_family == 'RedHat' - -- import_tasks: Debian.yml - when: ansible_os_family == 'Debian' - -- name: Remove Kibana configuration file - file: - # noqa 503 - path: "{{ kibana_conf_path }}/kibana.yml" - state: absent - tags: install - -- import_tasks: security_actions.yml - -- name: Copy Configuration File - blockinfile: - block: "{{ lookup('template', 'opendistro_kibana.yml.j2') }}" - dest: "{{ kibana_conf_path }}/kibana.yml" - create: true - group: kibana - owner: kibana - mode: 0640 - marker: "## {mark} Kibana general settings ##" - notify: restart kibana - tags: - - install - - configure - -- name: Ensuring Kibana directory owner - file: - # noqa 208 - path: "/usr/share/kibana" - state: directory - owner: kibana - group: kibana - recurse: yes - -- name: Build and Install Wazuh Kibana Plugin from sources - import_tasks: build_wazuh_plugin.yml - when: - - build_from_sources is defined - - build_from_sources - -- name: Install Wazuh Plugin (can take a while) - shell: >- - NODE_OPTIONS="{{ node_options }}" /usr/share/kibana/bin/kibana-plugin install - {{ wazuh_app_url }}-{{ wazuh_version }}_{{ elastic_stack_version }}-1.zip - args: - executable: /bin/bash - creates: /usr/share/kibana/plugins/wazuh/package.json - chdir: /usr/share/kibana - become: yes - become_user: kibana - notify: restart kibana - tags: - - install - - skip_ansible_lint - when: - - not build_from_sources - -- name: Kibana optimization (can take a while) - shell: /usr/share/kibana/node/bin/node {{ node_options }} /usr/share/kibana/src/cli/cli.js --optimize -c {{ kibana_conf_path }}/kibana.yml - args: - executable: /bin/bash - become: yes - become_user: kibana - changed_when: false - tags: - - skip_ansible_lint - -- name: Wait for Elasticsearch port - wait_for: host={{ elasticsearch_network_host }} port={{ elasticsearch_http_port }} - -- name: Select correct API protocol - set_fact: - elastic_api_protocol: "{% if kibana_opendistro_security is defined and kibana_opendistro_security %}https{% else %}http{% endif %}" - -- name: Attempting to delete legacy Wazuh index if exists - uri: - url: "{{ elastic_api_protocol }}://{{ elasticsearch_network_host }}:{{ elasticsearch_http_port }}/.wazuh" - method: DELETE - user: "admin" - password: "{{ opendistro_admin_password }}" - validate_certs: no - status_code: 200, 404 - -- name: Create wazuh plugin config directory - file: - path: /usr/share/kibana/data/wazuh/config/ - state: directory - recurse: yes - owner: kibana - group: kibana - mode: 0751 - changed_when: False - -- name: Configure Wazuh Kibana Plugin - template: - src: wazuh.yml.j2 - dest: /usr/share/kibana/data/wazuh/config/wazuh.yml - owner: kibana - group: kibana - mode: 0751 - changed_when: False - -- name: Ensure Kibana started and enabled - service: - name: kibana - enabled: true - state: started - -- import_tasks: RMRedHat.yml - when: ansible_os_family == 'RedHat' diff --git a/roles/opendistro/opendistro-kibana/tasks/security_actions.yml b/roles/opendistro/opendistro-kibana/tasks/security_actions.yml deleted file mode 100644 index ee21f1c1..00000000 --- a/roles/opendistro/opendistro-kibana/tasks/security_actions.yml +++ /dev/null @@ -1,13 +0,0 @@ -- block: - - - name: Copy the certificates from local to the Kibana instance - copy: - src: "{{ local_certs_path }}/certs/{{ item }}" - dest: /usr/share/kibana - mode: 0644 - with_items: - - "root-ca.pem" - - "{{ kibana_node_name }}_http.key" - - "{{ kibana_node_name }}_http.pem" - tags: - - security diff --git a/roles/wazuh/ansible-filebeat-oss/defaults/main.yml b/roles/wazuh/ansible-filebeat-oss/defaults/main.yml index eb90b20a..fcaf6739 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: 4.4 +wazuh_template_branch: 4.6 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 index 7f7ef858..d130322a 100644 --- 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.4.1 +wazuh_agent_version: 4.6.0 # Custom packages installation @@ -12,7 +11,7 @@ wazuh_custom_packages_installation_agent_rpm_url: "" wazuh_agent_sources_installation: enabled: false - branch: "v4.4.1" + branch: "v4.6.0" 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 702e884d..93b0aba7 100644 --- 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.4.1 +wazuh_manager_version: 4.6.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.4.1" + branch: "v4.6.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 index d4c0d311..d8e761fb 100644 --- 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.4 +certs_gen_tool_version: 4.6 # Url of certificates generator tool certs_gen_tool_url: "https://packages.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" \ No newline at end of file diff --git a/roles/wazuh/vars/repo_pre-release.yml b/roles/wazuh/vars/repo_pre-release.yml index 76a04f17..e5aaec25 100644 --- a/roles/wazuh/vars/repo_pre-release.yml +++ b/roles/wazuh/vars/repo_pre-release.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.4 +certs_gen_tool_version: 4.6 # Url of certificates generator tool certs_gen_tool_url: "https://packages-dev.wazuh.com/{{ certs_gen_tool_version }}/wazuh-certs-tool.sh" \ No newline at end of file diff --git a/roles/wazuh/wazuh-dashboard/defaults/main.yml b/roles/wazuh/wazuh-dashboard/defaults/main.yml index 57bab10d..d0523d72 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.4.1 +wazuh_version: 4.6.0 indexer_cluster_nodes: - 127.0.0.1 # The Wazuh dashboard package repository -dashboard_version: "4.4.1" +dashboard_version: "4.6.0" # API credentials wazuh_api_credentials: diff --git a/roles/wazuh/wazuh-dashboard/vars/debian.yml b/roles/wazuh/wazuh-dashboard/vars/debian.yml index e8b37212..e4b409bb 100644 --- a/roles/wazuh/wazuh-dashboard/vars/debian.yml +++ b/roles/wazuh/wazuh-dashboard/vars/debian.yml @@ -1,2 +1,2 @@ --- -dashboard_version: 4.4.1 +dashboard_version: 4.6.0 diff --git a/roles/wazuh/wazuh-indexer/defaults/main.yml b/roles/wazuh/wazuh-indexer/defaults/main.yml index 2831adb6..974d089d 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.4.1 +indexer_version: 4.6.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 index 4a215bef..6688cbe8 100644 --- 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