From 159040f1128e8616ac66eccb16481e0fa1533ce6 Mon Sep 17 00:00:00 2001 From: Javier Medeot Date: Wed, 15 May 2024 08:40:56 -0300 Subject: [PATCH 1/5] Add support for v4.7.5 --- CHANGELOG.md | 4 ++++ source/_static/js/redirects.js | 1 + source/_variables/settings.py | 4 ++-- source/release-notes/index-4x.rst | 2 ++ source/release-notes/index.rst | 1 + source/release-notes/release-4-7-5.rst | 18 ++++++++++++++++++ 6 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 source/release-notes/release-4-7-5.rst diff --git a/CHANGELOG.md b/CHANGELOG.md index 7449ca1d33..938f4cfa01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. ## [v4.7.4] +- Support for Wazuh 4.7.5 + +## [v4.7.4] + - Support for Wazuh 4.7.4 ## [v4.7.3] diff --git a/source/_static/js/redirects.js b/source/_static/js/redirects.js index 6fcb299b08..4fb466348e 100644 --- a/source/_static/js/redirects.js +++ b/source/_static/js/redirects.js @@ -72,6 +72,7 @@ newUrls['4.7'] = [ '/release-notes/release-4-7-2.html', '/release-notes/release-4-7-3.html', '/release-notes/release-4-7-4.html', + '/release-notes/release-4-7-5.html', '/cloud-security/azure/posture-management.html', '/cloud-security/gcp/posture-management.html', '/cloud-security/gcp/instances.html', diff --git a/source/_variables/settings.py b/source/_variables/settings.py index 58916f080e..06f8e0a9a1 100644 --- a/source/_variables/settings.py +++ b/source/_variables/settings.py @@ -21,7 +21,7 @@ # The full version, including alpha/beta/rc tags # Important: use a valid branch (4.0) or, preferably, tag name (v4.0.0) -release = '4.7.4' -api_tag = 'v4.7.4' +release = '4.7.5' +api_tag = '4.7.5' apiURL = 'https://raw.githubusercontent.com/wazuh/wazuh/'+api_tag+'/api/api/spec/spec.yaml' diff --git a/source/release-notes/index-4x.rst b/source/release-notes/index-4x.rst index be259f46fa..4c32866119 100644 --- a/source/release-notes/index-4x.rst +++ b/source/release-notes/index-4x.rst @@ -11,6 +11,7 @@ This section summarizes the most important features of each Wazuh 4.x release. ============================================= ==================== Wazuh version Release date ============================================= ==================== +:doc:`4.7.5 ` TBD :doc:`4.7.4 ` 29 April 2024 :doc:`4.7.3 ` 4 March 2024 :doc:`4.7.2 ` 10 January 2024 @@ -65,6 +66,7 @@ Wazuh version Release date .. toctree:: + 4.7.5 Release notes 4.7.4 Release notes 4.7.3 Release notes 4.7.2 Release notes diff --git a/source/release-notes/index.rst b/source/release-notes/index.rst index 0764e3ec53..c5d402e0ba 100644 --- a/source/release-notes/index.rst +++ b/source/release-notes/index.rst @@ -11,6 +11,7 @@ This section summarizes the most important features of each Wazuh release. ============================================== ==================== Wazuh version Release date ============================================== ==================== +:doc:`4.7.5 ` TBD :doc:`4.7.4 ` 29 April 2024 :doc:`4.7.3 ` 4 March 2024 :doc:`4.7.2 ` 10 January 2024 diff --git a/source/release-notes/release-4-7-5.rst b/source/release-notes/release-4-7-5.rst new file mode 100644 index 0000000000..8b2d6c9700 --- /dev/null +++ b/source/release-notes/release-4-7-5.rst @@ -0,0 +1,18 @@ +.. Copyright (C) 2015, Wazuh, Inc. + +.. meta:: + :description: Wazuh 4.7.5 has been released. Check out our release notes to discover the changes and additions of this release. + +4.7.5 Release notes - TBD +========================= + +This section lists the changes in version 4.7.5. Every update of the Wazuh solution is cumulative and includes all enhancements and fixes from previous releases. + +Changelogs +---------- + +More details about these changes are provided in the changelog of each component: + +- `wazuh/wazuh `__ +- `wazuh/wazuh-dashboard `__ +- `wazuh/wazuh-packages `__ From 02600debdd6d1e5be131071e5b709954f3d692ac Mon Sep 17 00:00:00 2001 From: Javier Medeot Date: Wed, 22 May 2024 13:19:15 -0300 Subject: [PATCH 2/5] Merge branch '4.7' into merge-4.7-into-4.7.5 --- source/cloud-service/archive-data/access.rst | 73 ++++++++++++++++---- source/cloud-service/cli/index.rst | 10 ++- 2 files changed, 67 insertions(+), 16 deletions(-) diff --git a/source/cloud-service/archive-data/access.rst b/source/cloud-service/archive-data/access.rst index c2af1f176f..0b7c420d49 100644 --- a/source/cloud-service/archive-data/access.rst +++ b/source/cloud-service/archive-data/access.rst @@ -14,28 +14,29 @@ To access your archive data, you need an AWS token that grants permission on the See the :doc:`Wazuh Cloud CLI ` section to learn how to list and download your archive data automatically. -The following example describes the steps to follow to list the files of your archive data: +Getting your API key and the AWS token +-------------------------------------- +#. Obtain your Wazuh Cloud API key by following the steps outlined in the API :doc:`Authentication ` section. -1. Before your start using the Wazuh Cloud API, you need an API key. To generate your API key, see the :ref:`Authentication ` section. - -2. Use the ``POST /storage/token`` endpoint of the :cloud-api-ref:`Wazuh Cloud API ` to get the AWS token and access the archive data of a specific environment. In this example, we generate an AWS token valid for 3600 seconds for environment `0123456789ab`. +#. Use the :cloud-api-ref:`POST /storage/token ` API endpoint with your key to get a temporary AWS token. For example, the following request generates an AWS token valid for ``3600`` seconds that grants access to the environment archive data with ID ``012345678ab``. .. code-block:: curl -XPOST https://api.cloud.wazuh.com/v2/storage/token -H "x-api-key: " -H "Content-Type: application/json" --data ' { - "environment_cloud_id": "0123456789ab", + "environment_cloud_id": "012345678ab", "token_expiration": "3600" }' .. code-block:: console :class: output + :emphasize-lines: 7-10 { - "environment_cloud_id": "0123456789ab", + "environment_cloud_id": "012345678ab", "aws": { - "s3_path": "wazuh-cloud-cold-us-east-1/0123456789ab", + "s3_path": "wazuh-cloud-cold-us-east-1/012345678ab", "region": "us-east-1", "credentials": { "access_key_id": "mUdT2dBjlHd...Gh7Ni1yZKR5If", @@ -46,19 +47,65 @@ The following example describes the steps to follow to list the files of your ar } } -3. Using the AWS-CLI tool to list the files, add the token to the AWS credentials file ``~/.aws/credentials``. + + +Generating the AWS `wazuh_cloud_storage` profile +------------------------------------------------ + +Add the token to the AWS credentials file ``~/.aws/credentials``. .. code-block:: console + :emphasize-lines: 4 [wazuh_cloud_storage] aws_access_key_id = mUdT2dBjlHd...Gh7Ni1yZKR5If aws_secret_access_key = qEzCk63a224...5aB+e4fC1BR0G aws_session_token = MRg3t7HIuoA...4o4BXSAcPfUD8 -4. Run the following command to list your files. +Listing archive data +--------------------- - .. code-block:: console - - $ aws --profile wazuh_cloud_storage --region us-east-1 s3 ls wazuh-cloud-cold-us-east-1/0123456789ab +This command lists the archive data files of the environment `012345678ab`. + +.. code-block:: console + + # aws --profile wazuh_cloud_storage --region us-east-1 s3 ls --recursive s3://wazuh-cloud-cold-us-east-1/012345678ab/ + +.. code-block:: none + :class: output + + 2024-04-19 17:50:06 493 012345678ab/output/alerts/2024/04/19/012345678ab_output_alerts_20240419T2050_VqaWCpX9oPfDkRpD.json.gz + 2024-04-19 18:00:05 77759 012345678ab/output/alerts/2024/04/19/012345678ab_output_alerts_20240419T2100_kdBY42OvE9QJuiia.json.gz + +Examples +-------- + +Downloading archive data – Multiple files +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This command downloads the archive data files of the environment ``012345678ab`` into the ``/home/test/`` directory. + +.. code-block:: console + + # aws --profile wazuh_cloud_storage --region us-east-1 s3 cp --recursive s3://wazuh-cloud-cold-us-east-1/012345678ab/ /home/test/ + +.. code-block:: none + :class: output + + download: s3://wazuh-cloud-cold-us-east-1/012345678ab/output/alerts/2024/04/19/012345678ab_output_alerts_20240419T2050_VqaWCpX9oPfDkRpD.json.gz to output/alerts/2024/04/19/012345678ab_output_alerts_20240419T2050_VqaWCpX9oPfDkRpD.json.gz + download: s3://wazuh-cloud-cold-us-east-1/012345678ab/output/alerts/2024/04/19/012345678ab_output_alerts_20240419T2100_kdBY42OvE9QJuiia.json.gz to output/alerts/2024/04/19/012345678ab_output_alerts_20240419T2100_kdBY42OvE9QJuiia.json.gz + + +Downloading archive data – Single file +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +This command downloads the ``012345678ab_output_alerts_20240419T2050_VqaWCpX9oPfDkRpD.json.gz`` file of the environment ``012345678ab`` into the directory ``/home/test``. + +.. code-block:: console + + # aws --profile wazuh_cloud_storage --region us-east-1 s3 cp --recursive s3://wazuh-cloud-cold-us-east-1/012345678ab/012345678ab_output_alerts_20240419T2050_VqaWCpX9oPfDkRpD.json.gz /home/test/ + +.. code-block:: none + :class: output -You now have access to your archive data. + download: s3://wazuh-cloud-cold-us-east-1/012345678ab/output/alerts/2024/04/19/012345678ab_output_alerts_20240419T2050_VqaWCpX9oPfDkRpD.json.gz to ./012345678ab_output_alerts_20240419T2050_VqaWCpX9oPfDkRpD.json.gz diff --git a/source/cloud-service/cli/index.rst b/source/cloud-service/cli/index.rst index 452f7723d4..8bc64d68f7 100644 --- a/source/cloud-service/cli/index.rst +++ b/source/cloud-service/cli/index.rst @@ -88,10 +88,14 @@ This command generates an AWS token to access the archive data of the environmen .. code-block:: none :class: output - The following AWS credentials will be valid until 2021-05-07 13:45:24: + Environment Cloud ID: '012345678ab' + Region: 'us-east-1' + S3 path: 'wazuh-cloud-cold-us-east-1/012345678ab' + + The following AWS credentials will be valid until 2024-04-22 13:55:27: [wazuh_cloud_storage] - aws_access_key_id = A...Q - aws_secret_access_key = A...E + aws_access_key_id = A...M + aws_secret_access_key = L...0 aws_session_token = F...Q== Listing archive data From 53814fca51cf07388930da49bd283fdf2f7620f2 Mon Sep 17 00:00:00 2001 From: Javier Medeot Date: Wed, 22 May 2024 13:42:01 -0300 Subject: [PATCH 3/5] Update 4.7.5 release notes --- source/release-notes/release-4-7-5.rst | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/source/release-notes/release-4-7-5.rst b/source/release-notes/release-4-7-5.rst index 8b2d6c9700..894bcc3b7d 100644 --- a/source/release-notes/release-4-7-5.rst +++ b/source/release-notes/release-4-7-5.rst @@ -8,11 +8,21 @@ This section lists the changes in version 4.7.5. Every update of the Wazuh solution is cumulative and includes all enhancements and fixes from previous releases. +What's new +---------- + +This release includes new features or enhancements as the following: + +Wazuh dashboard +^^^^^^^^^^^^^^^ + +- `#6687 `__ Added sanitization to custom branding SVG files. + Changelogs ---------- More details about these changes are provided in the changelog of each component: -- `wazuh/wazuh `__ -- `wazuh/wazuh-dashboard `__ -- `wazuh/wazuh-packages `__ +- `wazuh/wazuh `__ +- `wazuh/wazuh-dashboard `__ +- `wazuh/wazuh-packages `__ From 9acd77e7747edaf7219aad4346e345179c8055c0 Mon Sep 17 00:00:00 2001 From: Javier Medeot Date: Wed, 22 May 2024 15:43:35 -0300 Subject: [PATCH 4/5] Update 4.7.5 release notes --- source/release-notes/release-4-7-5.rst | 32 +++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/source/release-notes/release-4-7-5.rst b/source/release-notes/release-4-7-5.rst index 894bcc3b7d..560f8c5474 100644 --- a/source/release-notes/release-4-7-5.rst +++ b/source/release-notes/release-4-7-5.rst @@ -1,7 +1,7 @@ .. Copyright (C) 2015, Wazuh, Inc. .. meta:: - :description: Wazuh 4.7.5 has been released. Check out our release notes to discover the changes and additions of this release. + :description: Wazuh 4.7.5 has been released. Check out our release notes to discover the changes and additions of this release. 4.7.5 Release notes - TBD ========================= @@ -13,11 +13,41 @@ What's new This release includes new features or enhancements as the following: +Wazuh manager +^^^^^^^^^^^^^ + +- `#23441 `__ Added a database endpoint to recalculate the hash of agent groups. + Wazuh dashboard ^^^^^^^^^^^^^^^ - `#6687 `__ Added sanitization to custom branding SVG files. +Resolved issues +--------------- + +This release resolves known issues as the following: + +Wazuh manager +^^^^^^^^^^^^^ + +=========================================================== ============= + Reference Description +=========================================================== ============= +`#23447 `__ Fixed an issue in a cluster task where full group synchronization was constantly triggered. +`#23216 `__ Fixed race condition when creating agent database files from a template. +=========================================================== ============= + +Wazuh agent +^^^^^^^^^^^ + +=========================================================== ============= + Reference Description +=========================================================== ============= +`#23468 `__ Fixed segmentation fault in the logcollector multiline-regex configuration. +`#23543 `__ Fixed crash in FIM module when processing paths with non UTF-8 characters. +=========================================================== ============= + Changelogs ---------- From 47fc2e5be10034be361306613aed5b3185e4f0e8 Mon Sep 17 00:00:00 2001 From: Javier Medeot Date: Wed, 22 May 2024 15:57:15 -0300 Subject: [PATCH 5/5] Fix documentation changelog title --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 938f4cfa01..02169af073 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # Change Log All notable changes to this project will be documented in this file. -## [v4.7.4] +## [v4.7.5] - Support for Wazuh 4.7.5