Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Demote 4.4 version installation and upgrade steps #6277

Merged
merged 4 commits into from
Jul 28, 2023
Merged

Demote 4.4 version installation and upgrade steps #6277

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2f8222
Replace 4.4 installation and upgrade commands to not latest published…
javimed Jul 25, 2023
dd70029
Fix indentation
javimed Jul 25, 2023
5e3a493
Add replacements to examples and Elastic deployment
javimed Jul 26, 2023
c7aa42f
Add more install and upgrade replacements
javimed Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions source/_templates/installations/basic/wazuh/deb/install_wazuh_manager.rst
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions source/_templates/installations/basic/wazuh/yum/install_wazuh_manager.rst
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions source/_templates/installations/dashboard/apt/install_dashboard.rst
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions source/_templates/installations/dashboard/yum/install_dashboard.rst
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions source/_templates/installations/indexer/common/install-indexer.rst
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions source/_templates/installations/wazuh/apk/deploy_wazuh_agent.rst
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions source/_templates/installations/wazuh/deb/deploy_wazuh_agent.rst
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions source/_templates/installations/wazuh/deb/install_wazuh_manager.rst
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions source/_templates/installations/wazuh/yum/deploy_wazuh_agent.rst
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions source/_templates/installations/wazuh/yum/install_wazuh_manager.rst
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions source/_templates/installations/wazuh/zypp/deploy_wazuh_agent.rst
View file
Open in desktop

This file was deleted.

23 changes: 23 additions & 0 deletions source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##
Expand Down
12 changes: 5 additions & 7 deletions source/deployment-options/elastic-stack/all-in-one-deployment/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,21 +180,19 @@ Installing the Wazuh manager

#. Install the Wazuh manager package:

.. tabs::
.. tabs::

.. group-tab:: Yum

.. code-block:: console

.. include:: ../../../_templates/installations/basic/wazuh/yum/install_wazuh_manager.rst


# yum install wazuh-manager|WAZUH_MANAGER_RPM_PKG_INSTALL|

.. group-tab:: APT

.. code-block:: console

.. include:: ../../../_templates/installations/basic/wazuh/deb/install_wazuh_manager.rst


# apt-get install wazuh-manager|WAZUH_MANAGER_DEB_PKG_INSTALL|

#. Enable and start the Wazuh manager service:

Expand Down
17 changes: 7 additions & 10 deletions ...elastic-stack/distributed-deployment/wazuh-cluster/wazuh-multi-node-cluster.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,19 @@ Installing the Wazuh manager

#. Install the Wazuh manager package. This step must be applied in all servers that will act as Wazuh cluster nodes:

.. tabs::


.. group-tab:: Yum


.. include:: /_templates/installations/basic/wazuh/yum/install_wazuh_manager.rst
.. tabs::

.. group-tab:: Yum

.. code-block:: console

.. group-tab:: APT
# yum install wazuh-manager|WAZUH_MANAGER_RPM_PKG_INSTALL|

.. group-tab:: APT

.. include:: /_templates/installations/basic/wazuh/deb/install_wazuh_manager.rst

.. code-block:: console

# apt-get install wazuh-manager|WAZUH_MANAGER_DEB_PKG_INSTALL|

Now, the Wazuh manager has been installed in all the Wazuh cluster nodes. The Wazuh manager is installed and configured in a single-node cluster by default. The following sections will describe how to configure the Wazuh manager as a Wazuh master node or Wazuh worker node.

Expand Down
13 changes: 5 additions & 8 deletions ...lastic-stack/distributed-deployment/wazuh-cluster/wazuh-single-node-cluster.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,19 @@ Installing the Wazuh manager

#. Install the Wazuh manager package:

.. tabs::

.. tabs::

.. group-tab:: Yum

.. code-block:: console

.. include:: /_templates/installations/basic/wazuh/yum/install_wazuh_manager.rst


# yum install wazuh-manager|WAZUH_MANAGER_RPM_PKG_INSTALL|

.. group-tab:: APT

.. code-block:: console

.. include:: /_templates/installations/basic/wazuh/deb/install_wazuh_manager.rst


# apt-get install wazuh-manager|WAZUH_MANAGER_DEB_PKG_INSTALL|

#. Enable and start the Wazuh manager service:

Expand Down
56 changes: 36 additions & 20 deletions source/installation-guide/wazuh-agent/wazuh-agent-package-linux.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
20 changes: 9 additions & 11 deletions source/installation-guide/wazuh-dashboard/step-by-step.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
16 changes: 15 additions & 1 deletion source/installation-guide/wazuh-indexer/step-by-step.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
Loading
Loading