Merge pull request #7098 from wazuh/merge-4.8.0-into-4.8.1

Merge 4.8.0 into 4.8.1

source/_static/js/redirects.js

@@ -122,6 +122,9 @@ newUrls['4.7'] = [
   '/user-manual/upscaling/index.html',
   '/user-manual/upscaling/adding-indexer-node.html',
   '/user-manual/upscaling/adding-server-node.html',
+  '/installation-guide/uninstalling-wazuh/index.html',
+  '/installation-guide/uninstalling-wazuh/agent.html',
+  '/installation-guide/uninstalling-wazuh/central-components.html',
 ];
 
 /* Pages no longer available in 4.7 */
@@ -134,8 +137,49 @@ removedUrls['4.7'] = [
   '/cloud-service/cold-storage/filename-format.html',
   '/cloud-service/getting-started/register-agents.html',
   '/user-manual/capabilities/osquery.html',
+  '/user-manual/uninstall/index.html',
 ];
 
+/* Redirections from 4.6 to 4.7  */
+
+redirections.push(
+  {
+    'target': ['4.6=>4.7', '4.7=>4.6'],
+    '4.6': '/user-manual/uninstall/index.html',
+    '4.7': '/installation-guide/uninstalling-wazuh/central-components.html',
+  },
+  {
+    'target': ['4.6=>4.7', '4.7=>4.6'],
+    '4.6': '/installation-guide/wazuh-agent/wazuh-agent-package-linux.html#uninstall-a-wazuh-agent',
+    '4.7': '/installation-guide/uninstalling-wazuh/agent.html#uninstalling-a-linux-wazuh-agent',
+  },
+  {
+    'target': ['4.6=>4.7', '4.7=>4.6'],
+    '4.6': '/installation-guide/wazuh-agent/wazuh-agent-package-windows.html#uninstall-a-wazuh-agent',
+    '4.7': '/installation-guide/uninstalling-wazuh/agent.html#uninstalling-a-windows-wazuh-agent',
+  },
+  {
+    'target': ['4.6=>4.7', '4.7=>4.6'],
+    '4.6': '/installation-guide/wazuh-agent/wazuh-agent-package-macos.html#uninstall-a-wazuh-agent',
+    '4.7': '/installation-guide/uninstalling-wazuh/agent.html#uninstalling-a-macos-wazuh-agent',
+  },
+  {
+    'target': ['4.6=>4.7', '4.7=>4.6'],
+    '4.6': '/installation-guide/wazuh-agent/wazuh-agent-package-solaris.html#uninstall-a-wazuh-agent',
+    '4.7': '/installation-guide/uninstalling-wazuh/agent.html#uninstalling-a-solaris-wazuh-agent',
+  },
+  {
+    'target': ['4.6=>4.7', '4.7=>4.6'],
+    '4.6': '/installation-guide/wazuh-agent/wazuh-agent-package-aix.html#uninstall-a-wazuh-agent',
+    '4.7': '/installation-guide/uninstalling-wazuh/agent.html#uninstalling-an-aix-wazuh-agent',
+  },
+  {
+    'target': ['4.6=>4.7', '4.7=>4.6'],
+    '4.6': '/installation-guide/wazuh-agent/wazuh-agent-package-hpux.html#uninstall-a-wazuh-agent',
+    '4.7': '/installation-guide/uninstalling-wazuh/agent.html#uninstalling-an-hp-ux-wazuh-agent',
+  },
+);
+
 /* *** RELEASE 4.6 ****/
 
 /* Redirections from 4.5 to 4.6  */

source/_templates/installations/wazuh/deb/uninstall_wazuh_agent.rst

@@ -2,12 +2,12 @@
 
 .. code-block:: console
 
-  # apt-get remove wazuh-agent
+   # apt-get remove wazuh-agent
 
-Some files are marked as configuration files. Due to this designation, the package manager does not remove these files from the filesystem. If you want to completely remove all files, run the following command:
+Some files are marked as configuration files. Due to this designation, the package manager does not remove these files from the filesystem. Run the following command If you want to remove all files completely.
 
 .. code-block:: console
 
-  # apt-get remove --purge wazuh-agent
+   # apt-get remove --purge wazuh-agent
 
 .. End of include file

source/_templates/installations/wazuh/solaris/uninstall_wazuh_agent_s10.rst

@@ -1,9 +1,9 @@
 .. Copyright (C) 2015, Wazuh, Inc.
 
-To uninstall the Wazuh agent in Solaris 10, run the following command:
+Run the following command to uninstall the Wazuh agent in Solaris 10.
 
 .. code-block:: console
 
-  # pkgrm wazuh-agent
+   # pkgrm wazuh-agent
 
 .. End of include file

source/_templates/installations/wazuh/solaris/uninstall_wazuh_agent_s11.rst

@@ -1,15 +1,14 @@
 .. Copyright (C) 2015, Wazuh, Inc.
 
-To uninstall the Wazuh agent in Solaris 11, run the following command:
+Run the following command to uninstall the Wazuh agent in Solaris 11.
 
 .. code-block:: console
 
-    # /var/ossec/bin/wazuh-control stop
-    # pkg uninstall wazuh-agent
+   # /var/ossec/bin/wazuh-control stop
+   # pkg uninstall wazuh-agent
 
 .. note:: 
 
-  If you uninstall the Wazuh agent in Solaris 11.4 or later, the Solaris 11 package manager does not remove the group ``wazuh`` from the system. To remove it manually, run the ``groupdel wazuh`` command.
-
+   If you uninstall the Wazuh agent in Solaris 11.4 or later, the Solaris 11 package manager does not remove the group ``wazuh`` from the system. Run the ``groupdel wazuh`` command to manually remove it.
 
 .. End of include file

source/_templates/installations/wazuh/yum/uninstall_wazuh_agent.rst

@@ -4,6 +4,6 @@
 
   # yum remove wazuh-agent
 
-Some files are marked as configuration files. Due to this designation, the package manager does not remove these files from the filesystem. If you want to completely remove all files, delete the ``/var/ossec`` folder.
+Some files are marked as configuration files. Due to this designation, the package manager does not remove these files from the filesystem. Delete the ``/var/ossec/`` folder if you want to remove all files completely.
 
 .. End of include file

source/_templates/installations/wazuh/zypp/uninstall_wazuh_agent.rst

@@ -2,8 +2,8 @@
 
 .. code-block:: console
 
-  # zypper remove wazuh-agent
+   # zypper remove wazuh-agent
 
-Some files are marked as configuration files. Due to this designation, the package manager does not remove these files from the filesystem. If you want to completely remove all files, delete the ``/var/ossec`` folder.
+Some files are marked as configuration files. Due to this designation, the package manager does not remove these files from the filesystem. Delete the ``/var/ossec/`` folder if you want to remove all files completely.
 
 .. End of include file

source/_variables/empty_toc_nodes.py

@@ -24,5 +24,6 @@
     'user-manual/ruleset/ruleset-xml-syntax/index',
     'installation-guide/distributed-deployment/step-by-step-installation/elasticsearch-cluster/index',
     'installation-guide/distributed-deployment/step-by-step-installation/wazuh-cluster/index',
+    'installation-guide/uninstalling-wazuh/index',
     'user-manual/capabilities/active-response/ar-use-cases/index',
 ]

source/deployment-options/offline-installation.rst

@@ -608,4 +608,4 @@ Next steps
 
 Once the Wazuh environment is ready, Wazuh agents can be installed on every endpoint to be monitored. To install the Wazuh agents and start monitoring the endpoints, see the :doc:`Wazuh agent </installation-guide/wazuh-agent/index>` installation section. If you need to install them offline, you can check the appropriate agent package to download for your monitored system in the :ref:`Wazuh agent packages list <wazuh_agent_packages_list>` section.
 
-To uninstall all the Wazuh central components, see the :doc:`/user-manual/uninstall/index` section.
+To uninstall all the Wazuh central components, see the :doc:`/installation-guide/uninstalling-wazuh/central-components` section.

source/installation-guide/index.rst

@@ -170,11 +170,12 @@ Wazuh provides other :doc:`installation alternatives </deployment-options/index>
 
 
 .. toctree::
-    :hidden:
-    :maxdepth: 1
-
-    wazuh-indexer/index
-    wazuh-server/index
-    wazuh-dashboard/index
-    wazuh-agent/index
-    packages-list
+   :hidden:
+   :maxdepth: 1
+
+   wazuh-indexer/index
+   wazuh-server/index
+   wazuh-dashboard/index
+   wazuh-agent/index
+   packages-list
+   uninstalling-wazuh/index

source/installation-guide/uninstalling-wazuh/agent.rst

@@ -0,0 +1,173 @@
+.. Copyright (C) 2015, Wazuh, Inc.
+
+.. meta::
+   :description: Learn how to uninstall the Wazuh agent.
+
+Uninstalling the Wazuh agent
+============================
+
+This section describes how to uninstall Wazuh agents installed across the different operating systems below:
+
+-  :ref:`Linux <uninstalling_linux_agent>`
+-  :ref:`Windows <uninstalling_windows_agent>`
+-  :ref:`macOS <uninstalling_macos_agent>`
+-  :ref:`Solaris <uninstalling_solaris_agent>`
+-  :ref:`AIX <uninstalling_aix_agent>`
+-  :ref:`HPUX <uninstalling_hpux_agent>`
+
+.. _uninstalling_linux_agent:
+
+Uninstalling a Linux Wazuh agent
+--------------------------------
+
+Run the following commands to uninstall a Linux agent.
+
+
+#. Remove the Wazuh agent installation. 
+
+   .. tabs::
+
+      .. group-tab:: Yum
+
+         .. include:: ../../_templates/installations/wazuh/yum/uninstall_wazuh_agent.rst
+
+      .. group-tab:: APT
+
+         .. include:: ../../_templates/installations/wazuh/deb/uninstall_wazuh_agent.rst
+
+      .. group-tab:: ZYpp
+
+         .. include:: ../../_templates/installations/wazuh/zypp/uninstall_wazuh_agent.rst
+
+      .. group-tab:: APK
+
+         .. include:: ../../_templates/installations/wazuh/apk/uninstall_wazuh_agent.rst
+
+#. Disable the Wazuh agent service. 
+
+   .. include:: ../../_templates/installations/wazuh/common/disable_wazuh_agent_service.rst
+
+The Wazuh agent is now completely removed from your Linux endpoint.
+
+.. _uninstalling_windows_agent:
+
+Uninstalling a Windows Wazuh agent
+----------------------------------
+
+To uninstall the agent, the original Windows installer file is required to perform the unattended process:
+
+  .. code-block:: none
+  
+      msiexec.exe /x wazuh-agent-|WAZUH_CURRENT_WINDOWS|-|WAZUH_REVISION_WINDOWS|.msi /qn  
+
+The Wazuh agent is now completely removed from your Windows endpoint.
+
+.. _uninstalling_macos_agent:
+
+Uninstalling a macOS Wazuh agent
+--------------------------------
+
+Follow these steps to uninstall the Wazuh agent from your macOS endpoint.
+
+#. Stop the Wazuh agent service.
+
+    .. code-block:: console
+
+      # /Library/Ossec/bin/wazuh-control stop
+
+#. Remove the ``/Library/Ossec/`` folder.
+
+    .. code-block:: console
+
+      # /bin/rm -r /Library/Ossec
+
+#. Stop and unload dispatcher.
+
+    .. code-block:: console
+
+      # /bin/launchctl unload /Library/LaunchDaemons/com.wazuh.agent.plist
+
+#. Remove ``launchdaemons`` and ``StartupItems``.
+
+    .. code-block:: console
+
+      # /bin/rm -f /Library/LaunchDaemons/com.wazuh.agent.plist
+      # /bin/rm -rf /Library/StartupItems/WAZUH
+
+#. Remove the Wazuh user and group.
+
+    .. code-block:: console
+
+      # /usr/bin/dscl . -delete "/Users/wazuh"
+      # /usr/bin/dscl . -delete "/Groups/wazuh"
+
+#. Remove from ``pkgutil``.
+
+    .. code-block:: console
+
+      # /usr/sbin/pkgutil --forget com.wazuh.pkg.wazuh-agent
+
+The Wazuh agent is now completely removed from your macOS endpoint.
+
+.. _uninstalling_solaris_agent:
+
+Uninstalling a Solaris Wazuh agent
+----------------------------------
+
+Select the Solaris version you want to uninstall.
+
+.. tabs::
+
+  .. group-tab:: Solaris 10
+
+    .. include:: ../../_templates/installations/wazuh/solaris/uninstall_wazuh_agent_s10.rst
+
+  .. group-tab:: Solaris 11
+
+    .. include:: ../../_templates/installations/wazuh/solaris/uninstall_wazuh_agent_s11.rst
+
+The Wazuh agent is now completely removed from your Solaris endpoint.
+
+.. _uninstalling_aix_agent:
+
+Uninstalling an AIX Wazuh agent
+-------------------------------
+
+Follow the steps below to uninstall the Wazuh agent from the AIX endpoint.
+
+.. code-block:: console
+
+   # rpm -e wazuh-agent
+
+Some files are not removed from the filesystem by the package manager. Delete the ``/var/ossec/`` folder if you want to remove all files completely. 
+
+The Wazuh agent is now completely removed from your AIX system
+
+.. _uninstalling_hpux_agent:
+
+Uninstalling an HP-UX Wazuh agent
+---------------------------------
+
+Follow the steps below to uninstall the Wazuh agent from the HP-UX endpoint.
+
+#. Stop the Wazuh agent service.
+
+
+   .. code-block:: console
+
+      # /var/ossec/bin/wazuh-control stop
+
+#. Delete ``wazuh`` user and group:
+
+   .. code-block:: console
+
+      # groupdel wazuh
+      # userdel wazuh
+
+#. Remove Wazuh files.
+
+   .. code-block:: console
+
+      # rm -rf /var/ossec
+
+The Wazuh agent is now completely removed from your HP-UX endpoint.