diff options
-rwxr-xr-x | plugins/memory.py | 30 | ||||
-rwxr-xr-x | plugins/swap.py | 20 | ||||
-rw-r--r-- | tests/test_memory_dataFile.py | 18 | ||||
-rw-r--r-- | tests/test_swap_dataFile.py | 16 |
4 files changed, 49 insertions, 35 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)) diff --git a/tests/test_memory_dataFile.py b/tests/test_memory_dataFile.py index b58c218..679aa17 100644 --- a/tests/test_memory_dataFile.py +++ b/tests/test_memory_dataFile.py @@ -35,9 +35,9 @@ SHOW_MEMORY_STATUS_OK_IP = \ 'buffers': '376704', 'dirty': '1696'}} SHOW_MEMORY_STATUS_OK_OP = \ - {'message': "OK- 46.97% used(3696340kB out of 7870384kB)|" - "Total=7870384kB;4722230;5509268;0;7870384 Used=3696340kB" - " Buffered=376704kB Cached=1519240kB", 'exit_status': 0} + {'message': "OK- 46.97% used(3.53GB out of 7.51GB)|" + "Total=7.51GB;4.50;5.25;0;7.51 Used=3.53GB " + "Buffered=0.36GB Cached=1.45GB", 'exit_status': 0} SHOW_MEMORY_STATUS_WARNING_IP = \ {'date': '2014-03-10', 'utc': '1', @@ -52,9 +52,9 @@ SHOW_MEMORY_STATUS_WARNING_IP = \ 'buffers': '376704', 'dirty': '1696'}} SHOW_MEMORY_STATUS_WARNING_OP = \ - {'message': "WARNING- 46.97% used(3696340kB out of 7870384" - "kB)|Total=7870384kB;3148153;4722230;0;7870384 Used=36963" - "40kB Buffered=376704kB Cached=1519240kB", 'exit_status': 1} + {'message': "WARNING- 46.97% used(3.53GB out of 7.51GB)" + "|Total=7.51GB;3.00;4.50;0;7.51 Used=3.53GB" + " Buffered=0.36GB Cached=1.45GB", 'exit_status': 1} SHOW_MEMORY_STATUS_CRITICAL_IP = \ {'date': '2014-03-10', 'utc': '1', @@ -69,9 +69,9 @@ SHOW_MEMORY_STATUS_CRITICAL_IP = \ 'buffers': '376704', 'dirty': '1696'}} SHOW_MEMORY_STATUS_CRITICAL_OP = \ - {'message': "CRITICAL- 46.97% used(3696340kB out of 7870384" - "kB)|Total=7870384kB;2361115;3148153;0;7870384 Used=369634" - "0kB Buffered=376704kB Cached=1519240kB", 'exit_status': 2} + {'message': "CRITICAL- 46.97% used(3.53GB out of 7.51GB)|" + "Total=7.51GB;2.25;3.00;0;7.51 Used=3.53GB " + "Buffered=0.36GB Cached=1.45GB", 'exit_status': 2} SHOW_MEMORY_STATUS_EXCEPTION_IP = \ {'date': '2014-03-10', 'utc': '1', diff --git a/tests/test_swap_dataFile.py b/tests/test_swap_dataFile.py index 58ebaf3..0aff285 100644 --- a/tests/test_swap_dataFile.py +++ b/tests/test_swap_dataFile.py @@ -33,8 +33,8 @@ SHOW_SWAP_STATUS_OK_IP = \ 'unit': 'kB'}} SHOW_SWAP_STATUS_OK_OP = \ - {'message': "OK- 0.00% used(0kB out of 20971516kB)|" - "Used=0kB;10485758;16777212;0;20971516", 'exit_status': 0} + {'message': "OK- 0.00% used(0.00GB out of 20.00GB)|" + "Used=0.00GB;10.00;16.00;0;20.00", 'exit_status': 0} SHOW_SWAP_STATUS_WARNING_IP = \ {'date': '2014-03-10', @@ -47,9 +47,9 @@ SHOW_SWAP_STATUS_WARNING_IP = \ 'unit': 'kB'}} SHOW_SWAP_STATUS_WARNING_OP = \ - {'message': "WARNING- 50.00% used(10485758kB" - " out of 20971516kB)|Used=10485758kB;8388606;" - "12582909;0;20971516", 'exit_status': 1} + {'message': "WARNING- 50.00% used(10.00GB out " + "of 20.00GB)|Used=10.00GB;8.00;12.00;0;20.00", + 'exit_status': 1} SHOW_SWAP_STATUS_CRITICAL_IP = \ {'date': '2014-03-10', @@ -62,9 +62,9 @@ SHOW_SWAP_STATUS_CRITICAL_IP = \ 'unit': 'kB'}} SHOW_SWAP_STATUS_CRITICAL_OP = \ - {'message': "CRITICAL- 50.00% used(10485758kB out" - " of 20971516kB)|Used=10485758kB;6291454;8388606" - ";0;20971516", 'exit_status': 2} + {'message': "CRITICAL- 50.00% used(10.00GB out " + "of 20.00GB)|Used=10.00GB;6.00;8.00;0;20.00", + 'exit_status': 2} SHOW_SWAP_STATUS_EXCEPTION_IP = \ {'date': '2014-03-10', |