Replace 4.4 installation and upgrade commands to not latest published…

… version
wazuh · Jul 25, 2023 · d2f8222 · d2f8222
1 parent d62ae32
commit d2f8222
Show file tree

Hide file tree

Showing 18 changed files with 120 additions and 177 deletions.
diff --git a/source/_templates/installations/dashboard/apt/install_dashboard.rst b/source/_templates/installations/dashboard/apt/install_dashboard.rst
diff --git a/source/_templates/installations/dashboard/yum/install_dashboard.rst b/source/_templates/installations/dashboard/yum/install_dashboard.rst
diff --git a/source/_templates/installations/indexer/common/install-indexer.rst b/source/_templates/installations/indexer/common/install-indexer.rst
diff --git a/source/_templates/installations/wazuh/apk/deploy_wazuh_agent.rst b/source/_templates/installations/wazuh/apk/deploy_wazuh_agent.rst
diff --git a/source/_templates/installations/wazuh/deb/deploy_wazuh_agent.rst b/source/_templates/installations/wazuh/deb/deploy_wazuh_agent.rst
diff --git a/source/_templates/installations/wazuh/deb/install_wazuh_manager.rst b/source/_templates/installations/wazuh/deb/install_wazuh_manager.rst
diff --git a/source/_templates/installations/wazuh/yum/deploy_wazuh_agent.rst b/source/_templates/installations/wazuh/yum/deploy_wazuh_agent.rst
diff --git a/source/_templates/installations/wazuh/yum/install_wazuh_manager.rst b/source/_templates/installations/wazuh/yum/install_wazuh_manager.rst
diff --git a/source/_templates/installations/wazuh/zypp/deploy_wazuh_agent.rst b/source/_templates/installations/wazuh/zypp/deploy_wazuh_agent.rst
diff --git a/source/conf.py b/source/conf.py
@@ -639,6 +639,29 @@ def customReplacements(app, docname, source):
     "|WAZUH_SPLUNK_REV_CURRENT_8.1|" : "1",
 }
 
+if is_latest_release:
+    custom_replacements["|WAZUH_INDEXER_RPM_PKG_INSTALL|"] = ''
+    custom_replacements["|WAZUH_MANAGER_RPM_PKG_INSTALL|"] = ''
+    custom_replacements["|WAZUH_DASHBOARD_RPM_PKG_INSTALL|"] = ''
+    custom_replacements["|WAZUH_INDEXER_DEB_PKG_INSTALL|"] = ''
+    custom_replacements["|WAZUH_MANAGER_DEB_PKG_INSTALL|"] = ''
+    custom_replacements["|WAZUH_DASHBOARD_DEB_PKG_INSTALL|"] = ''
+    custom_replacements["|WAZUH_AGENT_RPM_PKG_INSTALL|"] = ''
+    custom_replacements["|WAZUH_AGENT_DEB_PKG_INSTALL|"] = ''
+    custom_replacements["|WAZUH_AGENT_ZYPP_PKG_INSTALL|"] = ''
+    custom_replacements["|WAZUH_AGENT_APK_PKG_INSTALL|"] = ''
+else:
+    custom_replacements["|WAZUH_INDEXER_RPM_PKG_INSTALL|"] = '-' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_INDEXER_CURRENT_REV|"]
+    custom_replacements["|WAZUH_MANAGER_RPM_PKG_INSTALL|"] = '-' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_REVISION_YUM_MANAGER_X86|"]
+    custom_replacements["|WAZUH_DASHBOARD_RPM_PKG_INSTALL|"] = '-' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_DASHBOARD_CURRENT_REV_RPM|"]
+    custom_replacements["|WAZUH_INDEXER_DEB_PKG_INSTALL|"] = '=' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_INDEXER_CURRENT_REV|"]
+    custom_replacements["|WAZUH_MANAGER_DEB_PKG_INSTALL|"] = '=' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_REVISION_DEB_MANAGER_X86|"]
+    custom_replacements["|WAZUH_DASHBOARD_DEB_PKG_INSTALL|"] = '=' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_DASHBOARD_CURRENT_REV_DEB|"]
+    custom_replacements["|WAZUH_AGENT_RPM_PKG_INSTALL|"] = '-' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_REVISION_YUM_AGENT_X86|"]
+    custom_replacements["|WAZUH_AGENT_DEB_PKG_INSTALL|"] = '=' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_REVISION_DEB_AGENT_X86|"]
+    custom_replacements["|WAZUH_AGENT_ZYPP_PKG_INSTALL|"] = '-' + custom_replacements["|WAZUH_CURRENT|"] + '-' + '1'
+    custom_replacements["|WAZUH_AGENT_APK_PKG_INSTALL|"] = '=' + custom_replacements["|WAZUH_CURRENT|"] + '-' + custom_replacements["|WAZUH_REVISION_APK_AGENT_X86_64|"]
+
 # -- Customizations ---------------------------------------------------------
 
 ## emptyTocNodes ##

diff --git a/source/installation-guide/wazuh-agent/wazuh-agent-package-linux.rst b/source/installation-guide/wazuh-agent/wazuh-agent-package-linux.rst
@@ -55,37 +55,53 @@ Deploy a Wazuh agent
 
 #. To deploy the Wazuh agent on your endpoint, select your package manager and edit the ``WAZUH_MANAGER`` variable to contain your Wazuh manager IP address or hostname.   
 
-
-      .. tabs::
-
-
-        .. group-tab:: Yum
-
-
-          .. include:: ../../_templates/installations/wazuh/yum/deploy_wazuh_agent.rst
-
+   .. tabs::
 
+      .. group-tab:: Yum
 
-        .. group-tab:: APT
-
+         .. code-block:: console
+          
+            # WAZUH_MANAGER="10.0.0.2" yum install wazuh-agent|WAZUH_AGENT_RPM_PKG_INSTALL|
+
+         For additional deployment options such as agent name, agent group, and registration password, see the :doc:`Deployment variables for Linux </user-manual/deployment-variables/deployment-variables-linux>` section.
+
+          .. note:: Alternatively, if you want to install an agent without registering it, omit the deployment variables. To learn more about the different registration methods, see the :doc:`Wazuh agent enrollment </user-manual/agent-enrollment/index>` section. 
 
-          .. include:: ../../_templates/installations/wazuh/deb/deploy_wazuh_agent.rst
-
+      .. group-tab:: APT
 
+         .. code-block:: console
+          
+            # WAZUH_MANAGER="10.0.0.2" apt-get install wazuh-agent|WAZUH_AGENT_DEB_PKG_INSTALL|
+
+         For additional deployment options such as agent name, agent group, and registration password, see the :doc:`Deployment variables for Linux </user-manual/deployment-variables/deployment-variables-linux>` section.
+
+         .. note:: Alternatively, if you want to install an agent without registering it, omit the deployment variables. To learn more about the different registration methods, see the :doc:`Wazuh agent enrollment </user-manual/agent-enrollment/index>` section. 
 
-        .. group-tab:: ZYpp
-
+      .. group-tab:: ZYpp
 
-          .. include:: ../../_templates/installations/wazuh/zypp/deploy_wazuh_agent.rst
+         .. code-block:: console
+          
+            # WAZUH_MANAGER="10.0.0.2" zypper install wazuh-agent|WAZUH_AGENT_ZYPP_PKG_INSTALL|
 
+         For additional deployment options such as agent name, agent group, and registration password, see the :doc:`Deployment variables for Linux </user-manual/deployment-variables/deployment-variables-linux>` section.
 
+         .. note:: Alternatively, if you want to install an agent without registering it, omit the deployment variables. To learn more about the different registration methods, see the :doc:`Wazuh agent enrollment </user-manual/agent-enrollment/index>` section. 
 
-        .. group-tab:: APK
-
+      .. group-tab:: APK
 
-          .. include:: ../../_templates/installations/wazuh/apk/deploy_wazuh_agent.rst
+         #. Install the Wazuh agent:
+
+            .. code-block:: console
             
-
+               # apk add wazuh-agent|WAZUH_AGENT_APK_PKG_INSTALL|
+
+         #. Edit the agent configuration to add the address of your Wazuh manager:
+
+            .. code-block:: console
+            
+               # export WAZUH_MANAGER="10.0.0.2" && sed -i "s|MANAGER_IP|$WAZUH_MANAGER|g" /var/ossec/etc/ossec.conf
+
+            For more customization options, like agent name or group, see the :doc:`Linux/Unix endpoint configuration </user-manual/agent-enrollment/via-agent-configuration/linux-endpoint>` page. For more security options, check the :doc:`Additional security options </user-manual/agent-enrollment/security-options/index>` section. 
 
 #. Enable and start the Wazuh agent service.
 

diff --git a/source/installation-guide/wazuh-dashboard/step-by-step.rst b/source/installation-guide/wazuh-dashboard/step-by-step.rst
@@ -46,23 +46,21 @@ Adding the Wazuh repository
 Installing the Wazuh dashboard
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-  #. Install the Wazuh dashboard package.
+#. Install the Wazuh dashboard package.
 
-      .. tabs::
+   .. tabs::
 
-          .. group-tab:: Yum
-
-
-              .. include:: /_templates/installations/dashboard/yum/install_dashboard.rst
-
-
-
-          .. group-tab:: APT
+      .. group-tab:: Yum
 
+         .. code-block:: console
 
-              .. include:: /_templates/installations/dashboard/apt/install_dashboard.rst
+            # yum -y install wazuh-dashboard|WAZUH_DASHBOARD_RPM_PKG_INSTALL|
 
+      .. group-tab:: APT
 
+         .. code-block:: console
+              
+            # apt-get -y install wazuh-dashboard|WAZUH_DASHBOARD_DEB_PKG_INSTALL|
 
 Configuring the Wazuh dashboard
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/source/installation-guide/wazuh-indexer/step-by-step.rst b/source/installation-guide/wazuh-indexer/step-by-step.rst
@@ -66,7 +66,21 @@ Adding the Wazuh repository
 Installing the Wazuh indexer
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-  .. include:: /_templates/installations/indexer/common/install-indexer.rst
+#. Install the Wazuh indexer package.
+
+   .. tabs::
+
+      .. group-tab:: Yum
+
+         .. code-block:: console
+
+            # yum -y install wazuh-indexer|WAZUH_INDEXER_RPM_PKG_INSTALL|
+
+      .. group-tab:: APT
+
+         .. code-block:: console
+
+            # apt-get -y install wazuh-indexer|WAZUH_INDEXER_DEB_PKG_INSTALL|
 
 Configuring the Wazuh indexer
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

diff --git a/source/installation-guide/wazuh-server/step-by-step.rst b/source/installation-guide/wazuh-server/step-by-step.rst
@@ -54,22 +54,19 @@ Installing the Wazuh manager
 
   #. Install the Wazuh manager package. 
 
-     .. tabs::
-
-
-       .. group-tab:: Yum
-
-
-         .. include:: /_templates/installations/wazuh/yum/install_wazuh_manager.rst
-
-
-
-       .. group-tab:: APT
-
-
-         .. include:: /_templates/installations/wazuh/deb/install_wazuh_manager.rst
-
-
+   .. tabs::
+
+      .. group-tab:: Yum
+
+         .. code-block:: console
+
+            # yum -y install wazuh-manager|WAZUH_MANAGER_RPM_PKG_INSTALL|
+
+      .. group-tab:: APT
+
+			.. code-block:: console
+
+  				# apt-get -y install wazuh-manager|WAZUH_MANAGER_DEB_PKG_INSTALL|
 
   #. Enable and start the Wazuh manager service.
 

diff --git a/source/migration-guide/wazuh-dashboard.rst b/source/migration-guide/wazuh-dashboard.rst
@@ -51,20 +51,19 @@ To guarantee a correct operation of Wazuh, make sure to also migrate from Open D
 
 #. Install the Wazuh dashboard package.
 
-      .. tabs::
-
-          .. group-tab:: Yum
-
-
-              .. include:: /_templates/installations/dashboard/yum/install_dashboard.rst
-
+   .. tabs::
 
+      .. group-tab:: Yum
 
-          .. group-tab:: APT
+         .. code-block:: console
 
+            # yum -y install wazuh-dashboard|WAZUH_DASHBOARD_RPM_PKG_INSTALL|
 
-              .. include:: /_templates/installations/dashboard/apt/install_dashboard.rst
+      .. group-tab:: APT
 
+         .. code-block:: console
+              
+            # apt-get -y install wazuh-dashboard|WAZUH_DASHBOARD_DEB_PKG_INSTALL|
 
    .. note::
 

diff --git a/source/migration-guide/wazuh-indexer.rst b/source/migration-guide/wazuh-indexer.rst
@@ -60,22 +60,19 @@ Follow this guide to migrate from Open Distro for Elasticsearch 1.13 to the Wazu
 
 #. Install the Wazuh indexer. 
 
-    .. tabs::
+   .. tabs::
 
       .. group-tab:: Yum
 
-          .. code-block:: console
-
-            # yum -y install wazuh-indexer
-
+         .. code-block:: console
 
+            # yum -y install wazuh-indexer|WAZUH_INDEXER_RPM_PKG_INSTALL|
 
       .. group-tab:: APT
 
-          .. code-block:: console
-
-            # apt-get -y install wazuh-indexer
+         .. code-block:: console
 
+            # apt-get -y install wazuh-indexer|WAZUH_INDEXER_DEB_PKG_INSTALL|
 
 #. Create the ``/etc/wazuh-indexer/certs`` directory, copy your old certificates to the new location and change ownership and permissions. Note that the ``admin.pem`` and ``admin-key.pem`` certificates do not exist on every Elasticsearch node.