Module: check_mk Branch: master Commit: c5233a305d8937717127983d77e1487450fa8658 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c5233a305d8937… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 8 08:01:19 2014 +0100 #1688 FIX juniper_screenos_mem: Fixed wrong total memory computation --- .werks/1688 | 9 +++++++++ ChangeLog | 1 + checks/juniper_screenos_mem | 6 ++++++ 3 files changed, 16 insertions(+) diff --git a/.werks/1688 b/.werks/1688 new file mode 100644 index 0000000..4ad3f55 --- /dev/null +++ b/.werks/1688 @@ -0,0 +1,9 @@ +Title: juniper_screenos_mem: Fixed wrong total memory computation +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1418022065 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index fdd9e0d..48b7148 100644 --- a/ChangeLog +++ b/ChangeLog @@ -123,6 +123,7 @@ * 1703 FIX: ups_test: Fix computation of time since last self test... * 1454 FIX: megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also detected by the linux agent * 1455 FIX: hp_proliant_mem: avoid a crash of the check when module_condition is empty + * 1688 FIX: juniper_screenos_mem: Fixed wrong total memory computation Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/juniper_screenos_mem b/checks/juniper_screenos_mem index 58d70cd..46444ee 100644 --- a/checks/juniper_screenos_mem +++ b/checks/juniper_screenos_mem @@ -24,8 +24,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +def parse_juniper_screenos_mem(info): + new_info = [] + for used, free in info: + new_info.append([used, int(used)+int(free)]) + return new_info check_info["juniper_screenos_mem"] = { + "parse_function" : parse_juniper_screenos_mem, "check_function" : check_juniper_mem, "inventory_function" : inventory_juniper_mem, "group" : "juniper_mem",