From ba86c299810d73fe7907a1dc085d68bc01fbe11e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gast=C3=B3n=20Palomeque?= Date: Wed, 13 Dec 2023 08:51:15 -0300 Subject: [PATCH 1/4] Upgrade maximum supported version --- source/_variables/replacements.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_variables/replacements.py b/source/_variables/replacements.py index e9c62d47fd..81af2f808a 100644 --- a/source/_variables/replacements.py +++ b/source/_variables/replacements.py @@ -38,7 +38,7 @@ "|WAZUH_CURRENT_MINOR|" : version, "|WAZUH_CURRENT|" : release, "|PYTHON_CLOUD_CONTAINERS_MIN|": "3.7", - "|PYTHON_CLOUD_CONTAINERS_MAX|": "3.10", + "|PYTHON_CLOUD_CONTAINERS_MAX|": "3.11", # --- Revision numbers for Wazuh agent and manager packages versions # Alpine APK packages revisions From 8357b82d2b191f52661f4c4ff0fbe3550a486046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gast=C3=B3n=20Palomeque?= Date: Wed, 13 Dec 2023 09:34:33 -0300 Subject: [PATCH 2/4] Update cloud modules dependencies sections --- .../services/prerequisites/dependencies.rst | 77 ++----------------- .../prerequisites/dependencies.rst | 67 ++-------------- .../gcp/prerequisites/dependencies.rst | 65 ++-------------- 3 files changed, 21 insertions(+), 188 deletions(-) diff --git a/source/cloud-security/amazon/services/prerequisites/dependencies.rst b/source/cloud-security/amazon/services/prerequisites/dependencies.rst index 74b1a5a6f0..b2f3a5980b 100644 --- a/source/cloud-security/amazon/services/prerequisites/dependencies.rst +++ b/source/cloud-security/amazon/services/prerequisites/dependencies.rst @@ -18,74 +18,13 @@ Installing dependencies Python ------ -The AWS module requires Python 3. It is compatible with Python 3.7 and above. +The AWS module requires `Python 3 `__. Specifically, it's compatible with +`Python |PYTHON_CLOUD_CONTAINERS_MIN|–|PYTHON_CLOUD_CONTAINERS_MAX| `_. While later Python versions should work as well, we can't assure they are compatible. -.. tabs:: - - .. group-tab:: Yum - - .. code-block:: console - - # yum update && yum install python3 - - .. group-tab:: APT - - .. code-block:: console - - # apt-get update && apt-get install python3 - - -The required modules can be installed with Pip, the Python package manager. Most UNIX distributions have this tool available in their software repositories: - -.. tabs:: - - .. group-tab:: Yum - - .. code-block:: console - - # yum update && yum install python3-pip - - .. group-tab:: APT - - .. code-block:: console - - # apt-get update && apt-get install python3-pip - -It is recommended to use a pip version greater than or equal to 19.3 to ease the installation of the required dependencies. - -.. tabs:: - - .. group-tab:: Python 3.7 - - .. code-block:: console - - # pip3 install --upgrade pip - - .. group-tab:: Python 3.8–3.10 - - .. code-block:: console - - # pip3 install --upgrade pip - - .. group-tab:: Python 3.11 - - .. code-block:: console - - # pip3 install --upgrade pip --break-system-packages - - .. note:: - - This command modifies the default externally managed Python environment. See the `PEP 668 `__ description for more information. - - To prevent the modification, you can run ``pip3 install --upgrade pip`` within a virtual environment. You must update the ``aws-s3`` script shebang with your virtual environment interpreter, for example, ``#!/path/to/your/virtual/environment/bin/python3``. - - -.. _boto-3: - -AWS pip dependencies ------------------------ +AWS client library for Python +----------------------------- -`Boto3 `_ is the official package supported by Amazon to manage AWS resources. It is used to download the log messages from the different AWS services supported by Wazuh. The module is compatible with boto3 from ``1.13.1`` to ``1.17.85``. Future boto3 releases should maintain compatibility although it cannot be guaranteed. +`Boto3 `__ is the official package that Amazon supports to manage AWS resources. It's used to download the log messages from the AWS services that Wazuh supports. The AWS module is compatible with Boto3 versions ``1.13.1``–``1.17.85``. Later Boto3 releases should be compatible although we cannot assure it. To install the dependencies, execute the following command: @@ -95,19 +34,19 @@ To install the dependencies, execute the following command: .. code-block:: console - # pip3 install boto3==1.17.85 botocore==1.20.85 jmespath==0.9.5 python-dateutil==2.8.1 six==1.14.0 urllib3==1.26.5 s3transfer==0.4.2 pyarrow==8.0.0 pyarrow_hotfix==0.5 + # pip3 install boto3==1.17.85 pyarrow==8.0.0 pyarrow_hotfix==0.5 .. group-tab:: Python 3.8–3.10 .. code-block:: console - # pip3 install boto3==1.17.85 botocore==1.20.85 jmespath==0.9.5 python-dateutil==2.8.1 six==1.14.0 urllib3==1.26.5 s3transfer==0.4.2 pyarrow==14.0.1 + # pip3 install boto3==1.17.85 pyarrow==14.0.1 .. group-tab:: Python 3.11 .. code-block:: console - # pip3 install --break-system-packages boto3==1.17.85 botocore==1.20.85 jmespath==0.9.5 python-dateutil==2.8.1 six==1.14.0 urllib3==1.26.5 s3transfer==0.4.2 pyarrow==14.0.1 + # pip3 install --break-system-packages boto3==1.17.85 pyarrow==14.0.1 .. note:: diff --git a/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst b/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst index 2bbfdae9c0..1a0e4d9f29 100644 --- a/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst +++ b/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst @@ -17,68 +17,15 @@ Installing dependencies Python ------ -The Azure module requires Python 3. It is compatible with Python 3.7 and above. +The Azure module requires `Python 3 `__. Specifically, it's compatible with +`Python |PYTHON_CLOUD_CONTAINERS_MIN|–|PYTHON_CLOUD_CONTAINERS_MAX| `_. While later Python versions should work as well, we can't assure they are compatible. -.. tabs:: - - .. group-tab:: Yum - - .. code-block:: console - - # yum update && yum install python3 - - .. group-tab:: APT - - .. code-block:: console - - # apt-get update && apt-get install python3 - - -The required modules can be installed with Pip, the Python package manager. Most of UNIX distributions have this tool available in their software repositories: - -.. tabs:: - - .. group-tab:: Yum - - .. code-block:: console - - # yum update && yum install python3-pip - - .. group-tab:: APT - - .. code-block:: console - - # apt-get update && apt-get install python3-pip - - -It is recommended to use a pip version greater than or equal to 19.3 to ease the installation of the required dependencies. - -.. tabs:: - - .. group-tab:: Python 3.7–3.10 - - .. code-block:: console - - # pip3 install --upgrade pip - - .. group-tab:: Python 3.11 - - .. code-block:: console - - # pip3 install --upgrade pip --break-system-packages - - .. note:: - - This command modifies the default externally managed Python environment. See the `PEP 668 `__ description for more information. - - To prevent the modification, you can run ``pip3 install --upgrade pip`` within a virtual environment. You must update the ``azure-logs`` script shebang with your virtual environment interpreter, for example, ``#!/path/to/your/virtual/environment/bin/python3``. - -Azure Storage Blobs client library for Python ---------------------------------------------- +Azure Storage client library for Python +--------------------------------------- `Azure Storage Blobs client library `_ is the official Python library for Microsoft's Azure Blob storage. -To install the Azure Storage Blobs client library for Python, execute the following command: +To install the dependencies, execute the following command: .. tabs:: @@ -86,13 +33,13 @@ To install the Azure Storage Blobs client library for Python, execute the follow .. code-block:: console - # pip3 install azure-storage-blob==2.1.0 azure-storage-common==2.1.0 azure-common==1.1.25 cryptography==3.3.2 cffi==1.14.4 pycparser==2.20 six==1.14.0 python-dateutil==2.8.1 requests==2.25.1 certifi==2022.12.07 chardet==3.0.4 idna==2.9 urllib3==1.26.5 SQLAlchemy==1.3.11 pytz==2020.1 + # pip3 install azure-storage-blob==2.1.0 SQLAlchemy==1.3.11 pytz==2020.1 .. group-tab:: Python 3.11 .. code-block:: console - # pip3 install --break-system-packages azure-storage-blob==2.1.0 azure-storage-common==2.1.0 azure-common==1.1.25 cryptography==3.3.2 cffi==1.14.4 pycparser==2.20 six==1.14.0 python-dateutil==2.8.1 requests==2.25.1 certifi==2022.12.07 chardet==3.0.4 idna==2.9 urllib3==1.26.5 SQLAlchemy==1.3.11 pytz==2020.1 + # pip3 install --break-system-packages azure-storage-blob==2.1.0 SQLAlchemy==1.3.11 pytz==2020.1 .. note:: diff --git a/source/cloud-security/gcp/prerequisites/dependencies.rst b/source/cloud-security/gcp/prerequisites/dependencies.rst index f6f91f7cc8..3956d19f25 100644 --- a/source/cloud-security/gcp/prerequisites/dependencies.rst +++ b/source/cloud-security/gcp/prerequisites/dependencies.rst @@ -17,64 +17,11 @@ Installing dependencies Python ------ -The GCP module requires Python 3. It is compatible with Python 3.7 and above. +The GCP module requires `Python 3 `__. Specifically, it's compatible with +`Python |PYTHON_CLOUD_CONTAINERS_MIN|–|PYTHON_CLOUD_CONTAINERS_MAX| `_. While later Python versions should work as well, we can't assure they are compatible. -.. tabs:: - - .. group-tab:: Yum - - .. code-block:: console - - # yum update && yum install python3 - - .. group-tab:: APT - - .. code-block:: console - - # apt-get update && apt-get install python3 - - -The required modules can be installed with Pip, the Python package manager. Most of UNIX distributions have this tool available in their software repositories: - -.. tabs:: - - .. group-tab:: Yum - - .. code-block:: console - - # yum update && yum install python3-pip - - .. group-tab:: APT - - .. code-block:: console - - # apt-get update && apt-get install python3-pip - - -It is recommended to use a pip version greater than or equal to 19.3 to ease the installation of the required dependencies. - -.. tabs:: - - .. group-tab:: Python 3.7–3.10 - - .. code-block:: console - - # pip3 install --upgrade pip - - .. group-tab:: Python 3.11 - - .. code-block:: console - - # pip3 install --upgrade pip --break-system-packages - - .. note:: - - This command modifies the default externally managed Python environment. See the `PEP 668 `__ description for more information. - - To prevent the modification, you can run ``pip3 install --upgrade pip`` within a virtual environment. You must update the ``gcloud`` script shebang with your virtual environment interpreter, for example, ``#!/path/to/your/virtual/environment/bin/python3``. - -Google Cloud pip dependencies ------------------------------ +Google Cloud client library for Python +-------------------------------------- `google-cloud-pubsub `_ is the official python library supported by Google to manage Google Cloud Pub/Sub resources. It is used to pull the log messages from the Pub/Sub queue. @@ -86,13 +33,13 @@ To install the dependencies, execute the following command: .. code-block:: console - # pip3 install cachetools==4.1.0 certifi==2022.12.07 cffi==1.14.4 chardet==3.0.4 charset-normalizer==2.0.4 google-api-core==1.30.0 google-auth==1.28.0 google-cloud-core==1.7.1 google-cloud-pubsub==2.7.1 google-cloud-storage==1.39.0 google-crc32c==1.1.2 google-resumable-media==1.3.1 googleapis-common-protos==1.51.0 grpc-google-iam-v1==0.12.3 grpcio==1.38.1 idna==2.9 libcst==0.3.20 mypy-extensions==0.4.3 packaging==20.9 proto-plus==1.19.0 protobuf==3.19.6 pyasn1-modules==0.2.8 pyasn1==0.4.8 pycparser==2.20 pyparsing==2.4.7 pytz==2020.1 PyYAML==5.4.1 requests==2.25.1 rsa==4.7.2 setuptools==59.6.0 six==1.14.0 typing-extensions==3.10.0.2 typing-inspect==0.7.1 urllib3==1.26.5 + # pip3 install google-cloud-core==1.7.1 google-cloud-pubsub==2.7.1 google-cloud-storage==1.39.0 pytz==2020.1 setuptools==68.0.0 .. group-tab:: Python 3.11 .. code-block:: console - # pip3 install --break-system-packages cachetools==4.1.0 certifi==2022.12.07 cffi==1.14.4 chardet==3.0.4 charset-normalizer==2.0.4 google-api-core==1.30.0 google-auth==1.28.0 google-cloud-core==1.7.1 google-cloud-pubsub==2.7.1 google-cloud-storage==1.39.0 google-crc32c==1.1.2 google-resumable-media==1.3.1 googleapis-common-protos==1.51.0 grpc-google-iam-v1==0.12.3 grpcio==1.38.1 idna==2.9 libcst==0.3.20 mypy-extensions==0.4.3 packaging==20.9 proto-plus==1.19.0 protobuf==3.19.6 pyasn1-modules==0.2.8 pyasn1==0.4.8 pycparser==2.20 pyparsing==2.4.7 pytz==2020.1 PyYAML==5.4.1 requests==2.25.1 rsa==4.7.2 setuptools==59.6.0 six==1.14.0 typing-extensions==3.10.0.2 typing-inspect==0.7.1 urllib3==1.26.5 + # pip3 install --break-system-packages google-cloud-core==1.7.1 google-cloud-pubsub==2.7.1 google-cloud-storage==1.39.0 pytz==2020.1 setuptools==68.0.0 .. note:: From aa4bafa8126f9940a0e6ab30cb82066a987588f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gast=C3=B3n=20Palomeque?= Date: Wed, 13 Dec 2023 12:15:08 -0300 Subject: [PATCH 3/4] Update cloud modules dependencies sections --- .../services/prerequisites/dependencies.rst | 62 +++++++++++++++++++ .../prerequisites/dependencies.rst | 54 ++++++++++++++++ .../gcp/prerequisites/dependencies.rst | 54 ++++++++++++++++ 3 files changed, 170 insertions(+) diff --git a/source/cloud-security/amazon/services/prerequisites/dependencies.rst b/source/cloud-security/amazon/services/prerequisites/dependencies.rst index b2f3a5980b..428f4cd58c 100644 --- a/source/cloud-security/amazon/services/prerequisites/dependencies.rst +++ b/source/cloud-security/amazon/services/prerequisites/dependencies.rst @@ -21,6 +21,68 @@ Python The AWS module requires `Python 3 `__. Specifically, it's compatible with `Python |PYTHON_CLOUD_CONTAINERS_MIN|–|PYTHON_CLOUD_CONTAINERS_MAX| `_. While later Python versions should work as well, we can't assure they are compatible. +.. tabs:: + + .. group-tab:: Yum + + .. code-block:: console + + # yum update && yum install python3 + + .. group-tab:: APT + + .. code-block:: console + + # apt-get update && apt-get install python3 + + +The required modules can be installed with Pip, the Python package manager. Most UNIX distributions have this tool available in their software repositories: + +.. tabs:: + + .. group-tab:: Yum + + .. code-block:: console + + # yum update && yum install python3-pip + + .. group-tab:: APT + + .. code-block:: console + + # apt-get update && apt-get install python3-pip + +It is recommended to use a pip version greater than or equal to 19.3 to ease the installation of the required dependencies. + +.. tabs:: + + .. group-tab:: Python 3.7 + + .. code-block:: console + + # pip3 install --upgrade pip + + .. group-tab:: Python 3.8–3.10 + + .. code-block:: console + + # pip3 install --upgrade pip + + .. group-tab:: Python 3.11 + + .. code-block:: console + + # pip3 install --upgrade pip --break-system-packages + + .. note:: + + This command modifies the default externally managed Python environment. See the `PEP 668 `__ description for more information. + + To prevent the modification, you can run ``pip3 install --upgrade pip`` within a virtual environment. You must update the ``aws-s3`` script shebang with your virtual environment interpreter, for example, ``#!/path/to/your/virtual/environment/bin/python3``. + + +.. _boto-3: + AWS client library for Python ----------------------------- diff --git a/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst b/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst index 1a0e4d9f29..518d855927 100644 --- a/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst +++ b/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst @@ -20,6 +20,60 @@ Python The Azure module requires `Python 3 `__. Specifically, it's compatible with `Python |PYTHON_CLOUD_CONTAINERS_MIN|–|PYTHON_CLOUD_CONTAINERS_MAX| `_. While later Python versions should work as well, we can't assure they are compatible. +.. tabs:: + + .. group-tab:: Yum + + .. code-block:: console + + # yum update && yum install python3 + + .. group-tab:: APT + + .. code-block:: console + + # apt-get update && apt-get install python3 + + +The required modules can be installed with Pip, the Python package manager. Most of UNIX distributions have this tool available in their software repositories: + +.. tabs:: + + .. group-tab:: Yum + + .. code-block:: console + + # yum update && yum install python3-pip + + .. group-tab:: APT + + .. code-block:: console + + # apt-get update && apt-get install python3-pip + + +It is recommended to use a pip version greater than or equal to 19.3 to ease the installation of the required dependencies. + +.. tabs:: + + .. group-tab:: Python 3.7–3.10 + + .. code-block:: console + + # pip3 install --upgrade pip + + .. group-tab:: Python 3.11 + + .. code-block:: console + + # pip3 install --upgrade pip --break-system-packages + + .. note:: + + This command modifies the default externally managed Python environment. See the `PEP 668 `__ description for more information. + + To prevent the modification, you can run ``pip3 install --upgrade pip`` within a virtual environment. You must update the ``azure-logs`` script shebang with your virtual environment interpreter, for example, ``#!/path/to/your/virtual/environment/bin/python3``. + Azure Storage client library for Python --------------------------------------- diff --git a/source/cloud-security/gcp/prerequisites/dependencies.rst b/source/cloud-security/gcp/prerequisites/dependencies.rst index 3956d19f25..7395018374 100644 --- a/source/cloud-security/gcp/prerequisites/dependencies.rst +++ b/source/cloud-security/gcp/prerequisites/dependencies.rst @@ -20,6 +20,60 @@ Python The GCP module requires `Python 3 `__. Specifically, it's compatible with `Python |PYTHON_CLOUD_CONTAINERS_MIN|–|PYTHON_CLOUD_CONTAINERS_MAX| `_. While later Python versions should work as well, we can't assure they are compatible. +.. tabs:: + + .. group-tab:: Yum + + .. code-block:: console + + # yum update && yum install python3 + + .. group-tab:: APT + + .. code-block:: console + + # apt-get update && apt-get install python3 + + +The required modules can be installed with Pip, the Python package manager. Most of UNIX distributions have this tool available in their software repositories: + +.. tabs:: + + .. group-tab:: Yum + + .. code-block:: console + + # yum update && yum install python3-pip + + .. group-tab:: APT + + .. code-block:: console + + # apt-get update && apt-get install python3-pip + + +It is recommended to use a pip version greater than or equal to 19.3 to ease the installation of the required dependencies. + +.. tabs:: + + .. group-tab:: Python 3.7–3.10 + + .. code-block:: console + + # pip3 install --upgrade pip + + .. group-tab:: Python 3.11 + + .. code-block:: console + + # pip3 install --upgrade pip --break-system-packages + + .. note:: + + This command modifies the default externally managed Python environment. See the `PEP 668 `__ description for more information. + + To prevent the modification, you can run ``pip3 install --upgrade pip`` within a virtual environment. You must update the ``gcloud`` script shebang with your virtual environment interpreter, for example, ``#!/path/to/your/virtual/environment/bin/python3``. + Google Cloud client library for Python -------------------------------------- From 2d1ff307c73daa55303c33b9ccf5bfce11906abf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gast=C3=B3n=20Palomeque?= Date: Thu, 14 Dec 2023 08:40:01 -0300 Subject: [PATCH 4/4] Update SQLAlchemy version --- .../azure/activity-services/prerequisites/dependencies.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst b/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst index 518d855927..9f1c448b5f 100644 --- a/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst +++ b/source/cloud-security/azure/activity-services/prerequisites/dependencies.rst @@ -87,13 +87,13 @@ To install the dependencies, execute the following command: .. code-block:: console - # pip3 install azure-storage-blob==2.1.0 SQLAlchemy==1.3.11 pytz==2020.1 + # pip3 install azure-storage-blob==2.1.0 SQLAlchemy==2.0.23 pytz==2020.1 .. group-tab:: Python 3.11 .. code-block:: console - # pip3 install --break-system-packages azure-storage-blob==2.1.0 SQLAlchemy==1.3.11 pytz==2020.1 + # pip3 install --break-system-packages azure-storage-blob==2.1.0 SQLAlchemy==2.0.23 pytz==2020.1 .. note::