Merge branch 'fixes_3_16_0'

HenriWahl · Oct 24, 2024 · a2b5730 · a2b5730
2 parents f9a40d0 + ddfd7b0
commit a2b5730
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/.github/workflows/build-release-latest.yml b/.github/workflows/build-release-latest.yml
@@ -375,7 +375,7 @@ jobs:
     env:
       family: fedora
       # which image to use for packaging
-      cr_image_latest: 39
+      cr_image_latest: 40
     steps:
       # get binaries created by other jobs
       - uses: actions/download-artifact@v4

diff --git a/.github/workflows/build-release-stable.yml b/.github/workflows/build-release-stable.yml
@@ -371,7 +371,7 @@ jobs:
     env:
       family: fedora
       # which image to use for packaging
-      cr_image_latest: 39
+      cr_image_latest: 40
     steps:
       # get binaries created by other jobs
       - uses: actions/download-artifact@v4

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.16.2'
+    VERSION = '3.17-20241023'
     WEBSITE = 'https://nagstamon.de'
     COPYRIGHT = '©2008-2024 Henri Wahl et al.'
     COMMENTS = 'Nagios status monitor for your desktop'

diff --git a/Nagstamon/Servers/IcingaDBWeb.py b/Nagstamon/Servers/IcingaDBWeb.py
@@ -736,18 +736,26 @@ def open_monitor(self, host, service=''):
             print("Cannot find {}::{}. Skipping!".format(host, service))
             return
 
-        # only type is important so do not care of service '' in case of host monitor
+        # Generate the base path for the URL
+        base_path = urllib.parse.urlparse(self.monitor_url).path
+
+        # Handle URL for host monitoring
         if service == '':
-            url = '{0}/icingadb/hosts?host.state.is_problem=y&sort=host.state.severity#!{1}/icingadb/host?{2}'.format(self.monitor_url,
-                                                                                                                     (urllib.parse.urlparse(self.monitor_url).path),
-                                                                                                                     urllib.parse.urlencode(
-                                                                                                                        {'name': self.hosts[host].real_name}).replace('+', ' '))
+            url = '{0}/icingadb/hosts?host.state.is_problem=y&sort=host.state.severity#!{1}/icingadb/host?{2}'.format(
+                self.monitor_url,
+                base_path,
+                urllib.parse.urlencode({'name': self.hosts[host].real_name}, quote_via=quote)
+            )
         else:
-            url = '{0}/icingadb/services?service.state.is_problem=y&sort=service.state.severity%20desc#!{1}/icingadb/service?{2}'.format(self.monitor_url,
-                                                                                                                                   (urllib.parse.urlparse(self.monitor_url).path),
-                                                                                                                                    urllib.parse.urlencode(
-                                                                                                                                        {'name': self.hosts[host].services[service].real_name,
-                                                                                                                                         'host.name': self.hosts[host].real_name}).replace('+', ' '))
+            # Handle URL for service monitoring
+            url = '{0}/icingadb/services?service.state.is_problem=y&sort=service.state.severity%20desc#!{1}/icingadb/service?{2}'.format(
+                self.monitor_url,
+                base_path,
+                urllib.parse.urlencode({
+                    'name': self.hosts[host].services[service].real_name,
+                    'host.name': self.hosts[host].real_name
+                }, quote_via=urllib.parse.quote)
+            )
         if conf.debug_mode:
             self.debug(server=self.get_name(), host=host, service=service,
                        debug='[Open monitor] Open host/service monitor web page {0}'.format(url))

diff --git a/build/debian/changelog b/build/debian/changelog
@@ -1,8 +1,9 @@
-nagstamon (3.16.2) stable; urgency=low
+nagstamon (3.17-20241023) unstable; urgency=low
   * New upstream
     - fix sound problem
+    - fix IncingaDBWeb
 
- -- Henri Wahl <[email protected]> Wed, Oct 23 2024 08:00:00 +0200
+ -- Henri Wahl <[email protected]> Mon, Oct 21 2024 08:00:00 +0200
 
 nagstamon (3.16.1) stable; urgency=low
   * New upstream