Merge pull request #7053 from wazuh/merge-4.7-into-4.7.3

Merge 4.7 into 4.7.3
wazuh · Feb 21, 2024 · e757d42 · e757d42
2 parents 561cc4a + 1ecb5a1
commit e757d42
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/source/cloud-security/gcp/posture-management.rst b/source/cloud-security/gcp/posture-management.rst
@@ -131,6 +131,10 @@ Configure the Wazuh server to receive logs from GCP by performing the following
    -  ``<PROJECT_ID>`` is the ID of the `GCP project`_ created above.
    -  ``<SUBSCRIPTION_NAME>`` is the `subscription ID`_ of your GCP Pub/Sub.
 
+   .. note::
+
+      The Wazuh GCP module supports only one ``gcp-pubsub`` section per :ref:`Wazuh configuration file <reference_ossec_conf>`. To configure more than one service, you need to deploy multiple agents.
+
 #. Create a rule file ``gcp_posture.xml`` in the ``/var/ossec/etc/rules/`` directory and add the following custom rules to detect GCP posture findings:
 
    .. code-block:: xml

diff --git a/source/user-manual/capabilities/sec-config-assessment/available-sca-policies.rst b/source/user-manual/capabilities/sec-config-assessment/available-sca-policies.rst
@@ -57,6 +57,8 @@ The table below shows SCA policies pre-installed in Wazuh out-of-the-box. The Wa
     +-----------------------------+------------------------------------------------------------+-------------------------------+
     | cis_debian11                |  CIS Benchmark for Debian/Linux 11                         | Debian 11                     |
     +-----------------------------+------------------------------------------------------------+-------------------------------+
+    | cis_debian12                |  CIS Benchmark for Debian/Linux 12                         | Debian 12                     |
+    +-----------------------------+------------------------------------------------------------+-------------------------------+
     | cis_ubuntu14-04             |  CIS Checks for Ubuntu Linux 14.04 LTS                     | Ubuntu 14.04                  |
     +-----------------------------+------------------------------------------------------------+-------------------------------+
     | cis_ubuntu16-04             |  CIS Checks for Ubuntu Linux 16.04 LTS                     | Ubuntu 16.04                  |

diff --git a/source/user-manual/reference/ossec-conf/gcp-pubsub.rst b/source/user-manual/reference/ossec-conf/gcp-pubsub.rst
@@ -13,7 +13,11 @@ gcp-pubsub
 		<gcp-pubsub>
 		</gcp-pubsub>
 
-   This configuration section is used to configure the Google Cloud Pub/Sub module.
+This configuration section is used to configure the Google Cloud Pub/Sub module.
+
+.. note::
+
+   The Wazuh GCP module supports only one ``gcp-pubsub`` section per :ref:`Wazuh configuration file <reference_ossec_conf>`. To configure more than one service, you need to deploy multiple agents.
 
 .. topic:: Main options:
 

diff --git a/source/user-manual/user-administration/rbac.rst b/source/user-manual/user-administration/rbac.rst
@@ -339,7 +339,7 @@ To map the user with Wazuh, follow these steps:
 #. Click **Create Role mapping** and complete the empty fields with the requested information.
 
       - **Role mapping name**: Assign a name to the role mapping.
-      - **Roles**: Select the role created previously and  the ``cluster_readonly`` role. This role assigns the user basic configuration reading permissions.
+      - **Roles**: Select the role created previously, for example ``Team_A_role``, and the ``cluster_readonly`` role. The latter assigns the user basic configuration reading permissions.
       - **Internal users**: Select the internal user created previously.
 
        .. thumbnail:: /images/manual/user-administration/rbac/create-new-role-mapping.png