diff --git a/Nagstamon/Config.py b/Nagstamon/Config.py index 33db9047..da59e74a 100644 --- 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.17-20241102' + VERSION = '3.17-20241219' 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 index b4db0de3..a37b8b3b 100644 --- a/Nagstamon/Servers/ZabbixProblemBased.py +++ b/Nagstamon/Servers/ZabbixProblemBased.py @@ -4,7 +4,7 @@ import time import logging import requests -from pkg_resources import parse_version +from packaging import version from Nagstamon.Helpers import HumanReadableDurationFromTimestamp from Nagstamon.Config import conf @@ -200,7 +200,7 @@ def _get_status(self): self.new_hosts[host_id].scheduled_downtime = True #old api shows host interfaces status in host object - if parse_version(self.zbx_version) < parse_version("5.4.0"): + if version.parse(self.zbx_version) < version.parse("5.4.0"): #host not available via agent if trigger[0]['hosts'][0].get('available', '0') == "2": diff --git a/build/debian/changelog b/build/debian/changelog index 7a926632..8b8c02c9 100644 --- a/build/debian/changelog +++ b/build/debian/changelog @@ -1,9 +1,14 @@ -nagstamon (3.17-20241102) unstable; urgency=low +nagstamon (3.17-20241219) unstable; urgency=low + * New upstream + + -- Henri Wahl Thu, Dec 19 2024 08:00:00 +0200 + +nagstamon (3.16.2) unstable; urgency=low * New upstream - fix sound problem - fix IncingaDBWeb - -- Henri Wahl Sat, Nov 02 2024 08:00:00 +0200 + -- Henri Wahl Mon, Oct 21 2024 08:00:00 +0200 nagstamon (3.16.1) stable; urgency=low * New upstream diff --git a/build/debian/control b/build/debian/control index 9ebadbda..17be8c2f 100644 --- a/build/debian/control +++ b/build/debian/control @@ -13,9 +13,9 @@ Vcs-Browser: https://codeload.github.com/HenriWahl/Nagstamon/zip/master Package: nagstamon Architecture: all Depends: ${python3:Depends}, ${misc:Depends}, python3-pkg-resources, python3-bs4, python3-lxml, - python3-pyqt5, python3-pyqt5.qtsvg, python3-pyqt5.qtmultimedia, libqt5multimedia5-plugins, - python3-requests, python3-requests-kerberos, python3-psutil, python3-dbus.mainloop.pyqt5, - python3-keyring, python3-ewmh, python3-arrow + python3-packaging, python3-pyqt5, python3-pyqt5.qtsvg, python3-pyqt5.qtmultimedia, + libqt5multimedia5-plugins, python3-requests, python3-requests-kerberos, python3-psutil, + python3-dbus.mainloop.pyqt5, python3-keyring, python3-ewmh, python3-arrow Recommends: python3-secretstorage Description: Nagios status monitor which takes place in systray or on desktop Nagstamon is a Nagios status monitor which takes place in systray or diff --git a/build/redhat/nagstamon.spec b/build/redhat/nagstamon.spec index dd23d4c8..86d7c7c3 100644 --- a/build/redhat/nagstamon.spec +++ b/build/redhat/nagstamon.spec @@ -23,6 +23,7 @@ Requires: python3-dateutil Requires: python3-dbus Requires: python3-keyring Requires: python3-lxml +Requires: python3-packaging Requires: python3-psutil Requires: python3-pysocks Requires: python3-pyqt6 diff --git a/build/requirements/linux.txt b/build/requirements/linux.txt index b57ac391..a30aae00 100644 --- a/build/requirements/linux.txt +++ b/build/requirements/linux.txt @@ -3,6 +3,7 @@ beautifulsoup4 dbus-python keyring lxml +packaging psutil pyqt6 pyqt6-qt6 diff --git a/build/requirements/macos.txt b/build/requirements/macos.txt index 8136b3a5..abfe3e19 100644 --- a/build/requirements/macos.txt +++ b/build/requirements/macos.txt @@ -2,6 +2,7 @@ arrow beautifulsoup4 keyring lxml +packaging psutil pyinstaller pyobjc-framework-ApplicationServices diff --git a/build/requirements/windows.txt b/build/requirements/windows.txt index 4c56fd13..dfdee763 100644 --- a/build/requirements/windows.txt +++ b/build/requirements/windows.txt @@ -3,6 +3,7 @@ beautifulsoup4 keyring lxml pip-system-certs +packaging psutil pyinstaller pypiwin32 diff --git a/setup.py b/setup.py index 31278431..ed109701 100644 --- a/setup.py +++ b/setup.py @@ -99,6 +99,7 @@ 'python3-dateutil ' 'python3-keyring ' 'python3-lxml ' + 'python3-packaging ' 'python3-psutil ' 'python3-pysocks ' 'python3-qt5 '