Merge branch 'issue3248' into develop

glances/main.py

@@ -700,7 +700,10 @@ Examples of use:
         args.network_cumul = False
 
         # Processlist is updated in processcount
-        if getattr(args, 'enable_processlist', False) or getattr(args, 'enable_programlist', False):
+        if getattr(args, 'disable_processcount', False):
+            logger.warning('Processcount is disable, so processlist (updated by processcount) is also disable')
+            disable(args, 'processlist')
+        elif getattr(args, 'enable_processlist', False) or getattr(args, 'enable_programlist', False):
             enable(args, 'processcount')
 
         # Set a default export_process_filter (with all process) when using the stdout mode

glances/outputs/static/js/services.js

@@ -72,11 +72,11 @@ class GlancesStatsService {
                     const data = {
                         stats: response[0],
                         views: response[1],
-                        isBsd: response[0]['system']['os_name'] === 'FreeBSD',
-                        isLinux: response[0]['system']['os_name'] === 'Linux',
-                        isSunOS: response[0]['system']['os_name'] === 'SunOS',
-                        isMac: response[0]['system']['os_name'] === 'Darwin',
-                        isWindows: response[0]['system']['os_name'] === 'Windows'
+                        isBsd: response[0].system?.os_name === 'FreeBSD',
+                        isLinux: response[0].system?.os_name === 'Linux',
+                        isSunOS: response[0].system?.os_name === 'SunOS',
+                        isMac: response[0].system?.os_name === 'Darwin',
+                        isWindows: response[0].system?.os_name === 'Windows'
                     };
                     this.data = data;
                     store.data = data;

glances/plugins/ip/__init__.py

@@ -181,10 +181,6 @@ class IpPlugin(GlancesPluginModel):
         if not self.stats or self.is_disabled() or netifaces_tag:
             return ret
 
-        # Build the string message
-        msg = ' - '
-        ret.append(self.curse_add_line(msg, optional=True))
-
         # Start with the private IP information
         if 'address' in self.stats:
             msg = 'IP '

glances/plugins/system/__init__.py

@@ -252,7 +252,7 @@ class SystemPlugin(GlancesPluginModel):
         ret.append(self.curse_add_line(msg, "TITLE"))
 
         # System info
-        msg = ' ' + self.stats['hr_name']
+        msg = ' ' + self.stats['hr_name'] + ' '
         ret.append(self.curse_add_line(msg, optional=True))
 
         # Return the message with decoration