From 76d76197c193dcc47478e6805dcfe5b569753e9e Mon Sep 17 00:00:00 2001 From: ndarshan Date: Tue, 24 Mar 2015 11:57:01 +0530 Subject: plugins: Deduct cached space from used space in memory utilization This patch modifies memory utilization plugin to retrun memory used after deducting cached space from it. As this cached space can be got back by applications whenever needed. So we can consider cached space as free. Change-Id: I6e6b7d0fc8148065d806c735606e4605741534d4 Bug-Url: https://bugzilla.redhat.com/1204314 Signed-off-by: ndarshan Reviewed-on: http://review.gluster.org/9977 Reviewed-by: Ramesh N Reviewed-by: Sahina Bose --- plugins/memory.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'plugins/memory.py') diff --git a/plugins/memory.py b/plugins/memory.py index 6c1de22..5d87da1 100755 --- a/plugins/memory.py +++ b/plugins/memory.py @@ -55,12 +55,13 @@ def showMemStat(warning, critical, s): crit_value = (totalMem * critical) / 100 war_value = (totalMem * warning) / 100 - if utils.convertSize(int(s['memory']['memused']), - "KB", "GB") >= crit_value: + usedMem = utils.convertSize(int(s['memory']['memused']) - int( + s['memory']['cached']), "KB", "GB") + usedPercent = usedMem * 100.0 / totalMem + if usedMem >= crit_value: pl_op["message"] = utils.PluginStatus.CRITICAL pl_op['exit_status'] = utils.PluginStatusCode.CRITICAL - elif utils.convertSize(int(s['memory']['memused']), - "KB", "GB") >= war_value: + elif usedMem >= war_value: pl_op["message"] = utils.PluginStatus.WARNING pl_op['exit_status'] = utils.PluginStatusCode.WARNING else: @@ -71,16 +72,14 @@ def showMemStat(warning, critical, s): "Total=%.2fGB;%.2f;%.2f;0;%.2f" " Used=%.2fGB Buffered=%.2fGB" " Cached=%.2fGB" % ( - float(s['memory']['memused-percent']), - utils.convertSize(int(s['memory']['memused']), - "KB", "GB"), + usedPercent, + usedMem, totalMem, totalMem, war_value, crit_value, totalMem, - utils.convertSize(int(s['memory']['memused']), - "KB", "GB"), + usedMem, utils.convertSize(int(s['memory']['buffers']), "KB", "GB"), utils.convertSize(int(s['memory']['cached']), -- cgit