Merge pull request #2374 from nicolargo/issue1985

Podman support for glances

conf/glances.conf

@@ -391,7 +391,7 @@ port_default_gateway=True
 #web_4_url=https://blog.nicolargo.com/nonexist
 #web_4_description=Intranet
 
-[docker]
+[containers]
 disable=False
 # Only show specific containers (comma separated list of container name or regular expression)
 # Comment this line to display all containers (default configuration)
@@ -417,6 +417,8 @@ max_name_size=20
 # By default, Glances only display running containers
 # Set the following key to True to display all containers
 all=False
+# Define Podman sock
+#podman_sock=unix:///run/user/1000/podman/podman.sock
 
 [amps]
 # AMPs configuration are defined in the bottom of this file

glances/compat.py

@@ -20,6 +20,7 @@
 import subprocess
 import os
 from datetime import datetime
+import re
 
 from glances.logger import logger
 
@@ -366,3 +367,39 @@ def urlopen_auth(url, username, password):
             headers={'Authorization': 'Basic ' + base64.b64encode(('%s:%s' % (username, password)).encode()).decode()},
         )
     )
+
+
+def string_value_to_float(s):
+    """Convert a string with a value and an unit to a float.
+    Example:
+    '12.5 MB' -> 12500000.0
+    '32.5 GB' -> 32500000000.0
+    Args:
+        s (string): Input string with value and unit
+    Output:
+        float: The value in float
+    """
+    convert_dict = {
+        None: 1,
+        'B': 1,
+        'KB': 1000,
+        'MB': 1000000,
+        'GB': 1000000000,
+        'TB': 1000000000000,
+        'PB': 1000000000000000,
+    }
+    unpack_string = [
+        i[0] if i[1] == '' else i[1].upper() for i in re.findall(r'([\d.]+)|([^\d.]+)', s.replace(' ', ''))
+    ]
+    if len(unpack_string) == 2:
+        value, unit = unpack_string
+    elif len(unpack_string) == 1:
+        value = unpack_string[0]
+        unit = None
+    else:
+        return None
+    try:
+        value = float(unpack_string[0])
+    except ValueError:
+        return None
+    return value * convert_dict[unit]

glances/outputs/glances_curses.py

@@ -57,7 +57,7 @@ class _GlancesCurses(object):
         'c': {'sort_key': 'cpu_percent'},
         'C': {'switch': 'disable_cloud'},
         'd': {'switch': 'disable_diskio'},
-        'D': {'switch': 'disable_docker'},
+        'D': {'switch': 'disable_containers'},
         # 'e' > Enable/Disable process extended
         # 'E' > Erase the process filter
         # 'f' > Show/hide fs / folder stats
@@ -124,7 +124,7 @@ class _GlancesCurses(object):
     _left_sidebar_max_width = 34
 
     # Define right sidebar
-    _right_sidebar = ['docker', 'processcount', 'amps', 'processlist', 'alert']
+    _right_sidebar = ['containers', 'processcount', 'amps', 'processlist', 'alert']
 
     def __init__(self, config=None, args=None):
         # Init
@@ -617,7 +617,7 @@ def display(self, stats, cs_status=None):
         max_processes_displayed = (
             self.term_window.getmaxyx()[0]
             - 11
-            - (0 if 'docker' not in __stat_display else self.get_stats_display_height(__stat_display["docker"]))
+            - (0 if 'containers' not in __stat_display else self.get_stats_display_height(__stat_display["containers"]))
             - (
                 0
                 if 'processcount' not in __stat_display