Skip to content

update/zabbix-api-params-changed-in-v6 #155

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

update/zabbix-api-params-changed-in-v6 #155

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3b3fa70
Updated user.login method parameter to match updates made in version …
jschoewe Jun 6, 2023
55f40f4
Added version check so login works with previous versions
jschoewe Jun 6, 2023
424757f
Merge pull request #1 from EncoreTechnologies/update/zabbix-api-param…
bishopbm1 Jun 7, 2023
1b91cff
Added dependency to install with module
jschoewe Nov 8, 2023
3aa24de
Testing py-zabbix package install
jschoewe Nov 8, 2023
2a15c7f
Merge pull request #2 from EncoreTechnologies/update/add-required-dep…
bishopbm1 Nov 9, 2023
ee9208d
ready to merge upstream
jschoewe Feb 16, 2025
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
Prev Previous commit
Next Next commit
Added version check so login works with previous versions
  • Loading branch information
@jschoewe
jschoewe committed Jun 6, 2023
commit 55f40f4bcc0fcd45fe1ec909abc92c80c30cc2f0
9 changes: 8 additions & 1 deletion pyzabbix/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import ssl
import sys
import base64
from packaging.version import Version

# For Python 2 and 3 compatibility
try:
Expand Down Expand Up @@ -196,7 +197,13 @@ def _login(self, user='', password=''):

logger.debug("ZabbixAPI.login({0},{1})".format(user, HideSensitiveService.HIDEMASK))

self.auth = self.user.login(username=user, password=password)
api_version = Version(self.apiinfo.version())

# 5.4.0 was the first version of Zabbix to change the user param in the login method
if api_version and api_version < Version("5.4.0"):
self.auth = self.user.login(user=user, password=password)
else:
self.auth = self.user.login(username=user, password=password)

def _logout(self):
"""Do logout from zabbix server."""
Expand Down