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

fix new username field name #39

Merged
merged 2 commits into from
Apr 28, 2023
Merged

fix new username field name #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d10ab1
fix new username field name
gescheit Apr 28, 2023
1cf7abb
fix
gescheit Apr 28, 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
24 changes: 23 additions & 1 deletion zabbix/zabbix_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,24 @@ def wrapper(self, method, opts):
return wrapper


def version_compare(v1, v2):
"""
The result is 0 if v1 == v2, -1 if v1 < v2, and +1 if v1 > v2
"""
for v1_part, v2_part in zip(v1.split("."), v2.split(".")):
if v1_part.isdecimal() and v2_part.isdecimal():
if int(v1_part) > int(v2_part):
return 1
elif int(v1_part) < int(v2_part):
return -1
else:
if v1 > v2:
return 1
elif v1 < v2:
return -1
return 0


class ZabbixAPIException(Exception):

""" generic zabbix api exception
Expand Down Expand Up @@ -213,7 +231,11 @@ def login(self, user='', password='', save=True, api_token=None):
hashed_pw_string = "md5(" + hashlib.md5(l_password.encode('utf-8')).hexdigest() + ")"
self.debug(logging.DEBUG, "Trying to login with %s:%s" %
(repr(l_user), repr(hashed_pw_string)))
obj = self.json_obj('user.login', {'user': l_user, 'password': l_password}, auth=False)
if version_compare(self.api_version(), '5.4') >= 0:
login_arg = {'username': l_user, 'password': l_password}
else:
login_arg = {'user': l_user, 'password': l_password}
obj = self.json_obj('user.login', login_arg, auth=False)
result = self.do_request(obj)
self.auth = result['result']

Expand Down