diff --git a/.bin/Scripts/functions/data.py b/.bin/Scripts/functions/data.py index 7dcee3cf..be8d7f02 100644 --- a/.bin/Scripts/functions/data.py +++ b/.bin/Scripts/functions/data.py @@ -333,6 +333,7 @@ def mount_volumes( if vol_data['show_data']['data'] == 'Failed to mount': vol_data['mount_point'] = None else: + fstype = vol_data.get('fstype', 'UNKNOWN FS') size_used = human_readable_size( mounted_volumes[vol_path]['used']) size_avail = human_readable_size( @@ -342,8 +343,9 @@ def mount_volumes( vol_data['mount_point'] = mounted_volumes[vol_path]['target'] vol_data['show_data']['data'] = 'Mounted on {}'.format( mounted_volumes[vol_path]['target']) - vol_data['show_data']['data'] = '{:40} ({} used, {} free)'.format( + vol_data['show_data']['data'] = '{:40} ({}, {} used, {} free)'.format( vol_data['show_data']['data'], + fstype, size_used, size_avail) diff --git a/.bin/Scripts/functions/osticket.py b/.bin/Scripts/functions/osticket.py index 0186f11a..b9b327f0 100644 --- a/.bin/Scripts/functions/osticket.py +++ b/.bin/Scripts/functions/osticket.py @@ -247,6 +247,7 @@ class osTicket(): else: # Ensure string type label = '' + fstype = v_data.get('fstype', 'UNKNOWN FS') size = v_data.get('size', '') if size: size = '{} {}B'.format(size[:-1], size[-1:]).upper() @@ -254,7 +255,7 @@ class osTicket(): size = 'UNKNOWN' size_used = v_data.get('size_used', 'UNKNOWN').upper() size_avail = v_data.get('size_avail', 'UNKNOWN').upper() - v_data = [v_path, label, size, size_used, size_avail] + v_data = [v_path, label, size, fstype, size_used, size_avail] v_data = [v.strip().replace(' ', '_') for v in v_data] for i in range(len(v_data)): pad = 8 @@ -266,7 +267,7 @@ class osTicket(): v_data[-1] = re.sub(r'\.*$', '', v_data[-1]) v_data = [v.replace('_', ' ') for v in v_data] report.append( - '{}..{}..Total..{}..(Used..{}..Free..{})'.format(*v_data)) + '{}..{}..Total..{}..({}..Used..{}..Free..{})'.format(*v_data)) # Done return report