Merge branch '4.10' into merge-4.10-into-4.11.0

wazuh · Jan 24, 2025 · c804bf6 · c804bf6
2 parents 749bd05 + b5bc423
commit c804bf6
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 0 deletions.
diff --git a/resources/dashboards/MS-graph Intune events.ndjson b/resources/dashboards/MS-graph Intune events.ndjson
diff --git a/resources/dashboards/MS-graph Intune managed devices and apps.ndjson b/resources/dashboards/MS-graph Intune managed devices and apps.ndjson
diff --git a/source/_templates/installations/disable-wazuh-updates.rst b/source/_templates/installations/disable-wazuh-updates.rst
@@ -0,0 +1,26 @@
+.. Copyright (C) 2015, Wazuh, Inc.
+
+.. note::
+
+   **Recommended Action**: Disable Wazuh Updates.
+
+   We recommend disabling the Wazuh package repositories after installation to prevent accidental upgrades that could break the environment.
+
+   Execute the following command to disable the Wazuh repository:
+
+   .. tabs::
+
+      .. group-tab:: YUM
+
+         .. code-block:: console
+
+            # sed -i "s/^enabled=1/enabled=0/" /etc/yum.repos.d/wazuh.repo
+
+      .. group-tab:: APT (Debian/Ubuntu)
+
+         .. code-block:: console
+
+            # sed -i "s/^deb /#deb /" /etc/apt/sources.list.d/wazuh.list
+            # apt update
+
+.. End of include file
diff --git a/source/installation-guide/wazuh-dashboard/installation-assistant.rst b/source/installation-guide/wazuh-dashboard/installation-assistant.rst
@@ -55,6 +55,7 @@ Wazuh dashboard installation
 
    When you access the Wazuh dashboard for the first time, the browser shows a warning message stating that the certificate was not issued by a trusted authority. An exception can be added in the advanced options of the web browser. For increased security, the ``root-ca.pem`` file previously generated can be imported to the certificate manager of the browser instead. Alternatively, a certificate from a trusted authority can be configured. 
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
 
 Next steps
 ----------

diff --git a/source/installation-guide/wazuh-dashboard/step-by-step.rst b/source/installation-guide/wazuh-dashboard/step-by-step.rst
@@ -120,6 +120,8 @@ Starting the Wazuh dashboard service
 
    When you access the Wazuh dashboard for the first time, the browser shows a warning message stating that the certificate was not issued by a trusted authority. An exception can be added in the advanced options of the web browser. For increased security, the ``root-ca.pem``  file previously generated can be imported to the certificate manager of the browser. Alternatively, a certificate from a trusted authority can be configured.
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
+
 Securing your Wazuh installation
 --------------------------------
 

diff --git a/source/installation-guide/wazuh-indexer/installation-assistant.rst b/source/installation-guide/wazuh-indexer/installation-assistant.rst
@@ -156,6 +156,8 @@ Testing the cluster installation
 
       # curl -k -u admin:<ADMIN_PASSWORD> https://<WAZUH_INDEXER_IP>:9200/_cat/nodes?v
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
+
 Next steps
 ----------
 

diff --git a/source/installation-guide/wazuh-indexer/step-by-step.rst b/source/installation-guide/wazuh-indexer/step-by-step.rst
@@ -164,6 +164,7 @@ Starting the service
 
 Repeat this stage of the installation process for every Wazuh indexer node in your cluster. Then proceed with initializing your single-node or multi-node cluster in the next stage.
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
 
 3. Cluster initialization
 -------------------------

diff --git a/source/installation-guide/wazuh-server/installation-assistant.rst b/source/installation-guide/wazuh-server/installation-assistant.rst
@@ -32,6 +32,8 @@ Your Wazuh server is now successfully installed.
 
 - If you want a Wazuh server multi-node cluster, repeat this process on every Wazuh server node.
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
+
 Next steps
 ----------
 

diff --git a/source/installation-guide/wazuh-server/step-by-step.rst b/source/installation-guide/wazuh-server/step-by-step.rst
@@ -212,6 +212,8 @@ Starting the Filebeat service
 
 Your Wazuh server node is now successfully installed. Repeat this stage of the installation process for every Wazuh server node in your Wazuh cluster, then proceed with configuring the Wazuh cluster. If you want a Wazuh server single-node cluster, everything is set and you can proceed directly with :doc:`../wazuh-dashboard/step-by-step`.
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
+
 2. Cluster configuration for multi-node deployment
 --------------------------------------------------
 .. raw:: html

diff --git a/source/quickstart.rst b/source/quickstart.rst
@@ -98,6 +98,8 @@ When you access the Wazuh dashboard for the first time, the browser shows a warn
 
 If you want to uninstall the Wazuh central components, run the Wazuh installation assistant using the option ``-u`` or ``–-uninstall``.
 
+.. include:: /_templates/installations/disable-wazuh-updates.rst
+
 Next steps
 ----------
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ Wazuh dashboard installation @@
        When you access the Wazuh dashboard for the first time, the browser shows a warning message stating that the certificate was not issued by a trusted authority. An exception can be added in the advanced options of the web browser. For increased security, the ``root-ca.pem`` file previously generated can be imported to the certificate manager of the browser instead. Alternatively, a certificate from a trusted authority can be configured.
+    .. include:: /_templates/installations/disable-wazuh-updates.rst
     Next steps
     ----------
@@ Expand Down @@