summaryrefslogtreecommitdiffstats
path: root/plugins/memory.py
diff options
context:
space:
mode:
authorndarshan <dnarayan@redhat.com>2014-04-21 12:19:06 +0530
committerSahina Bose <sabose@redhat.com>2014-05-08 01:49:08 -0700
commite96918e80ce059ed3dbd2099db00eee8c120809f (patch)
treed74babe69a768969e9ad15d7171bf39e0500a0d2 /plugins/memory.py
parentb87f9527515f27f145cc6b5cff1e68bab5cf2b21 (diff)
rhs-addons:Fix: Modified swap and memory plugin to show in GB.
Modified swap and memory plugin to show message and performance data in GB instead of kB. https://bugzilla.redhat.com/show_bug.cgi?id=1080004 Signed-off-by: ndarshan <dnarayan@redhat.com> Change-Id: I06cfd4cd8e19ac8bc21c50ee0f37f15b4ae8cc2e Reviewed-on: http://review.gluster.org/7640 Reviewed-by: Sahina Bose <sabose@redhat.com>
Diffstat (limited to 'plugins/memory.py')
-rwxr-xr-xplugins/memory.py30
1 files changed, 19 insertions, 11 deletions
diff --git a/plugins/memory.py b/plugins/memory.py
index c57a269..6c1de22 100755
--- a/plugins/memory.py
+++ b/plugins/memory.py
@@ -45,7 +45,9 @@ def showMemStat(warning, critical, s):
pl_op['exit_status'] = utils.PluginStatusCode.UNKNOWN
return pl_op
try:
- totalMem = int(s['memory']['memfree']) + int(s['memory']['memused'])
+ totalMem = utils.convertSize((int(s['memory']['memfree'])
+ + int(s['memory']['memused'])),
+ "KB", "GB")
except (KeyError, ValueError) as e:
pl_op["message"] = "key: %s not found" % str(e)
pl_op["exit_status"] = utils.PluginStatusCode.UNKNOWN
@@ -53,30 +55,36 @@ def showMemStat(warning, critical, s):
crit_value = (totalMem * critical) / 100
war_value = (totalMem * warning) / 100
- if int(s['memory']['memused']) >= crit_value:
+ if utils.convertSize(int(s['memory']['memused']),
+ "KB", "GB") >= crit_value:
pl_op["message"] = utils.PluginStatus.CRITICAL
pl_op['exit_status'] = utils.PluginStatusCode.CRITICAL
- elif int(s['memory']['memused']) >= war_value:
+ elif utils.convertSize(int(s['memory']['memused']),
+ "KB", "GB") >= war_value:
pl_op["message"] = utils.PluginStatus.WARNING
pl_op['exit_status'] = utils.PluginStatusCode.WARNING
else:
pl_op["message"] = utils.PluginStatus.OK
pl_op['exit_status'] = utils.PluginStatusCode.OK
try:
- pl_op["message"] += ("- %.2f%% used(%skB out of %skB)|"
- "Total=%skB;%s;%s;0;%s"
- " Used=%skB Buffered=%skB"
- " Cached=%skB" % (
+ pl_op["message"] += ("- %.2f%% used(%.2fGB out of %.2fGB)|"
+ "Total=%.2fGB;%.2f;%.2f;0;%.2f"
+ " Used=%.2fGB Buffered=%.2fGB"
+ " Cached=%.2fGB" % (
float(s['memory']['memused-percent']),
- s['memory']['memused'],
+ utils.convertSize(int(s['memory']['memused']),
+ "KB", "GB"),
totalMem,
totalMem,
war_value,
crit_value,
totalMem,
- s['memory']['memused'],
- s['memory']['buffers'],
- s['memory']['cached']))
+ utils.convertSize(int(s['memory']['memused']),
+ "KB", "GB"),
+ utils.convertSize(int(s['memory']['buffers']),
+ "KB", "GB"),
+ utils.convertSize(int(s['memory']['cached']),
+ "KB", "GB")))
except (KeyError, ValueError, TypeError) as e:
pl_op["message"] = "key: %s not found" % str(e)
pl_op["exit_status"] = utils.PluginStatusCode.UNKNOWN