ZabbixProblemBased.py problem base

HenriWahl · Mar 22, 2024 · 7eb2217 · 7eb2217
1 parent 475ae22
commit 7eb2217
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Nagstamon/Config.py b/Nagstamon/Config.py
@@ -131,7 +131,7 @@ class AppInfo(object):
         contains app information previously located in GUI.py
     """
     NAME = 'Nagstamon'
-    VERSION = '3.14.0'
+    VERSION = '3.15-20240322'
     WEBSITE = 'https://nagstamon.de'
     COPYRIGHT = '©2008-2024 Henri Wahl et al.'
     COMMENTS = 'Nagios status monitor for your desktop'

diff --git a/Nagstamon/Servers/ZabbixProblemBased.py b/Nagstamon/Servers/ZabbixProblemBased.py
@@ -98,7 +98,11 @@ def logged_in(self):
 
     def login(self, username, password):
         self.logger.debug("Login in as " + username)
-        self.zbx_auth = self.do_request('user.login', {'user': username, 'password': password})
+        # see issue https://github.com/HenriWahl/Nagstamon/issues/1018
+        if self.api_version() < '6.4':
+            self.zbx_auth = self.do_request('user.login', {'user': username, 'password': password})
+        else:
+            self.zbx_auth = self.do_request('user.login', {'username': username, 'password': password})
 
 class ZabbixLightApiException(Exception):
     pass

diff --git a/build/debian/changelog b/build/debian/changelog
@@ -1,3 +1,8 @@
+nagstamon (3.15-20240322) unstable; urgency=low
+  * New upstream
+
+ -- Henri Wahl <[email protected]> Fri, Mar 22 2024 08:00:00 +0200
+
 nagstamon (3.14.0) stable; urgency=low
   * New upstream
     - improved Wayland support