From 5785fcff2832915ade9413c93c484c9355390a80 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Thu, 25 Feb 2016 22:12:55 +0100 Subject: [PATCH] First try, FS and NETWORK did not work... --- conf/glances.conf | 12 ++++++------ glances/plugins/glances_plugin.py | 9 ++++++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/conf/glances.conf b/conf/glances.conf index 9fa9c5e9..21acfa00 100644 --- a/conf/glances.conf +++ b/conf/glances.conf @@ -68,8 +68,8 @@ warning=70 critical=90 #[network] -# Define the list of hidden network interfaces (comma separeted) -#hide=lo +# Define the list of hidden network interfaces (comma separeted regexp) +hide=docker0 # WLAN 0 alias #wlan0_alias=Wireless IF # WLAN 0 Default limits (in bits per second aka bps) for interface bitrate @@ -83,12 +83,14 @@ critical=90 #wlan0_tx_log=True [diskio] -# Define the list of hidden disks (comma separeted) -#hide=sda2,sda5 +# Define the list of hidden disks (comma separeted regexp) +hide=sda2,sda5 # Alias for sda1 #sda1_alias=IntDisk [fs] +# Define the list of hidden file system (comma separeted regexp) +hide=\/boot\/efi # Define filesystem space thresholds in % # Default values if not defined: 50/70/90 # It is also possible to define per mount point value @@ -98,8 +100,6 @@ warning=70 critical=90 # Allow additionnals files types (comma-separated FS type) #allow=zfs -# Define the list of hidden file system (comma separeted) -#hide=/boot/efi [folders] # Define a folder list to monitor diff --git a/glances/plugins/glances_plugin.py b/glances/plugins/glances_plugin.py index d72212d6..a8f31f46 100644 --- a/glances/plugins/glances_plugin.py +++ b/glances/plugins/glances_plugin.py @@ -23,6 +23,7 @@ I am your father... ...for all Glances plugins. """ +import re import json from datetime import datetime from operator import itemgetter @@ -509,7 +510,13 @@ class GlancesPlugin(object): def is_hide(self, value, header=""): """Return True if the value is in the hide configuration list.""" - return value in self.get_conf_value('hide', header=header) + # return value in self.get_conf_value('hide', header=header) + logger.info("="*80) + logger.info("value={}".format(value)) + logger.info("hide={}".format(self.get_conf_value('hide', header=header))) + logger.info("match={}".format([re.match(value, i) for i in self.get_conf_value('hide', header=header)])) + logger.info("result={}".format(not all(j is None for j in [re.match(value, i) for i in self.get_conf_value('hide', header=header)]))) + return not all(j is None for j in [re.match(value, i) for i in self.get_conf_value('hide', header=header)]) def has_alias(self, header): """Return the alias name for the relative header or None if nonexist."""