nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2025-01-02 06:27:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'issue1606' into develop

Browse Source
This commit is contained in:
nicolargo 2020-02-27 13:56:24 +01:00
commit d19f9c002e
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/aoa/fs.rst
View File

@ -37,10 +37,17 @@ system:
Also, you can hide mount points as well (in the following ``/boot``): Also, you can hide mount points as well (in the following ``/boot``):
.. code-block:: ini
[fs]
hide=/boot.*
Filtering can also be done on device name (Glances 3.1.4 or higher):
.. code-block:: ini .. code-block:: ini
[fs] [fs]
hide=/boot.* hide=/dev/sdb2
RAID RAID
---- ----

15
glances/plugins/glances_fs.py
View File

@ -114,7 +114,8 @@ class Plugin(GlancesPlugin):
# Loop over fs # Loop over fs
for fs in fs_stat: for fs in fs_stat:
# Do not take hidden file system into account # Do not take hidden file system into account
if self.is_hide(fs.mountpoint): # Also check device name (see issue #1606)
if self.is_hide(fs.mountpoint) or self.is_hide(fs.device):
continue continue
# Grab the disk usage # Grab the disk usage
try: try:
@ -163,7 +164,11 @@ class Plugin(GlancesPlugin):
'used': used, 'used': used,
'percent': percent, 'percent': percent,
'key': self.get_key()} 'key': self.get_key()}
stats.append(fs_current) # Do not take hidden file system into account
if self.is_hide(fs_current['mnt_point']):
continue
else:
stats.append(fs_current)
else: else:
# Default behavior # Default behavior
for fs in fs_stat: for fs in fs_stat:
@ -174,7 +179,11 @@ class Plugin(GlancesPlugin):
'used': int(fs_stat[fs]['used']) * 1024, 'used': int(fs_stat[fs]['used']) * 1024,
'percent': float(fs_stat[fs]['percent']), 'percent': float(fs_stat[fs]['percent']),
'key': self.get_key()} 'key': self.get_key()}
stats.append(fs_current) # Do not take hidden file system into account
if self.is_hide(fs_current['mnt_point']) or self.is_hide(fs_current['device_name']):
continue
else:
stats.append(fs_current)
# Update the stats # Update the stats
self.stats = stats self.stats = stats