nicolargo/glances
1
1
Fork 0
mirror of https://github.com/nicolargo/glances.git synced 2024-09-22 01:59:49 +03:00
Code Issues Projects Releases Wiki Activity

Add default extended stat for monitored processes list

Browse Source
This commit is contained in:
Nicolas Hennion 2013-08-08 23:07:15 +02:00
parent 9c7faedcc3
commit 9c3f219f16
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glances/conf/glances-with-monitored.conf
View File

@ -84,6 +84,9 @@ mem_critical=90
# * regex: regular expression of the processes to monitor
# * command: (optional) full path to shell command/script for extended stat
# Use with caution. Should return a single line string.
# Only execute when at least one process is running
# By default display CPU and MEM %
# Limitation: Do not use in client / server mode
# * countmin: (optional) minimal number of processes
# A warning will be displayed if number of process < count
# * countmax: (optional) maximum number of processes

32
glances/glances.py
View File

@ -19,7 +19,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
__appname__ = 'glances'
__version__ = "1.7RC3"
__version__ = "1.7RC4"
__author__ = "Nicolas Hennion <nicolas@nicolargo.com>"
__licence__ = "LGPL"
@ -3097,16 +3097,26 @@ class glancesScreen:
monitors.countmin(item),
monitors.countmax(item)))
# Build and print optional message
if (monitors.command(item) != None):
try:
cmdret = subprocess.check_output(monitors.command(item), shell = True)
except subprocess.CalledProcessError:
cmdret = _("Error: ") + monitors.command(item)
except:
cmdret = _("Can not execute command")
monitormsg2 = "{0}".format(cmdret)
self.term_window.addnstr(monitor_y, self.process_x + 35,
monitormsg2, screen_x - process_x - 35)
if (len(monitoredlist) > 0):
if (monitors.command(item) != None):
# Execute the user command line
try:
cmdret = subprocess.check_output(monitors.command(item), shell = True)
except subprocess.CalledProcessError:
cmdret = _("Error: ") + monitors.command(item)
except:
cmdret = _("Can not execute command")
else:
# By default display CPU and MEM %
cmdret = "CPU: {0:.1f}% / MEM: {1:.1f}%".format(
sum([p['cpu_percent'] for p in monitoredlist]),
sum([p['memory_percent'] for p in monitoredlist]))
else:
cmdret = ""
monitormsg2 = "{0}".format(cmdret)
self.term_window.addnstr(monitor_y, self.process_x + 35,
monitormsg2, screen_x - process_x - 35)
# Generate log
logs.add(self.__getMonitoredAlert(len(monitoredlist),