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

Upgrade dependencies versions #7483

Merged
merged 2 commits into from
Jun 28, 2024
Merged

Upgrade dependencies versions #7483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3080b37
Upgrade docker and urrlib packages
GGP1 Jun 26, 2024
a74784c
Add changes from review
javimed Jun 28, 2024
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
23 changes: 20 additions & 3 deletions source/proof-of-concept-guide/monitoring-docker.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,27 @@ Perform the following steps to install Docker on the Ubuntu endpoint and configu

#. Install Docker and Python Docker Library:

.. code-block:: console
.. tabs::

.. group-tab:: Python 3.7–3.10

.. code-block:: console

$ curl -sSL https://get.docker.com/ | sh
$ sudo pip3 install docker==7.1.0 urllib3==2.2.2 requests==2.32.2

.. group-tab:: Python 3.11

.. code-block:: console

$ curl -sSL https://get.docker.com/ | sh
$ sudo pip3 install docker==7.1.0 urllib3==2.2.2 requests==2.32.2 --break-system-packages

.. note::

$ curl -sSL https://get.docker.com/ | sh
$ sudo pip3 install docker==6.0.0 urllib3==1.26.18
This command modifies the default externally managed Python environment. See the `PEP 668 <https://peps.python.org/pep-0668/>`__ description for more information.

To prevent the modification, you can run ``pip3 install --upgrade pip`` within a virtual environment. You must update the docker ``/var/ossec/wodles/docker/DockerListener`` script shebang with your virtual environment interpreter. For example: ``#!</path/to/your/virtual/environment>/bin/python3``.

#. Edit the Wazuh agent configuration file ``/var/ossec/etc/ossec.conf`` and add this block to enable the ``docker-listener`` module:

Expand Down
20 changes: 18 additions & 2 deletions source/user-manual/capabilities/container-security/monitoring-docker.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,25 @@ Docker library for Python

`Python Docker library <https://pypi.org/project/docker/>`_ is the official Python library for the Docker Engine API. The Wazuh docker integration requires ``docker 6.0.0``.

.. code-block:: console
.. tabs::

# pip3 install docker==6.0.0 urllib3==1.26.18
.. group-tab:: Python 3.7–3.10

.. code-block:: console

$ pip3 install docker==7.1.0 urllib3==2.2.2 requests==2.32.2

.. group-tab:: Python 3.11

.. code-block:: console

$ pip3 install docker==7.1.0 urllib3==2.2.2 requests==2.32.2 --break-system-packages

.. note::

This command modifies the default externally managed Python environment. See the `PEP 668 <https://peps.python.org/pep-0668/>`__ description for more information.

To prevent the modification, you can run ``pip3 install --upgrade pip`` within a virtual environment. You must update the docker ``/var/ossec/wodles/docker/DockerListener`` script shebang with your virtual environment interpreter. For example: ``#!</path/to/your/virtual/environment>/bin/python3``.

Configure the Wazuh agent
^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down