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>

2 files changed, 32 insertions, 18 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
diff --git a/plugins/swap.py b/plugins/swap.py
index 5e44f6e..002d287 100755
--- a/plugins/swap.py
+++ b/plugins/swap.py
@@ -44,7 +44,9 @@ def showSwapStat(warning, critical, s):
         pl_op['exit_status'] = utils.PluginStatusCode.UNKNOWN
         return pl_op
     try:
-        totalSwap = int(s['memory']['swpfree']) + int(s['memory']['swpused'])
+        totalSwap = utils.convertSize((int(s['memory']['swpfree'])
+                                       + int(s['memory']['swpused'])),
+                                      "KB", "GB")
     except (KeyError, ValueError, TypeError) as e:
         pl_op["message"] = "key: %s not found" % str(e)
         pl_op["exit_status"] = utils.PluginStatusCode.UNKNOWN
@@ -52,22 +54,26 @@ def showSwapStat(warning, critical, s):
 
     crit_value = (totalSwap * critical) / 100
     war_value = (totalSwap * warning) / 100
-    if int(s['memory']['swpused']) >= crit_value:
+    if utils.convertSize(int(s['memory']['swpused']),
+                         "KB", "GB") >= crit_value:
         pl_op["message"] = utils.PluginStatus.CRITICAL
         pl_op['exit_status'] = utils.PluginStatusCode.CRITICAL
-    elif int(s['memory']['swpused']) >= war_value:
+    elif utils.convertSize(int(s['memory']['swpused']),
+                           "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)|Used=%skB;%s;"
-                             "%s;0;%s" % (
+        pl_op["message"] += ("- %.2f%% used(%.2fGB out of %.2fGB)|Used=%.2fGB;"
+                             "%.2f;%.2f;0;%.2f" % (
                                  float(s['memory']['swpused-percent']),
-                                 s['memory']['swpused'],
+                                 utils.convertSize(int(s['memory']['swpused']),
+                                                   "KB", "GB"),
                                  totalSwap,
-                                 s['memory']['swpused'],
+                                 utils.convertSize(int(s['memory']['swpused']),
+                                                   "KB", "GB"),
                                  war_value,
                                  crit_value,
                                  totalSwap))