PyPI - zabbix-utils - Versions diffs - 2.0.2__tar.gz → 2.0.4__tar.gz - Mend

zabbix-utils 2.0.2tar.gz → 2.0.4tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

{zabbix_utils-2.0.2 → zabbix_utils-2.0.4}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zabbix_utils
-Version: 2.0.2
+Version: 2.0.4
 Summary: A library with modules for working with Zabbix (Zabbix API, Zabbix sender, Zabbix get)
 Home-page: https://github.com/zabbix/python-zabbix-utils
 Author: Zabbix SIA
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: System :: Monitoring
@@ -40,10 +41,10 @@ License-File: LICENSE
 [![Zabbix sender](https://github.com/zabbix/python-zabbix-utils/actions/workflows/integration_sender.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/integration_sender.yaml)
 [![Zabbix get](https://github.com/zabbix/python-zabbix-utils/actions/workflows/integration_getter.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/integration_getter.yaml)
-[![Zabbix 5.0](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_50.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_50.yaml)
 [![Zabbix 6.0](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_60.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_60.yaml)
 [![Zabbix 7.0](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_70.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_70.yaml)
 [![Zabbix 7.2](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_72.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_72.yaml)
+[![Zabbix 7.4](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_74.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_74.yaml)
 **zabbix_utils** is a Python library for working with [Zabbix API](https://www.zabbix.com/documentation/current/manual/api/reference) as well as with [Zabbix sender](https://www.zabbix.com/documentation/current/manpages/zabbix_sender) and [Zabbix get](https://www.zabbix.com/documentation/current/manpages/zabbix_get) protocols.
@@ -51,13 +52,13 @@ License-File: LICENSE
 Supported versions:
-* Zabbix 5.0+
+* Zabbix 6.0+
 * Python 3.8+
 Tested on:
-* Zabbix 5.0, 6.0, 7.0 and 7.2
-* Python 3.8, 3.9, 3.10, 3.11 and 3.12
+* Zabbix 6.0, 7.0, 7.2 and 7.4
+* Python 3.8, 3.9, 3.10, 3.11, 3.12 and 3.13
 Dependencies:

{zabbix_utils-2.0.2 → zabbix_utils-2.0.4}/README.md RENAMED Viewed

@@ -5,10 +5,10 @@
 [![Zabbix sender](https://github.com/zabbix/python-zabbix-utils/actions/workflows/integration_sender.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/integration_sender.yaml)
 [![Zabbix get](https://github.com/zabbix/python-zabbix-utils/actions/workflows/integration_getter.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/integration_getter.yaml)
-[![Zabbix 5.0](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_50.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_50.yaml)
 [![Zabbix 6.0](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_60.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_60.yaml)
 [![Zabbix 7.0](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_70.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_70.yaml)
 [![Zabbix 7.2](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_72.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_72.yaml)
+[![Zabbix 7.4](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_74.yaml/badge.svg)](https://github.com/zabbix/python-zabbix-utils/actions/workflows/compatibility_74.yaml)
 **zabbix_utils** is a Python library for working with [Zabbix API](https://www.zabbix.com/documentation/current/manual/api/reference) as well as with [Zabbix sender](https://www.zabbix.com/documentation/current/manpages/zabbix_sender) and [Zabbix get](https://www.zabbix.com/documentation/current/manpages/zabbix_get) protocols.
@@ -24,13 +24,13 @@
 Supported versions:
-* Zabbix 5.0+
+* Zabbix 6.0+
 * Python 3.8+
 Tested on:
-* Zabbix 5.0, 6.0, 7.0 and 7.2
-* Python 3.8, 3.9, 3.10, 3.11 and 3.12
+* Zabbix 6.0, 7.0, 7.2 and 7.4
+* Python 3.8, 3.9, 3.10, 3.11, 3.12 and 3.13
 Dependencies:

{zabbix_utils-2.0.2 → zabbix_utils-2.0.4}/setup.py RENAMED Viewed

@@ -1,77 +1,78 @@
-# zabbix_utils
-#
-# Copyright (C) 2001-2023 Zabbix SIA
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify,
-# merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software
-# is furnished to do so, subject to the following conditions:
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-import re
-import setuptools
-from zabbix_utils.version import __version__
-with open("README.md", "r", encoding="utf-8") as fh:
-    regexp = r'(?<=##)\s*Get started\n*(^\*.*\n){1,10}\n*##'
-    long_description = re.sub(regexp, '', fh.read(), flags=re.M)
-setuptools.setup(
-    name="zabbix_utils",
-    version=__version__,
-    author="Zabbix SIA",
-    author_email="integrationteam@zabbix.com",
-    maintainer="Aleksandr Iantsen",
-    maintainer_email="aleksandr.iantsen@zabbix.com",
-    description="A library with modules for working with Zabbix (Zabbix API, Zabbix sender, Zabbix get)",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    keywords="monitoring zabbix api sender get utils tools",
-    url="https://github.com/zabbix/python-zabbix-utils",
-    test_suite='tests',
-    packages=["zabbix_utils"],
-    tests_require=["unittest"],
-    install_requires=[],
-    extras_require={
-        "async": ["aiohttp>=3,<4"],
-    },
-    python_requires='>=3.8',
-    project_urls={
-        'Zabbix': 'https://www.zabbix.com/documentation/current',
-        'Source': 'https://github.com/zabbix/python-zabbix-utils',
-        'Changes': 'https://github.com/zabbix/python-zabbix-utils/blob/main/CHANGELOG.md',
-        'Bug Tracker': 'https://github.com/zabbix/python-zabbix-utils/issues'
-    },
-    classifiers=[
-        "Development Status :: 5 - Production/Stable",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
-        "Programming Language :: Python :: 3.9",
-        "Programming Language :: Python :: 3.10",
-        "Programming Language :: Python :: 3.11",
-        "Programming Language :: Python :: 3.12",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-        "Topic :: System :: Monitoring",
-        "Topic :: System :: Networking :: Monitoring",
-        "Topic :: System :: Systems Administration",
-        "Intended Audience :: Developers",
-        "Intended Audience :: System Administrators",
-        "Intended Audience :: Information Technology"
-	]
-)
+# zabbix_utils
+#
+# Copyright (C) 2001-2023 Zabbix SIA
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify,
+# merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software
+# is furnished to do so, subject to the following conditions:
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+import re
+import setuptools
+from zabbix_utils.version import __version__
+with open("README.md", "r", encoding="utf-8") as fh:
+    regexp = r'(?<=##)\s*Get started\n*(^\*.*\n){1,10}\n*##'
+    long_description = re.sub(regexp, '', fh.read(), flags=re.M)
+setuptools.setup(
+    name="zabbix_utils",
+    version=__version__,
+    author="Zabbix SIA",
+    author_email="integrationteam@zabbix.com",
+    maintainer="Aleksandr Iantsen",
+    maintainer_email="aleksandr.iantsen@zabbix.com",
+    description="A library with modules for working with Zabbix (Zabbix API, Zabbix sender, Zabbix get)",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    keywords="monitoring zabbix api sender get utils tools",
+    url="https://github.com/zabbix/python-zabbix-utils",
+    test_suite='tests',
+    packages=["zabbix_utils"],
+    tests_require=["unittest"],
+    install_requires=[],
+    extras_require={
+        "async": ["aiohttp>=3,<4"],
+    },
+    python_requires='>=3.8',
+    project_urls={
+        'Zabbix': 'https://www.zabbix.com/documentation/current',
+        'Source': 'https://github.com/zabbix/python-zabbix-utils',
+        'Changes': 'https://github.com/zabbix/python-zabbix-utils/blob/main/CHANGELOG.md',
+        'Bug Tracker': 'https://github.com/zabbix/python-zabbix-utils/issues'
+    },
+    classifiers=[
+        "Development Status :: 5 - Production/Stable",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
+        "Topic :: System :: Monitoring",
+        "Topic :: System :: Networking :: Monitoring",
+        "Topic :: System :: Systems Administration",
+        "Intended Audience :: Developers",
+        "Intended Audience :: System Administrators",
+        "Intended Audience :: Information Technology"
+	]
+)

{zabbix_utils-2.0.2 → zabbix_utils-2.0.4}/zabbix_utils/__init__.py RENAMED Viewed

@@ -1,55 +1,55 @@
-# zabbix_utils
-#
-# Copyright (C) 2001-2023 Zabbix SIA
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without restriction,
-# including without limitation the rights to use, copy, modify,
-# merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software
-# is furnished to do so, subject to the following conditions:
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-from .api import ZabbixAPI
-from .sender import Sender
-from .getter import Getter
-from .types import ItemValue, APIVersion
-from .exceptions import ModuleBaseException, APIRequestError, APINotSupported, ProcessingError
-from .aiosender import AsyncSender
-from .aiogetter import AsyncGetter
-try:
-    __import__('aiohttp')
-except ModuleNotFoundError:
-    class AsyncZabbixAPI():
-        def __init__(self, *args, **kwargs):
-            raise ModuleNotFoundError("No module named 'aiohttp'")
-else:
-    from .aioapi import AsyncZabbixAPI
-__all__ = (
-    'ZabbixAPI',
-    'AsyncZabbixAPI',
-    'APIVersion',
-    'Sender',
-    'AsyncSender',
-    'ItemValue',
-    'Getter',
-    'AsyncGetter',
-    'ModuleBaseException',
-    'APIRequestError',
-    'APINotSupported',
-    'ProcessingError'
-)
+# zabbix_utils
+#
+# Copyright (C) 2001-2023 Zabbix SIA
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify,
+# merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software
+# is furnished to do so, subject to the following conditions:
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+from .api import ZabbixAPI
+from .sender import Sender
+from .getter import Getter
+from .types import ItemValue, APIVersion
+from .exceptions import ModuleBaseException, APIRequestError, APINotSupported, ProcessingError
+from .aiosender import AsyncSender
+from .aiogetter import AsyncGetter
+try:
+    __import__('aiohttp')
+except ModuleNotFoundError:
+    class AsyncZabbixAPI():
+        def __init__(self, *args, **kwargs):
+            raise ModuleNotFoundError("No module named 'aiohttp'")
+else:
+    from .aioapi import AsyncZabbixAPI
+__all__ = (
+    'ZabbixAPI',
+    'AsyncZabbixAPI',
+    'APIVersion',
+    'Sender',
+    'AsyncSender',
+    'ItemValue',
+    'Getter',
+    'AsyncGetter',
+    'ModuleBaseException',
+    'APIRequestError',
+    'APINotSupported',
+    'ProcessingError'
+)

{zabbix_utils-2.0.2 → zabbix_utils-2.0.4}/zabbix_utils/aioapi.py RENAMED Viewed

@@ -34,7 +34,7 @@ from textwrap import shorten
 from os import environ as env
 from urllib.error import URLError
-from typing import Callable, Union, Optional, Any
+from typing import Callable, Union, Optional, Coroutine, Any
 from aiohttp.client_exceptions import ContentTypeError
 from .types import APIVersion
@@ -120,7 +120,8 @@ class AsyncZabbixAPI():
     __session_id = None
     __internal_client = None
-    def __init__(self, url: Optional[str] = None,
+    def __init__(self, url: Optional[str] = None, token: Optional[str] = None,
+                 user: Optional[str] = None, password: Optional[str] = None,
                  http_user: Optional[str] = None, http_password: Optional[str] = None,
                  skip_version_check: bool = False, validate_certs: bool = True,
                  client_session: Optional[aiohttp.ClientSession] = None, timeout: int = 30):
@@ -131,6 +132,10 @@ class AsyncZabbixAPI():
         self.validate_certs = validate_certs
         self.timeout = timeout
+        self.__token = token
+        self.__user = user
+        self.__password = password
         client_params: dict = {}
         if client_session is None:
@@ -171,18 +176,21 @@ class AsyncZabbixAPI():
         return APIObject(name, self)
     async def __aenter__(self) -> Callable:
-        return self
+        return await self.login()
     async def __aexit__(self, *args) -> None:
         await self.logout()
+    def __await__(self) -> Coroutine:
+        return self.login().__await__()
     async def __aclose_session(self) -> None:
         if self.__internal_client:
             await self.__internal_client.close()
     async def __exception(self, exc) -> None:
         await self.__aclose_session()
-        raise exc from exc
+        raise exc
     def __close_session(self) -> None:
         if self.__internal_client:
@@ -212,7 +220,7 @@ class AsyncZabbixAPI():
         return self.api_version()
     async def login(self, token: Optional[str] = None, user: Optional[str] = None,
-                    password: Optional[str] = None) -> None:
+                    password: Optional[str] = None) -> Callable:
         """Login to Zabbix API.
         Args:
@@ -221,9 +229,9 @@ class AsyncZabbixAPI():
             password (str, optional): Zabbix API user's password. Defaults to `None`.
         """
-        user = user or env.get('ZABBIX_USER') or None
-        password = password or env.get('ZABBIX_PASSWORD') or None
-        token = token or env.get('ZABBIX_TOKEN') or None
+        token = token or self.__token or env.get('ZABBIX_TOKEN') or None
+        user = user or self.__user or env.get('ZABBIX_USER') or None
+        password = password or self.__password or env.get('ZABBIX_PASSWORD') or None
         if token:
             if self.version < 5.4:
@@ -237,7 +245,7 @@ class AsyncZabbixAPI():
                 )
             self.__use_token = True
             self.__session_id = token
-            return
+            return self
         if not user:
             await self.__exception(ProcessingError("Username is missing"))
@@ -263,6 +271,8 @@ class AsyncZabbixAPI():
         log.debug("Connected to Zabbix API version %s: %s", self.version, self.url)
+        return self
     async def logout(self) -> None:
         """Logout from Zabbix API."""

{zabbix_utils-2.0.2 → zabbix_utils-2.0.4}/zabbix_utils/aiosender.py RENAMED Viewed

@@ -69,6 +69,7 @@ Defaults to `None`.
         self.use_ipv6 = use_ipv6
         self.tls = {}
+        self.host = None
         self.source_ip = None
         self.chunk_size = chunk_size
         self.compression = compression
@@ -105,6 +106,7 @@ Defaults to `None`.
         for cluster in server_row.split(','):
             self.clusters.append(Cluster(cluster.strip().split(';')))
+        self.host = config.get('Hostname')
         if 'SourceIP' in config:
             self.source_ip = config.get('SourceIP')
@@ -310,4 +312,4 @@ It must be a list of ItemValue objects: {json.dumps(chunk)}")
             TrapperResponse: Response from Zabbix server/proxy.
         """
-        return await self.send([ItemValue(host, key, value, clock, ns)])
+        return await self.send([ItemValue(host or self.host or '', key, value, clock, ns)])

{zabbix_utils-2.0.2 → zabbix_utils-2.0.4}/zabbix_utils/api.py RENAMED Viewed

@@ -347,7 +347,6 @@ class ZabbixAPI():
             headers=headers,
             method='POST'
         )
-        req.timeout = self.timeout
         # Disable SSL certificate validation if needed.
         if not self.validate_certs:
@@ -360,7 +359,7 @@ class ZabbixAPI():
             ctx = None
         try:
-            resp = ul.urlopen(req, context=ctx)
+            resp = ul.urlopen(req, context=ctx, timeout=self.timeout)
             resp_json = json.loads(resp.read().decode('utf-8'))
         except URLError as err:
             raise ProcessingError(f"Unable to connect to {self.url}:", err) from None

zabbix-utils 2.0.2__tar.gz → 2.0.4__tar.gz

zabbix-utils 2.0.2tar.gz → 2.0.4tar.gz