make Zabbix copy-all-to-clipboard work again

HenriWahl · Sep 25, 2023 · 24e97b5 · 24e97b5
1 parent 93371ae
commit 24e97b5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/Nagstamon/Config.py b/Nagstamon/Config.py
@@ -60,7 +60,7 @@
     DESKTOP_WAYLAND = False
 
 # detection of somehow quirky desktop enviroments which might need a fix
-QUIRKY_DESKTOPS =  ('cinnamon', 'gnome-flashback-metacity')
+QUIRKY_DESKTOPS = ('cinnamon', 'gnome-flashback-metacity')
 if os.environ.get('CINNAMON_VERSION') or\
     os.environ.get('DESKTOP_SESSION') in QUIRKY_DESKTOPS or \
     os.environ.get('XDG_SESSION_DESKTOP') in QUIRKY_DESKTOPS:

diff --git a/Nagstamon/QUI/__init__.py b/Nagstamon/QUI/__init__.py
@@ -3897,14 +3897,15 @@ def action_clipboard_action_all(self):
         for line_number in range(len(list_host)):
             host = list_host[line_number]
             service = list_service[line_number]
-
             # item to access all properties of host/service object
             # defaults to host
             item = self.server.hosts[host]
             text += 'Host: {0}\n'.format(host)
             # if it is a service switch to service object
-            if service != '' and item.services.get(service):
-                item = item.services[service]
+            # collect all services to be able to serve Zabbix too, which uses IDs instead of service names
+            services_dict = {v.service:v for k, v in item.services.items()}
+            if service != '' and services_dict.get(service):
+                item = services_dict[service]
                 text += 'Service: {0}\n'.format(service)
             # the other properties belong to both hosts and services
             text += 'Status: {0}\n'.format(item.status)

diff --git a/Nagstamon/Servers/Icinga.py b/Nagstamon/Servers/Icinga.py
@@ -388,8 +388,8 @@ def _get_status_HTML(self):
                                     n['status_information'] = ''
                                 else:
                                     n['status_information'] = str(tds[4].string)
-                                    # attempts are not shown in case of hosts so it defaults to 'N/A'
-                                n['attempt'] = 'N/A'
+                                    # attempts are not shown in case of hosts so it defaults to 'n/a'
+                                n['attempt'] = 'n/a'
                             else:
                                 # attempts are shown for hosts
                                 # to fix http://sourceforge.net/tracker/?func=detail&atid=1101370&aid=3280961&group_id=236865 .attempt needs

diff --git a/Nagstamon/Servers/Zabbix.py b/Nagstamon/Servers/Zabbix.py
@@ -272,7 +272,7 @@ def _get_status(self):
                         'status': 'UP',  # Host is OK by default
                         'last_check': 'n/a',
                         'duration': '',
-                        'attempt': 'N/A',
+                        'attempt': 'n/a',
                         'status_information': '',
                         # status flags
                         'passiveonly': False,