Skip to content

Commit

Permalink
Merge branch '4.9.1' into merge-4.9.1-into-4.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
javimed committed Oct 10, 2024
2 parents ebc479c + 67c6414 commit 988aabe
Show file tree
Hide file tree
Showing 30 changed files with 265 additions and 502 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file.
- Added dependency requirements to the offline installation guide. ([#7755](https://github.com/wazuh/wazuh-documentation/pull/7755))
- Added `SECURITY.md` to the Wazuh documentation repository. ([#7764](https://github.com/wazuh/wazuh-documentation/pull/7764))
- Added support for Python 3.12 in configuration steps. ([#7673](https://github.com/wazuh/wazuh-documentation/pull/7673))
- Added ARM64 Wazuh manager package references to Packages list. ([#7806](https://github.com/wazuh/wazuh-documentation/pull/7806))

### Changed

Expand All @@ -39,6 +40,7 @@ All notable changes to this project will be documented in this file.
### Removed

- Removed the command to delete `opensearch_dashboards.yml` in the *Upgrading the Wazuh dashboard* section. ([#7777](https://github.com/wazuh/wazuh-documentation/pull/7777))
- Removed the step to delete ss4o index templates in *Upgrading the Wazuh indexer*. ([#7810](https://github.com/wazuh/wazuh-documentation/pull/7810))

## [v4.9.0]

Expand Down
51 changes: 51 additions & 0 deletions source/_static/js/redirects.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,41 @@ redirections.push(
'4.8': '/user-manual/capabilities/policy-monitoring/rootcheck/index.html',
'4.9': '/user-manual/capabilities/malware-detection/rootkits-behavior-detection.html',
},
{
'target': ['4.8=>4.9', '4.9=>4.8'],
'4.8': '/migration-guide/files-backup/index.html',
'4.9': '/migration-guide/index.html',
},
{
'target': ['4.8=>4.9', '4.9=>4.8'],
'4.8': '/migration-guide/files-backup/creating/index.html',
'4.9': '/migration-guide/creating/index.html',
},
{
'target': ['4.8=>4.9', '4.9=>4.8'],
'4.8': '/migration-guide/files-backup/creating/wazuh-agent.html',
'4.9': '/migration-guide/creating/wazuh-agent.html',
},
{
'target': ['4.8=>4.9', '4.9=>4.8'],
'4.8': '/migration-guide/files-backup/creating/wazuh-central-components.html',
'4.9': '/migration-guide/creating/wazuh-central-components.html',
},
{
'target': ['4.8=>4.9', '4.9=>4.8'],
'4.8': '/migration-guide/files-backup/restoring/index.html',
'4.9': '/migration-guide/restoring/index.html',
},
{
'target': ['4.8=>4.9', '4.9=>4.8'],
'4.8': '/migration-guide/files-backup/restoring/wazuh-agent.html',
'4.9': '/migration-guide/restoring/wazuh-agent.html',
},
{
'target': ['4.8=>4.9', '4.9=>4.8'],
'4.8': '/migration-guide/files-backup/restoring/wazuh-central-components.html',
'4.9': '/migration-guide/restoring/wazuh-central-components.html',
},
);

/* Pages added in 4.10 */
Expand Down Expand Up @@ -205,6 +240,13 @@ newUrls['4.9'] = [
'/user-manual/agent/agent-management/remote-upgrading/wpk-files/wpk-list.html',
'/user-manual/wazuh-dashboard/navigating-the-wazuh-dashboard.html',
'/user-manual/wazuh-dashboard/settings.html',
'/cloud-service/your-environment/custom-dns.html',
'/migration-guide/creating/index.html',
'/migration-guide/creating/wazuh-agent.html',
'/migration-guide/creating/wazuh-central-components.html',
'/migration-guide/restoring/index.html',
'/migration-guide/restoring/wazuh-agent.html',
'/migration-guide/restoring/wazuh-central-components.html',
];

/* Pages no longer available in 4.9 */
Expand Down Expand Up @@ -236,6 +278,15 @@ removedUrls['4.9'] = [
'/user-manual/capabilities/policy-monitoring/rootcheck/rootcheck-configuration.html',
'/user-manual/capabilities/policy-monitoring/rootcheck/rootcheck-faq.html',
'/user-manual/capabilities/policy-monitoring/ciscat/ciscat.html',
'/migration-guide/wazuh-indexer.html',
'/migration-guide/wazuh-dashboard.html',
'/migration-guide/files-backup/index.html',
'/migration-guide/files-backup/creating/index.html',
'/migration-guide/files-backup/creating/wazuh-agent.html',
'/migration-guide/files-backup/creating/wazuh-central-components.html',
'/migration-guide/files-backup/restoring/index.html',
'/migration-guide/files-backup/restoring/wazuh-agent.html',
'/migration-guide/files-backup/restoring/wazuh-central-components.html',
];

/* *** RELEASE 4.8 ****/
Expand Down
36 changes: 36 additions & 0 deletions source/cloud-service/your-environment/custom-dns.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
.. Copyright (C) 2015, Wazuh, Inc.
.. meta::
:description: Check out how to configure a custom domain to access an environment in Wazuh Cloud. Learn more about it in this section of the documentation.

Custom DNS
==========

By default, Wazuh Cloud environments are accessed through a subdomain of ``cloud.wazuh.com``.

You can configure your environment to use your own custom domain. To do this, go to the **Wazuh Cloud Console** under the environment details page. You need to provide the following:

- **Certificate**: SSL/TLS certificate for your domain

- Must use SHA2
- Must use RSA with key size of at least 2048 bits
- TLS Web Server Authentication is required if using EKU
- Must contain domain name in CN or SAN field(s)
- Must be PEM encoded

- **Private Key**: Associated with the provided certificate

- Must not be encrypted or require a passphrase
- Must be PEM encoded

- **Certificate Chain**: Used to sign your certificate

- Must contain all intermediate certificates in the certificate chain
- Must be signed by a trusted certificate authority
- Must be PEM encoded

After providing the above and applying the configuration, create a ``CNAME`` DNS record using the value provided by the **Wazuh Cloud Console**.

.. note::

Your Wazuh Cloud environment is still accessible through the default URL, even if you have configured a custom domain.
1 change: 1 addition & 0 deletions source/cloud-service/your-environment/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@ Learn more about your environment in the sections below.
send-syslog-data
agents-without-internet
configure-email
custom-dns
technical-faq
61 changes: 50 additions & 11 deletions source/installation-guide/packages-list.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,29 +49,68 @@ Wazuh manager

.. |Raspbian_x86_64_manager| replace:: `wazuh-manager_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_amd64.deb <|DEB_MANAGER_URL|_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_amd64.deb>`__ (`sha512 <|CHECKSUMS_URL||WAZUH_CURRENT|/wazuh-manager_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_amd64.deb.sha512>`__)

.. |Amazon_aarch64_manager| replace:: `wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm <|RPM_MANAGER_URL|-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm>`__ (`sha512 <|CHECKSUMS_URL||WAZUH_CURRENT|/wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm.sha512>`__)

.. |CentOS7_aarch64_manager| replace:: `wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm <|RPM_MANAGER_URL|-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm>`__ (`sha512 <|CHECKSUMS_URL||WAZUH_CURRENT|/wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm.sha512>`__)

.. |Debian8_aarch64_manager| replace:: `wazuh-manager_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_arm64.deb <|DEB_MANAGER_URL|_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_arm64.deb>`__ (`sha512 <|CHECKSUMS_URL||WAZUH_CURRENT|/wazuh-manager_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_arm64.deb.sha512>`__)

.. |Fedora22_aarch64_manager| replace:: `wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm <|RPM_MANAGER_URL|-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm>`__ (`sha512 <|CHECKSUMS_URL||WAZUH_CURRENT|/wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm.sha512>`__)

.. |OpenSUSE_aarch64_manager| replace:: `wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm <|RPM_MANAGER_URL|-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm>`__ (`sha512 <|CHECKSUMS_URL||WAZUH_CURRENT|/wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm.sha512>`__)

.. |Oracle7_aarch64_manager| replace:: `wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm <|RPM_MANAGER_URL|-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm>`__ (`sha512 <|CHECKSUMS_URL||WAZUH_CURRENT|/wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm.sha512>`__)

.. |RHEL7_aarch64_manager| replace:: `wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm <|RPM_MANAGER_URL|-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm>`__ (`sha512 <|CHECKSUMS_URL||WAZUH_CURRENT|/wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm.sha512>`__)

.. |SUSE12_aarch64_manager| replace:: `wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm <|RPM_MANAGER_URL|-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm>`__ (`sha512 <|CHECKSUMS_URL||WAZUH_CURRENT|/wazuh-manager-|WAZUH_CURRENT|-|WAZUH_REVISION_YUM_MANAGER_X86|.aarch64.rpm.sha512>`__)

.. |Ubuntu13_aarch64_manager| replace:: `wazuh-manager_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_arm64.deb <|DEB_MANAGER_URL|_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_arm64.deb>`__ (`sha512 <|CHECKSUMS_URL||WAZUH_CURRENT|/wazuh-manager_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_arm64.deb.sha512>`__)

.. |Raspbian_aarch64_manager| replace:: `wazuh-manager_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_arm64.deb <|DEB_MANAGER_URL|_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_arm64.deb>`__ (`sha512 <|CHECKSUMS_URL||WAZUH_CURRENT|/wazuh-manager_|WAZUH_CURRENT|-|WAZUH_REVISION_DEB_MANAGER_X86|_arm64.deb.sha512>`__)

+-----------------------+-------------------+--------------+------------------------------------------+
| Distribution | Version | Architecture | Package |
+=======================+===================+==============+==========================================+
| Amazon Linux | 1 and later | x86_64 | |Amazon_x86_64_manager| |
| | | x86_64 | |Amazon_x86_64_manager| |
+ Amazon Linux + 1 and later +--------------+------------------------------------------+
| | | aarch64 | |Amazon_aarch64_manager| |
+-----------------------+-------------------+--------------+------------------------------------------+
| CentOS | 7 and later | x86_64 | |CentOS7_x86_64_manager| |
| | | x86_64 | |CentOS7_x86_64_manager| |
+ CentOS + 7 and later +--------------+------------------------------------------+
| | | aarch64 | |CentOS7_aarch64_manager| |
+-----------------------+-------------------+--------------+------------------------------------------+
| Debian | 8 and later | x86_64 | |Debian8_x86_64_manager| |
| | | x86_64 | |Debian8_x86_64_manager| |
+ Debian + 8 and later +--------------+------------------------------------------+
| | | aarch64 | |Debian8_aarch64_manager| |
+-----------------------+-------------------+--------------+------------------------------------------+
| Fedora | 22 and later | x86_64 | |Fedora22_x86_64_manager| |
| | | x86_64 | |Fedora22_x86_64_manager| |
+ Fedora + 22 and later +--------------+------------------------------------------+
| | | aarch64 | |Fedora22_aarch64_manager| |
+-----------------------+-------------------+--------------+------------------------------------------+
| OpenSUSE | 42 and later | x86_64 | |OpenSUSE_x86_64_manager| |
| | | x86_64 | |OpenSUSE_x86_64_manager| |
+ OpenSUSE + 42 and later +--------------+------------------------------------------+
| | | aarch64 | |OpenSUSE_aarch64_manager| |
+-----------------------+-------------------+--------------+------------------------------------------+
| Oracle Linux | 7 and later | x86_64 | |Oracle7_x86_64_manager| |
| | | x86_64 | |Oracle7_x86_64_manager| |
+ Oracle Linux + 7 and later +--------------+------------------------------------------+
| | | aarch64 | |Oracle7_aarch64_manager| |
+-----------------------+-------------------+--------------+------------------------------------------+
| Red Hat | 7 and later | x86_64 | |RHEL7_x86_64_manager| |
| Enterprise Linux | | | |
| Red Hat | | x86_64 | |RHEL7_x86_64_manager| |
+ Enterprise Linux + 7 and later +--------------+------------------------------------------+
| | | aarch64 | |RHEL7_aarch64_manager| |
+-----------------------+-------------------+--------------+------------------------------------------+
| SUSE | 12 | x86_64 | |SUSE12_x86_64_manager| |
| | | x86_64 | |SUSE12_x86_64_manager| |
+ SUSE + 12 +--------------+------------------------------------------+
| | | aarch64 | |SUSE12_aarch64_manager| |
+-----------------------+-------------------+--------------+------------------------------------------+
| Ubuntu | 13 and later | x86_64 | |Ubuntu13_x86_64_manager| |
| | | x86_64 | |Ubuntu13_x86_64_manager| |
+ Ubuntu + 13 and later +--------------+------------------------------------------+
| | | aarch64 | |Ubuntu13_aarch64_manager| |
+-----------------------+-------------------+--------------+------------------------------------------+
| Raspbian OS | Buster and later | x86_64 | |Raspbian_x86_64_manager| |
| | | x86_64 | |Raspbian_x86_64_manager| |
+ Raspbian OS + Buster and later +--------------+------------------------------------------+
| | | aarch64 | |Raspbian_aarch64_manager| |
+-----------------------+-------------------+--------------+------------------------------------------+

Filebeat
Expand Down
24 changes: 6 additions & 18 deletions source/installation-guide/wazuh-dashboard/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ Recommended operating systems
Wazuh can be installed on a 64-bit Linux operating system. Wazuh supports the following operating system versions:

.. list-table::
:width: 100%
* - Amazon Linux 2
- CentOS 7, 8
* - Red Hat Enterprise Linux 7, 8, 9
- Ubuntu 16.04, 18.04, 20.04, 22.04
:width: 100%

* - Amazon Linux 2, Amazon Linux 2023
- CentOS 7, 8
* - Red Hat Enterprise Linux 7, 8, 9
- Ubuntu 16.04, 18.04, 20.04, 22.04, 24.04

Hardware requirements
^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -99,18 +99,6 @@ The Wazuh dashboard can be installed on a dedicated node or along with the Wazuh
| Wazuh dashboard | 4 | 2 | 8 | 4 |
+-------------------------+----------+--------------+--------------+----------------+

Browser compatibility
^^^^^^^^^^^^^^^^^^^^^

Wazuh dashboard supports the following web browsers:

- Chrome 95 or later
- Firefox 93 or later
- Safari 13.7 or later

Other Chromium-based browsers might also work. Internet Explorer 11 is not supported.


.. toctree::
:hidden:
:maxdepth: 1
Expand Down
12 changes: 6 additions & 6 deletions source/installation-guide/wazuh-indexer/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@ Recommended operating systems
Wazuh can be installed on a 64-bit Linux operating system. Wazuh supports the following operating system versions:

.. list-table::
:width: 100%
* - Amazon Linux 2
- CentOS 7, 8
* - Red Hat Enterprise Linux 7, 8, 9
- Ubuntu 16.04, 18.04, 20.04, 22.04
:width: 100%

* - Amazon Linux 2, Amazon Linux 2023
- CentOS 7, 8
* - Red Hat Enterprise Linux 7, 8, 9
- Ubuntu 16.04, 18.04, 20.04, 22.04, 24.04

Hardware recommendations
^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
12 changes: 6 additions & 6 deletions source/installation-guide/wazuh-server/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ Recommended operating systems
Wazuh server can be installed on a 64-bit Linux operating system. Wazuh supports the following operating system versions:

.. list-table::
:width: 100%
* - Amazon Linux 2
- CentOS 7, 8
* - Red Hat Enterprise Linux 7, 8, 9
- Ubuntu 16.04, 18.04, 20.04, 22.04
:width: 100%

* - Amazon Linux 2, Amazon Linux 2023
- CentOS 7, 8
* - Red Hat Enterprise Linux 7, 8, 9
- Ubuntu 16.04, 18.04, 20.04, 22.04, 24.04

Hardware requirements
^^^^^^^^^^^^^^^^^^^^^
Expand Down
File renamed without changes.
18 changes: 0 additions & 18 deletions source/migration-guide/files-backup/index.rst

This file was deleted.

22 changes: 10 additions & 12 deletions source/migration-guide/index.rst
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
.. Copyright (C) 2015, Wazuh, Inc.
.. meta::
:description: Learn how to migrate from Open Distro for Elasticsearch to the Wazuh indexer and Wazuh dashboard. This guide gives instructions to perform the migration.
Migration guide
================
.. meta::
:description: Learn how to keep a backup of key files of your Wazuh installation.

From Wazuh 4.0.0 to Wazuh 4.2.7, the default Wazuh installation included the Wazuh server and `Open Distro for Elasticsearch <https://opendistro.github.io/for-elasticsearch/>`_, a project that is now archived and has been succeeded by OpenSearch. This guide includes instructions to migrate from Open Distro for Elasticsearch to the :doc:`Wazuh indexer </getting-started/components/wazuh-indexer>` and :doc:`Wazuh dashboard </getting-started/components/wazuh-dashboard>`, the new components introduced in Wazuh 4.3.0.
Backup guide
============

- :doc:`Migrating to the Wazuh indexer </migration-guide/wazuh-indexer>`: Follow this section to migrate from Open Distro for Elasticsearch 1.13 to the Wazuh indexer. This new component consists of a distribution of `Opensearch <https://github.com/opensearch-project/OpenSearch>`_ with additional tools that Wazuh has created to assist with the installation and configuration of the search engine.
In this section you can find instructions on how to create and restore a backup of your Wazuh installation.

- :doc:`Migrating to the Wazuh dashboard </migration-guide/wazuh-dashboard>`: This section will guide you through the migration from Open Distro for Elasticsearch Kibana 1.13 to the Wazuh dashboard. This new web interface for the Wazuh platform is a customized `OpenSearch Dashboards <https://github.com/opensearch-project/OpenSearch-Dashboards>`_ distribution that includes different sections, visualizations and tools to manage the Wazuh indexer information and the Wazuh Server.
To do this backup, you copy key files to a folder preserving file permissions, ownership, and path. Later, you can move this folder contents back to the corresponding location to restore your Wazuh data, certificates, and configurations. Backing up Wazuh files is useful in cases such as moving your Wazuh installation to another system.

.. toctree::
:hidden:
:maxdepth: 2

creating/index
restoring/index

wazuh-indexer
wazuh-dashboard
files-backup/index
File renamed without changes.
Loading

0 comments on commit 988aabe

Please sign in to comment.