Skip to content

Commit 9f6c6df

Browse files
committed
Merge branch '4.12' into merge-4.12-into-4.13.0
2 parents 9a9e548 + ee87c9c commit 9f6c6df

File tree

30 files changed

+1013
-1098
lines changed

30 files changed

+1013
-1098
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ All notable changes to this project will be documented in this file.
6868
- **Post-release**: Updated the vulnerability detection capability section. ([#8693](https://github.com/wazuh/wazuh-documentation/pull/8693))
6969
- **Post-release**: Changed the warning note on using the `$` and `&` characters when changing passwords in Docker deployments. ([#8694](https://github.com/wazuh/wazuh-documentation/pull/8694))
7070
- **Post-release**: Changed Windows commands in the backup guide to PowerShell. ([#8761](https://github.com/wazuh/wazuh-documentation/pull/8761))
71+
- **Post-release**: Updated 4.12.0 command output examples. ([#8779](https://github.com/wazuh/wazuh-documentation/pull/8779)) ([#8780](https://github.com/wazuh/wazuh-documentation/pull/8780))
72+
- **Post-release**: Updated the *Deployment on Docker* documentation. ([#8793](https://github.com/wazuh/wazuh-documentation/pull/8793))
7173

7274
### Fixed
7375

@@ -80,6 +82,10 @@ All notable changes to this project will be documented in this file.
8082
- **Post-release**: Fixed incorrect URL and filepaths in the YARA download steps of the *Leveraging LLMs for Alert Enrichment* PoC. ([#8686](https://github.com/wazuh/wazuh-documentation/pull/8686))
8183
- **Post-release**: Corrected inaccurate references to the Wazuh Syscollector module. ([#8713](https://github.com/wazuh/wazuh-documentation/pull/8713))
8284

85+
### Removed
86+
87+
- **Post-release**: Removed `us-gov-*` AWS regions references. ([#8791](https://github.com/wazuh/wazuh-documentation/pull/8791))
88+
8389
## [v4.11.2]
8490

8591
### Added

source/_static/js/redirects.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ newUrls['4.12'] = [
8888
'/development/packaging/generate-server-package.html',
8989
'/development/packaging/generate-agent-package.html',
9090
'/cloud-service/ai-analyst.html',
91+
'/deployment-options/docker/prerequisites.html',
92+
'/deployment-options/docker/build-docker-images-locally.html',
9193
]
9294
/* Redirections from 4.9 to 4.10 */
9395

@@ -137,6 +139,11 @@ redirections.push(
137139
'4.11': '/user-manual/capabilities/vulnerability-detection/offline-update.html',
138140
'4.12': '/user-manual/capabilities/vulnerability-detection/configuring-scans.html#offline-vulnerability-detection',
139141
},
142+
{
143+
'target': ['4.11=>4.12', '4.12=>4.11'],
144+
'4.11': '/deployment-options/docker/wazuh-container.html#build-docker-images-locally',
145+
'4.12': '/deployment-options/docker/build-docker-images-locally.html',
146+
},
140147
);
141148

142149
/* Pages no longer available in 4.12 */
@@ -150,6 +157,8 @@ removedUrls['4.12'] = [
150157
'/development/packaging/generate-hpux-package.html',
151158
'/development/packaging/generate-wpk-package.html',
152159
'/user-manual/capabilities/vulnerability-detection/offline-update.html',
160+
'/deployment-options/docker/docker-installation.html',
161+
'/deployment-options/docker/faq-wazuh-container.html',
153162
];
154163

155164
/* *** RELEASE 4.11 ****/
@@ -295,6 +304,7 @@ newUrls['4.10'] = [
295304
'/release-notes/release-4-10-0.html',
296305
'/release-notes/release-4-10-1.html',
297306
'/release-notes/release-4-10-2.html',
307+
'/release-notes/release-4-10-3.html',
298308
'/user-manual/reference/ossec-conf/anti-tampering.html',
299309
'/user-manual/capabilities/vulnerability-detection/troubleshooting.html',
300310
'/user-manual/capabilities/vulnerability-detection/FAQ.html',

source/cloud-security/amazon/services/prerequisites/considerations.rst

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If the S3 bucket contains a long history of logs and its directory structure is
2323

2424
- ``only_logs_after``: Allows filtering logs produced after a given date. The date format must be ``YYYY-MMM-DD``. For example, ``2018-AUG-21`` would filter logs generated on or after the 21st of August 2018.
2525
- ``aws_account_id``: This option will only work on CloudTrail, VPC, and Config buckets. If you have logs from multiple accounts, you can filter which ones will be read by Wazuh. You can specify multiple IDs separating them by commas.
26-
- ``regions``: This option will only work on CloudTrail, VPC, Config buckets, and Inspector service. If you have logs from multiple regions, you can filter which ones will be read by Wazuh. You can specify multiple regions separating them by commas. It is mandatory to specify the region when configuring an S3 bucket from an AWS GovCloud region (available GovCloud regions are ``us-gov-east-1`` and ``us-gov-west-1``).
26+
- ``regions``: Works only with CloudTrail, VPC, Config buckets, and Inspector service. Use it to filter which regions Wazuh reads when you have logs from multiple regions. Separate multiple regions with commas.
2727
- ``path``: If your logs are stored in a given path in an S3 bucket, this option can be specified. For example, to read logs stored in the directory ``vpclogs/``, it is necessary to specify the path ``vpclogs`` in the Wazuh module for AWS configuration. It can also be specified with ``/`` or ``\``.
2828
- ``aws_organization_id``: This option will only work on CloudTrail buckets. If you have configured an organization, you need to specify the name of the AWS organization by using this parameter.
2929

@@ -245,20 +245,12 @@ Below is an example of different AWS services configuration:
245245
<aws_profile>default</aws_profile>
246246
</bucket>
247247
248-
<!-- CloudTrail, 'gov1' profile, and 'us-gov-east-1' GovCloud region -->
248+
<!-- CloudTrail, 'dev' profile, and 'us-east-1' region -->
249249
<bucket type="cloudtrail">
250250
<name><WAZUH_AWS_BUCKET></name>
251-
<path>cloudtrail-govcloud</path>
252-
<regions>us-gov-east-1</regions>
253-
<aws_profile>gov1</aws_profile>
254-
</bucket>
255-
256-
<!-- CloudTrail, 'gov2' profile, and 'us-gov-west-1' GovCloud region -->
257-
<bucket type="cloudtrail">
258-
<name><WAZUH_AWS_BUCKET></name>
259-
<path>cloudtrail-govcloud</path>
260-
<regions>us-gov-west-1</regions>
261-
<aws_profile>gov2</aws_profile>
251+
<path>dev-cloudtrail</path>
252+
<regions>us-east-1</regions>
253+
<aws_profile>dev</aws_profile>
262254
</bucket>
263255
264256
</wodle>
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
.. Copyright (C) 2015, Wazuh, Inc.
2+
3+
.. meta::
4+
:description: You can modify and build Docker images for the Wazuh central components. Learn more in this section of the documentation.
5+
6+
Build Docker images locally
7+
===========================
8+
9+
You can modify and build Docker images for the Wazuh central components (manager, indexer, and dashboard).
10+
11+
#. Clone the `Wazuh Docker repository <https://github.com/wazuh/wazuh-docker>`_ to your system:
12+
13+
.. code-block:: console
14+
15+
# git clone https://github.com/wazuh/wazuh-docker.git -b v|WAZUH_CURRENT_DOCKER|
16+
17+
#. Navigate to the ``wazuh-docker/build-docker-images/`` directory and run the build script:
18+
19+
.. code-block:: console
20+
21+
# build-docker-images/build-images.sh
22+
23+
This generates updated Docker images for all Wazuh components on your local system.
Lines changed: 94 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
.. Copyright (C) 2015, Wazuh, Inc.
22
33
.. meta::
4-
:description: Check the tasks that help you benefit the most from the installation of Wazuh after the installation of the Wazuh-Docker.
4+
:description: Perform several tasks to manage and customize your installation after deploying Wazuh with Docker.
55

66
Wazuh Docker utilities
77
======================
88

9-
After installing the Wazuh Docker containers, there are several tasks you can do to benefit the most from your Wazuh installation.
10-
11-
The Wazuh components are deployed as separate containers, each built from its corresponding Docker image. Access each container using the service names defined in the ``docker-compose.yml`` file specific to your deployment type.
9+
After deploying Wazuh with Docker, you can perform several tasks to manage and customize your installation. Wazuh components are deployed as separate containers built from their corresponding Docker image. You can access these containers using the service names defined in your ``docker-compose.yml`` file, which are specific to your deployment type.
1210

1311
Access to services and containers
1412
---------------------------------
1513

1614
This section explains how to interact with your Wazuh deployment by accessing service logs and shell instances of running containers.
1715

18-
#. Access the Wazuh dashboard using the Docker host IP address. For example, ``https://localhost``, if you are on the Docker host.
19-
20-
.. note::
21-
22-
If you use a self-signed certificate, your browser will warn you that it cannot verify its authenticity.
23-
24-
#. Enroll agents through the :ref:`Wazuh agent Docker deployment <agent_docker>` or the standard :doc:`Wazuh agent enrollment </user-manual/agent/agent-enrollment/index>` process. When enrolling, use the Docker host address as the Wazuh manager address.
25-
16+
#. Access the Wazuh dashboard using the Docker host IP address.
17+
#. Enroll agents through the standard :doc:`Wazuh agent enrollment </user-manual/agent/agent-enrollment/index>` process. Use the Docker host address as the Wazuh manager address.
2618
#. List the containers in the directory where the Wazuh ``docker-compose.yml`` file is located:
2719

2820
.. code-block:: console
@@ -37,43 +29,112 @@ This section explains how to interact with your Wazuh deployment by accessing se
3729
single-node-wazuh.indexer-1 "/entrypoint.sh open…" wazuh.indexer running 0.0.0.0:9200->9200/tcp
3830
single-node-wazuh.manager-1 "/init" wazuh.manager running 0.0.0.0:1514-1515->1514-1515/tcp, 0.0.0.0:514->514/udp, 0.0.0.0:55000->55000/tcp, 1516/tcp
3931
40-
#. Run the command below from the directory where the ``docker-compose.yml`` file is located to access the command line of each container:
32+
#. Run the command below from the directory where the ``docker-compose.yml`` file is located to open a shell inside the container:
4133

4234
.. code-block:: console
4335
4436
# docker-compose exec <SERVICE> bash
4537
38+
Tuning Wazuh services
39+
---------------------
40+
41+
You can tune the Wazuh indexer and Wazuh dashboard by replacing their default configuration with custom parameters. This allows you to adjust performance settings, change the dashboard interface, or override default options.
42+
43+
Tuning the Wazuh indexer
44+
^^^^^^^^^^^^^^^^^^^^^^^^
45+
46+
The Wazuh indexer uses a default internal configuration that is not exposed by default. Follow the steps below to override the default configuration:
47+
48+
#. Create a new configuration file:
49+
50+
.. code-block:: none
51+
52+
# touch config/wazuh_indexer/<new_wazuh_indexer>.yml
53+
54+
Replace ``<new_wazuh_indexer>`` with your new service name.
55+
56+
#. Map your configuration file inside the container in the ``docker-compose.yml`` file. Update the Wazuh indexer container declaration to:
57+
58+
.. code-block:: yaml
59+
:emphasize-lines: 4,5,7
60+
61+
<new_wazuh_indexer>:
62+
image: wazuh/wazuh-indexer:latest
63+
ports:
64+
- "9200:9200"
65+
- "9300:9300"
66+
environment:
67+
ES_JAVA_OPTS: "-Xms6g -Xmx6g"
68+
networks:
69+
- docker_wazuh
70+
71+
Tuning the Wazuh dashboard
72+
^^^^^^^^^^^^^^^^^^^^^^^^^^
73+
74+
The Wazuh dashboard reads its configuration from ``config/wazuh_dashboard/opensearch_dashboards.yml``. Edit this file to customize the Wazuh dashboard with your desired settings. After making changes, restart the Wazuh Docker container for the updates to take effect.
75+
76+
Refer to the OpenSearch documentation on `Modifying the YAML files <https://docs.opensearch.org/latest/security/configuration/yaml/>`__ for details about the available variables you can override in this configuration.
77+
4678
Wazuh service data volumes
4779
--------------------------
4880

4981
You can set Wazuh configuration and log files to exist outside their containers. This allows the files to persist after containers are removed, and you can provision custom configuration files to your containers.
5082

51-
You need multiple volumes to ensure persistence on a Wazuh container. The following is an example of a ``docker-compose.yml`` with persistent volumes:
83+
Adding a persistent volume
84+
^^^^^^^^^^^^^^^^^^^^^^^^^^
5285

53-
.. code-block:: yaml
54-
:emphasize-lines: 4-5,7-8
86+
You need multiple volumes to ensure persistence on a Wazuh container. Here’s an example of defining a persistent volume in your ``docker-compose.yml`` file:
87+
88+
.. code-block:: console
89+
:emphasize-lines: 4,5,7,8
5590
5691
services:
57-
wazuh:
92+
wazuh.manager:
5893
. . .
5994
volumes:
6095
- wazuh_api_configuration:/var/ossec/api/configuration
61-
96+
. . .
6297
volumes:
6398
wazuh_api_configuration:
6499
65-
You can list persistent volumes with ``docker volume ls``:
100+
Listing existing volumes
101+
^^^^^^^^^^^^^^^^^^^^^^^^
102+
103+
Run the following to see the persistent volumes on your Docker host:
104+
105+
.. code-block:: console
106+
107+
# docker volume ls
66108
67109
.. code-block:: none
68110
:class: output
69111
70-
DRIVER VOLUME NAME
71-
local single-node_wazuh_api_configuration
112+
DRIVER VOLUME NAME
113+
local single-node_wazuh_api_configuration
114+
115+
Wazuh indexer volumes
116+
^^^^^^^^^^^^^^^^^^^^^
117+
118+
By default, single‑node and multi‑node deployments include preconfigured volumes for the Wazuh indexer.
119+
120+
For example, in a multi-node deployment, the ``wazuh1.indexer`` service uses the following volume (as defined in ``wazuh-docker/multi-node/docker-compose.yml``):
121+
122+
.. code-block:: yaml
123+
:emphasize-lines: 4
124+
125+
wazuh1.indexer:
126+
...
127+
volumes:
128+
- wazuh-indexer-data-1:/var/lib/wazuh-indexer
129+
130+
This ensures that Wazuh indexer data remains available even if the container is restarted or rebuilt.
72131

73132
Storage volume for Wazuh indexer and dashboard
74133
----------------------------------------------
75134

76-
Attaching a volume for the storage of Wazuh indexer data is also possible. By default, the single-node and multi-node deployments already have volumes configured. An example of a single-node wazuh indexer volume is shown in the ``docker-compose.yml`` below:
135+
You can also attach volumes to store Wazuh indexer data. By default, single‑node and multi‑node Docker deployments include preconfigured volumes.
136+
137+
The example below shows a single-node Wazuh indexer volume in the ``docker-compose.yml`` file:
77138

78139
.. code-block:: yaml
79140
@@ -87,17 +148,16 @@ Attaching a volume for the storage of Wazuh indexer data is also possible. By de
87148
volumes:
88149
wazuh-indexer-data
89150
90-
91151
Custom commands and scripts
92152
---------------------------
93153

94-
To execute commands in the Wazuh manager container, you can execute a shell:
154+
Run the command below to execute commands inside the containers. We use the Wazuh manager ``single-node-wazuh.manager-1`` container in this example:
95155

96156
.. code-block:: console
97157
98158
# docker exec -it single-node-wazuh.manager-1 bash
99159
100-
Every change made on this shell persists if you have the data volumes configured correctly.
160+
Every change made on this shell persists if you properly configure data volumes.
101161

102162
Modifying the Wazuh configuration file
103163
--------------------------------------
@@ -112,24 +172,23 @@ To customize the Wazuh configuration file ``/var/ossec/etc/ossec.conf``, modify
112172
113173
#. The following are the locations of the Wazuh configuration files on the Docker host that you can modify:
114174

115-
- **Single-node deployment**:
116-
117-
``wazuh-docker/single-node/config/wazuh-cluster/wazuh_manager.config``
175+
.. tabs::
118176

119-
- **Multi-node deployment**:
177+
.. group-tab:: Single-node deployment
120178

121-
- Manager: ``wazuh-docker/multi-node/config/wazuh-cluster/wazuh_manager.config``
179+
``wazuh-docker/single-node/config/wazuh_cluster/wazuh_manager.conf``
122180

123-
- Worker: ``wazuh-docker/multi-node/config/wazuh-cluster/wazuh_worker.config``
181+
.. group-tab:: Multi-node deployment
124182

125-
- **Wazuh agent container**:
183+
- **Manager**: ``wazuh-docker/multi-node/config/wazuh_cluster/wazuh_manager.conf``
184+
- **Worker**: ``wazuh-docker/multi-node/config/wazuh_cluster/wazuh_worker.conf``
126185

127-
``wazuh-docker/wazuh-agent/config/wazuh-agent-config``
186+
Save the changes in the configuration files.
128187

129-
#. After saving the changes in the configuration files, restart the environment:
188+
#. Restart the stack:
130189

131190
.. code-block:: console
132191
133192
# docker-compose up -d
134193
135-
These files are mounted into the container at runtime (``/wazuh-config-mount/etc/ossec.conf``), ensuring your changes take effect when the containers start.
194+
These files are mounted into the container at runtime (``/wazuh-config-mount/etc/ossec.``), ensuring your changes take effect when the containers start.

0 commit comments

Comments
 (0)