Merge pull request #6997 from wazuh/merge-4.8.2-into-master

Merge 4.8.2 into master

CHANGELOG.md

@@ -56,6 +56,16 @@ All notable changes to this project will be documented in this file.
 - Updated Filebeat module revision to `0.4`. ([#6861](https://github.com/wazuh/wazuh-documentation/pull/6861))
 - Updated AWS, Azure, and GCP cloud security dependency installation steps. ([#6847](https://github.com/wazuh/wazuh-documentation/pull/6847))
 - Updated the vulnerability detection (VD) sections following the VD module refactor. ([#6792](https://github.com/wazuh/wazuh-documentation/pull/6792))
+- Updated screenshot and module reference from **Security events** to **Threat Hunting** in Amazon Security Lake section. ([#6956](https://github.com/wazuh/wazuh-documentation/pull/6956))
+- Improved steps in the Google Cloud Platform prerequisites section. ([#6964](https://github.com/wazuh/wazuh-documentation/pull/6964))
+
+### Fixed
+
+- Added the ``wazuh::repo`` class in Puppet manifest example in install Wazuh agent via Puppet section. ([#6954](https://github.com/wazuh/wazuh-documentation/pull/6954))
+- Added the ``-i`` option to the cluster initialization command in the offline installation guide. ([#6945](https://github.com/wazuh/wazuh-documentation/pull/6945))
+- 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))
 
 ### Removed
 

requirements.txt

@@ -4,6 +4,6 @@ sphinxcontrib-applehelp==1.0.4
 sphinxcontrib-htmlhelp==2.0.1
 docutils==0.18.1
 jsmin==3.0.1
-Jinja2==3.1.2
+Jinja2==3.1.3
 Pygments==2.15.1
 sphinx-reredirects==0.1.2

source/_static/js/redirects.js

@@ -101,6 +101,7 @@ removedUrls['4.9'] = [
 
 newUrls['4.8'] = [
   '/release-notes/release-4-8-0.html',
+  '/release-notes/release-4-8-1.html',
   '/release-notes/release-4-8-2.html',
 ];
 
@@ -143,6 +144,26 @@ newUrls['4.7'] = [
   '/release-notes/release-4-7-2.html',
   '/cloud-security/azure/posture-management.html',
   '/cloud-security/gcp/posture-management.html',
+  '/cloud-service/archive-data/index.html',
+  '/cloud-service/archive-data/access.html',
+  '/cloud-service/archive-data/configuration.html',
+  '/cloud-service/archive-data/filename-format.html',
+  '/cloud-service/getting-started/enroll-agents.html',
+  '/cloud-service/your-environment/limits.html',
+  '/cloud-service/your-environment/settings.html',
+  '/user-manual/capabilities/malware-detection/osquery.html',
+];
+
+/* Pages no longer available in 4.7 */
+
+
+removedUrls['4.7'] = [
+  '/cloud-service/cold-storage/index.html',
+  '/cloud-service/cold-storage/access.html',
+  '/cloud-service/cold-storage/configuration.html',
+  '/cloud-service/cold-storage/filename-format.html',
+  '/cloud-service/getting-started/register-agents.html',
+  '/user-manual/capabilities/osquery.html',
 ];
 
 /* *** RELEASE 4.6 ****/

source/_variables/redirect_same_release.py

@@ -3,6 +3,20 @@
 # Important: the redirect is relative to the old path
 
 redirectSameRelease = {
+  '4.7': {
+    '/cloud-service/cold-storage/index.html':
+      '/cloud-service/archive-data/index.html',
+    '/cloud-service/cold-storage/access.html':
+      '/cloud-service/archive-data/access.html',
+    '/cloud-service/cold-storage/configuration.html':
+      '/cloud-service/archive-data/configuration.html',
+    '/cloud-service/cold-storage/filename-format.html':
+      '/cloud-service/archive-data/filename-format.html',
+    '/cloud-service/getting-started/register-agents.html':
+      '/cloud-service/getting-started/enroll-agents.html',
+    '/user-manual/capabilities/osquery.html':
+      '/user-manual/capabilities/malware-detection/osquery.html',
+  },
   '4.6': {
     '/cloud-security/azure/activity-services/active-directory/index.html':
       '/cloud-security/azure/activity-services/entra/index.html',

source/cloud-security/amazon/services/supported-services/security-lake.rst

@@ -219,7 +219,7 @@ More information about the different authentication methods can be found in the
 Visualizing alerts in Wazuh dashboard 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Once you set the configuration and restart the manager, you can visualize the Amazon Security Lake alerts in the Wazuh dashboard. To do this, go to the **Security events** module. Apply the filter ``rule.groups: amazon_security_lake`` for an easier visualization.
+Once you set the configuration and restart the manager, you can visualize the Amazon Security Lake alerts in the Wazuh dashboard. To do this, go to the **Threat Hunting** module. Apply the filter ``rule.groups: amazon_security_lake`` for an easier visualization.
 
     .. thumbnail:: /images/aws/security-lake-1.png
       :align: center

source/cloud-security/gcp/prerequisites/credentials.rst

@@ -48,7 +48,12 @@ Within the **Service Accounts** section, create a new service account and add th
 Creating a private key
 ----------------------
 
-After creating a service account, add a new key to it. To do this, click **Create Key**, select  **JSON**, and click **Create** to complete the action.
+After creating a service account, add a new key to it following these steps:
+
+#. Go to the **KEYS** tab.
+#. Click on the **ADD KEY** dropdown menu and select **Create new key**.
+#. For the key type, select **JSON**.
+#. Click on **Create**.
 
 .. thumbnail:: /images/cloud-security/gcp/gcp-account-key.png
     :align: center

source/cloud-security/gcp/prerequisites/pubsub.rst

@@ -17,14 +17,26 @@ In this section, we see how to create a topic, a subscription, and a sink to ful
 Create a topic
 --------------
 
-Every publishing application sends messages to topics. Wazuh will retrieve the logs from this topic.
+Every publishing application sends messages to topics. To create a topic, follow these steps. Wazuh will retrieve logs from this topic.
+
+#. Go to the **Pub/Sub** service.
+#. Click on **CREATE TOPIC**.
+#. Set a **Topic ID** and click **CREATE**.
+
+.. note::
+
+    Leave the **Add a default subscription** box checked to create a default subscription associated with this topic. To create a customized one, uncheck it and go to the next section.
 
 .. thumbnail:: /images/cloud-security/gcp/gcp-topic.png
     :align: center
     :width: 100%
 
-Create a subscription
----------------------
+Create a custom subscription
+----------------------------
+
+.. note::
+
+    If you selected to create a default subscription in the step above, you can skip this section.
 
 Follow the steps below to fill in the **Create subscription** form:
 

source/cloud-service/account-billing/billing-faq.rst

@@ -14,6 +14,8 @@ Billing FAQ
 
 - `Where can I see the next payment for an environment?`_
 
+- `What happens to my payments if I want to upgrade or downgrade a setting?`_
+
 - `How do I view previous receipts and billing history?`_
 
 - `How can I configure who receives receipts and billing notifications?`_
@@ -34,17 +36,22 @@ Each environment is charged monthly, according to the environment's beginning da
 Is my credit card information safe?
 -----------------------------------
 
-Your credit card information is sent securely to our billing provider, `Stripe <https://stripe.com>`_, and stored with them.
+Your credit card information is sent securely to our billing provider, `Stripe <https://stripe.com>`_, and stored there.
 
 Where can I see the next payment for an environment?
 ----------------------------------------------------
 
-Go to :doc:`See your billing cycle and history </cloud-service/account-billing/billing-history>` section to learn how to view the billing details of your environments.
+Go to the :doc:`See your billing cycle and history </cloud-service/account-billing/billing-history>` section to learn how to view the billing details of your environments.
+
+What happens to my payments if I want to upgrade or downgrade a setting?
+------------------------------------------------------------------------
+
+If you choose to upgrade a setting, you need to make an immediate prorated payment. The upgrade becomes effective immediately, albeit leading to an increased price for your environment. Conversely, when downgrading a setting, the change takes effect in the subsequent billing cycle, with your price adjusted accordingly. See *Adjusting environment settings* for further details.
 
 How do I view previous receipts and billing history?
 ----------------------------------------------------
 
-Go to :doc:`See your billing cycle and history </cloud-service/account-billing/billing-history>` section to learn how to download the overview of all invoices issued for your account.
+Go to the :doc:`See your billing cycle and history </cloud-service/account-billing/billing-history>` section to learn how to download an overview of all invoices issued for your account.
 
 How can I configure who receives receipts and billing notifications?
 --------------------------------------------------------------------
@@ -55,7 +62,7 @@ Go to :doc:`Update billing and operational contacts </cloud-service/account-bill
 What are the available payment methods on Wazuh Cloud?
 --------------------------------------------------------------
 
-Credit or debit card payment is supported. To learn more about Wazuh supported cards, see the certified payment processor list of card brands in the `Stripe documentation <https://stripe.com/docs/payments/cards/supported-card-brands>`_.
+Credit or debit card payments are supported. To learn more about Wazuh supported cards, see the certified payment processor list of card brands in the `Stripe documentation <https://stripe.com/docs/payments/cards/supported-card-brands>`_.
 
 
 Can I get a refund?
@@ -66,7 +73,7 @@ Charges are nonrefundable, but if you want to cease using an environment, you ca
 What is included in my Wazuh Cloud environment?
 -----------------------------------------------
 
-A full set-up of Wazuh, according to your tier, and a standard or premium support service.
+A full set-up of Wazuh, according to your setting, and a standard or premium support service.
 
 How can I request more information?
 -----------------------------------

source/cloud-service/account-billing/billing-history.rst

@@ -8,17 +8,17 @@
 See your billing cycle and history
 ==================================
 
-Information about your current billing cycle, outstanding payments, and billing receipts are available from the Wazuh Cloud Console. The billing cycle is the period between the last billing date and the current billing date, while your billing history shows an overview of all invoices issued for your account.
+Information about your current billing cycle, outstanding payments, and billing receipts is available from the Wazuh Cloud Console. The billing cycle is the period between the last billing date and the current billing date, while your billing history shows an overview of all invoices issued for your account.
 
 To see your current billing cycle information:
 
 1. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
-2. Go to the **Account** section and select **Summary**.
+2. Go to the **Account** section and select **Summary** under **Billing**.
 
-  You can see the details about the upcoming billing for your active environments under the Current billing cycle.
+  You can see the details about the upcoming billing for your active environments under the current billing cycle.
 
 To see your billing history:
 
 1. Log in to the `Wazuh Cloud Console <https://console.cloud.wazuh.com/>`_.
-2. Go to the **Account** section and select **Billing**.
+2. Go to the **Account** section, select **Billing** and select **Invoices**.
 3. Click the invoice to download a PDF with your billing history details.