Skip to content

Commit

Permalink
Merge pull request #7156 from wazuh/merge-4.8.2-into-4.9.0
Browse files Browse the repository at this point in the history
Merge 4.8.2 into 4.9.0
  • Loading branch information
juliamagan authored Apr 1, 2024
2 parents 5963d25 + 0fb5170 commit c26e137
Show file tree
Hide file tree
Showing 22 changed files with 110 additions and 79 deletions.
17 changes: 15 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ All notable changes to this project will be documented in this file.

## [v4.8.2]

- Support for Wazuh 4.8.2
### Added

- Added considerations for max_size API options. ([#7063](https://github.com/wazuh/wazuh-documentation/pull/7063))

### Fixed

- Fixed Puppet deployment config steps. ([#7120](https://github.com/wazuh/wazuh-documentation/pull/7120))

## [v4.8.1]

Expand All @@ -37,6 +43,7 @@ All notable changes to this project will be documented in this file.
### Changed

- Updated ``SQLAlchemy`` and ``urllib3`` in dependencies Azure cloud security section. ([#6842](https://github.com/wazuh/wazuh-documentation/pull/6842))
- Changed all references to HP-UX package to tar.gz. ([#7107](https://github.com/wazuh/wazuh-documentation/pull/7107))

## [v4.8.0]

Expand All @@ -50,6 +57,9 @@ All notable changes to this project will be documented in this file.
- Added keystore management tool section. ([#7000](https://github.com/wazuh/wazuh-documentation/pull/7000)) ([#7072](https://github.com/wazuh/wazuh-documentation/pull/7072))
- Added available SCA policies in 4.8.0 version. ([#7049](https://github.com/wazuh/wazuh-documentation/pull/7049))
- Added environment variable for Wazuh indexer in Wazuh on Docker deployment. ([#6750](https://github.com/wazuh/wazuh-documentation/pull/6750)) ([#7057](https://github.com/wazuh/wazuh-documentation/pull/7057))
- Added step to remove the *ss4o* index templates from the Wazuh indexer upgrade guide. ([#7093](https://github.com/wazuh/wazuh-documentation/pull/7093))
- Added deprecation notice for the ``cache`` Wazuh API configuration option. ([#7106](https://github.com/wazuh/wazuh-documentation/pull/7106))
- Added warning about 4.8.0 upgrade. ([#7135](https://github.com/wazuh/wazuh-documentation/pull/7135))

### Changed

Expand Down Expand Up @@ -77,11 +87,14 @@ All notable changes to this project will be documented in this file.
- Removed steps to modify the number of shards from the offline installation guide. ([#6958](https://github.com/wazuh/wazuh-documentation/pull/6958))
- Fixed password update step for distributed deployments. ([#6967](https://github.com/wazuh/wazuh-documentation/pull/6967))
- Added fixes and updates to the MITRE ATT&CK framework section. ([#6962](https://github.com/wazuh/wazuh-documentation/pull/6962))
- Modified master node address name to uppercase. ([#7127](https://github.com/wazuh/wazuh-documentation/pull/7127))

### Removed

- Deprecated ``/vulnerability`` API endpoints. ([#6738](https://github.com/wazuh/wazuh-documentation/pull/6738))
- Remove implicit ``id!=000`` WQL filter in the search bar. ([#6815](https://github.com/wazuh/wazuh-documentation/pull/6815))
- Removed implicit ``id!=000`` WQL filter in the search bar. ([#6815](https://github.com/wazuh/wazuh-documentation/pull/6815))
- Removed launchctl unload step from macOS uninstalling manual. ([#7123](https://github.com/wazuh/wazuh-documentation/pull/7123))
- Removed Wazuh_Ruleset.pdf references. ([#7142](https://github.com/wazuh/wazuh-documentation/pull/7142))

## [v4.7.3]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Configure the cluster node by editing the following settings in ``/var/ossec/etc
<port>1516</port>
<bind_addr>0.0.0.0</bind_addr>
<nodes>
<node>wazuh-master-address</node>
<node>WAZUH-MASTER-ADDRESS</node>
</nodes>
<hidden>no</hidden>
<disabled>no</disabled>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Configure the cluster node by editing the following settings in ``/var/ossec/etc
<port>1516</port>
<bind_addr>0.0.0.0</bind_addr>
<nodes>
<node>wazuh-master-address</node>
<node>WAZUH-MASTER-ADDRESS</node>
</nodes>
<hidden>no</hidden>
<disabled>no</disabled>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<port>1516</port>
<bind_addr>0.0.0.0</bind_addr>
<nodes>
<node>wazuh-master-address</node>
<node>WAZUH-MASTER-ADDRESS</node>
</nodes>
<hidden>no</hidden>
<disabled>no</disabled>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Configure the cluster node by editing the following settings in the ``/var/ossec
<port>1516</port>
<bind_addr>0.0.0.0</bind_addr>
<nodes>
<node>wazuh-master-address</node>
<node>WAZUH-MASTER-ADDRESS</node>
</nodes>
<hidden>no</hidden>
<disabled>no</disabled>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Configure the cluster node by editing the following settings in the ``/var/ossec
<port>1516</port>
<bind_addr>0.0.0.0</bind_addr>
<nodes>
<node>wazuh-master-address</node>
<node>WAZUH-MASTER-ADDRESS</node>
</nodes>
<hidden>no</hidden>
<disabled>no</disabled>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Clone this repository to deploy the necessary services and pods.
$ git clone https://github.com/wazuh/wazuh-kubernetes.git -b v|WAZUH_CURRENT_KUBERNETES| --depth=1
$ cd wazuh-kubernetes
.. _kubernetes_ssl_certificates:

Setup SSL certificates
^^^^^^^^^^^^^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ Our Kubernetes deployment uses our Wazuh images from Docker. If we look at the f
Any modification related to these files will also be made in the associated volume. When the replica pod is created, it will get those files from the volume, keeping the previous changes.


Recreating certificates
-----------------------

Upgrading from a version earlier than v4.8.0 requires that you recreate the SSL certificates. Follow instructions in :ref:`kubernetes_ssl_certificates` for this.

Configuring the upgrade
-----------------------

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,17 @@ Installation on Windows
Agent Configuration
^^^^^^^^^^^^^^^^^^^

Add the server value to the ``[main]`` section of the node ``/etc/puppetlabs/puppet/puppet.conf`` (Linux) or ``C:\ProgramData\PuppetLabs\puppet\etc\puppet.conf`` (Windows) file, replacing ``puppet.example.com`` with your Puppet server FQDN::
To configure the Puppet agent, edit the configuration file in the node.

[main]
server = puppet-master.com
- ``/etc/puppetlabs/puppet/puppet.conf`` for Linux systems
- ``C:\ProgramData\PuppetLabs\puppet\etc\puppet.conf`` for Windows systems

Add the ``server`` setting to the ``[main]`` section of the file. If you have set up your own DNS, replace ``puppet-master`` with the Fully Qualified Domain Name (FQDN) of your Puppet server.

.. code-block:: none
[main]
server = puppet-master
.. note:: The Puppet server FQDN should be resolved by the Puppet agent host.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,13 @@ Replace 2g in the ``JAVA_ARGS`` variable with the amount of memory you want to a
Configuration
-------------

Edit the ``/etc/puppetlabs/puppet/puppet.conf`` file, adding this line to the ``[main]`` section (create the section if it does not exist), and replacing ``puppet,puppet-master`` with your own FQDN:
Edit the ``/etc/puppetlabs/puppet/puppet.conf`` file to configure the Puppet server. Add the following settings to the ``[main]`` section. You need to create the section if it doesn't exist. If you have set up your own DNS, replace ``puppet`` and ``puppet-master`` with your Fully Qualified Domain Names (FQDNs).

::

dns_alt_names = puppet,puppet-master.com

Also add the [server] section with the following content in the ``/etc/puppetlabs/puppet/puppet.conf`` file replacing ``puppet-master`` with your own FQDN:

::

[main]
server = puppet-master.com
.. code-block:: none
[main]
server = puppet-master
dns_alt_names = puppet, puppet-master
.. note:: If you find ``templatedir=$confdir/templates`` in the config file, delete that line. It has been deprecated.

Expand Down
8 changes: 4 additions & 4 deletions source/development/packaging/generate-hpux-package.rst
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ Execute the ``generate_wazuh_packages.sh`` script, with the different options yo
Usage: ./generate_wazuh_packages.sh [OPTIONS]
-e Install all the packages necessaries to build the TAR package
-e Install all the packages necessaries to build the package
-b <branch> Select Git branch. Example v|WAZUH_CURRENT_HPUX|
-s <tar_directory> Directory to store the resulting tar package. By default, an output folder will be created.
-p <tar_home> Installation path for the package. By default: /var
-c, --checksum Compute the SHA512 checksum of the TAR package.
-s <pkg_directory> Directory to store the resulting package. By default, an output folder will be created.
-p <pkg_home> Installation path for the package. By default: /var
-c, --checksum Compute the SHA512 checksum of the package.
-d <path_to_depot>, --depot Change the path to depothelper package (by default current path).
-h Shows this help
Expand Down
2 changes: 1 addition & 1 deletion source/installation-guide/packages-list.rst
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ AIX
HP-UX
^^^^^

.. |HPUX_itanium| replace:: `wazuh-agent-|WAZUH_CURRENT_HPUX|-|WAZUH_REVISION_HPUX|-hpux-11v3-ia64.tar <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_HPUX|/hp-ux/wazuh-agent-|WAZUH_CURRENT_HPUX|-|WAZUH_REVISION_HPUX|-hpux-11v3-ia64.tar>`__ (`sha512 <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_HPUX|/checksums/wazuh/|WAZUH_CURRENT_HPUX|/wazuh-agent-|WAZUH_CURRENT_HPUX|-|WAZUH_REVISION_HPUX|-hpux-11v3-ia64.tar.sha512>`__)
.. |HPUX_itanium| replace:: `wazuh-agent-|WAZUH_CURRENT_HPUX|-|WAZUH_REVISION_HPUX|-hpux-11v3-ia64.tar.gz <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_HPUX|/hp-ux/wazuh-agent-|WAZUH_CURRENT_HPUX|-|WAZUH_REVISION_HPUX|-hpux-11v3-ia64.tar.gz>`__ (`sha512 <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_HPUX|/checksums/wazuh/|WAZUH_CURRENT_HPUX|/wazuh-agent-|WAZUH_CURRENT_HPUX|-|WAZUH_REVISION_HPUX|-hpux-11v3-ia64.tar.gz.sha512>`__)

+-----------------+--------------+-------------------+
| Version | Architecture | Package |
Expand Down
6 changes: 0 additions & 6 deletions source/installation-guide/uninstalling-wazuh/agent.rst
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@ Follow these steps to uninstall the Wazuh agent from your macOS endpoint.
# /bin/rm -r /Library/Ossec
#. Stop and unload dispatcher.

.. code-block:: console
# /bin/launchctl unload /Library/LaunchDaemons/com.wazuh.agent.plist
#. Remove ``launchdaemons`` and ``StartupItems``.

.. code-block:: console
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,20 @@ The installed agent runs on the endpoint you want to monitor and communicates wi

.. note:: You need root user privileges to run all the commands described below.

#. To start the installation process, download the `HP-UX installer <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_HPUX|/hp-ux/wazuh-agent-|WAZUH_CURRENT_HPUX|-|WAZUH_REVISION_HPUX|-hpux-11v3-ia64.tar>`_.
#. To start the installation process, download the `HP-UX installer <https://packages.wazuh.com/|WAZUH_CURRENT_MAJOR_HPUX|/hp-ux/wazuh-agent-|WAZUH_CURRENT_HPUX|-|WAZUH_REVISION_HPUX|-hpux-11v3-ia64.tar.gz>`_.

#. Create the ``wazuh`` user and group.

.. code-block:: console
# groupadd wazuh
# useradd -G wazuh wazuh
#. Uncompress the package in ``/``.

.. code-block:: console
# gzip -d wazuh-agent-|WAZUH_CURRENT_HPUX|-|WAZUH_REVISION_HPUX|-hpux-11v3-ia64.tar.gz
# tar -xvf wazuh-agent-|WAZUH_CURRENT_HPUX|-|WAZUH_REVISION_HPUX|-hpux-11v3-ia64.tar
Expand Down
4 changes: 2 additions & 2 deletions source/integrations-guide/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Elastic, OpenSearch, and Splunk are software platforms designed for search, anal

Up to Wazuh v4.5, the following integrated applications allow users to manage Wazuh and its security data using third-party platforms:

- `Wazuh for Splunk <https://documentation.wazuh.com/4.5/deployment-options/splunk/splunk-app.html>`__
- `Wazuh for Elastic <https://documentation.wazuh.com/4.5/deployment-options/elastic-stack/index.html>`__
- `Wazuh for Splunk – Version 4.5 <https://documentation.wazuh.com/4.5/deployment-options/splunk/splunk-app.html>`__
- `Wazuh for Elastic – Version 4.5 <https://documentation.wazuh.com/4.5/deployment-options/elastic-stack/index.html>`__

However, from version 4.6, we will not develop these integrated applications any longer. We will only support them with critical security updates. In this document, we describe new methods of integrating your Wazuh deployment with the following third-party security platforms:

Expand Down
Loading

0 comments on commit c26e137

Please sign in to comment.