[checkmk-commits] Check_MK Git: check_mk: Fixed colliding naming of juniper_mem check functions

Module: check_mk Branch: master Commit: 41cc3de73052f6d04da06e7ffbeecaf7b16dd0ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=41cc3de73052f6… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Sep 14 11:30:25 2015 +0200 Fixed colliding naming of juniper_mem check functions --- checks/juniper_mem.include | 4 ++-- checks/juniper_screenos_mem | 4 ++-- checks/juniper_trpz_mem | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checks/juniper_mem.include b/checks/juniper_mem.include index 071d31d..fe707ca 100644 --- a/checks/juniper_mem.include +++ b/checks/juniper_mem.include @@ -26,10 +26,10 @@ juniper_mem_default_levels = ( 80.0, 90.0 ) -def inventory_juniper_mem(info): +def inventory_juniper_mem_generic(info): return [ ( None, "juniper_mem_default_levels" ) ] -def check_juniper_mem(_no_item, params, info): +def check_juniper_mem_generic(_no_item, params, info): usage_kb, mem_size_kb = map(int, info[0]) # Kilobyte mem_size = mem_size_kb * 1024 usage = usage_kb * 1024 diff --git a/checks/juniper_screenos_mem b/checks/juniper_screenos_mem index b2dbd5b..8dff2a1 100644 --- a/checks/juniper_screenos_mem +++ b/checks/juniper_screenos_mem @@ -32,8 +32,8 @@ def parse_juniper_screenos_mem(info): check_info["juniper_screenos_mem"] = { "parse_function" : parse_juniper_screenos_mem, - "check_function" : check_juniper_mem, - "inventory_function" : inventory_juniper_mem, + "check_function" : check_juniper_mem_generic, + "inventory_function" : inventory_juniper_mem_generic, "group" : "juniper_mem", "service_description" : "Memory used", "has_perfdata" : True, diff --git a/checks/juniper_trpz_mem b/checks/juniper_trpz_mem index fb9dbe0..8f1ab98 100644 --- a/checks/juniper_trpz_mem +++ b/checks/juniper_trpz_mem @@ -25,8 +25,8 @@ # Boston, MA 02110-1301 USA. check_info["juniper_trpz_mem"] = { - 'check_function': check_juniper_mem, - 'inventory_function': inventory_juniper_mem, + 'check_function': check_juniper_mem_generic, + 'inventory_function': inventory_juniper_mem_generic, 'service_description': 'Memory used', 'has_perfdata': True, "group": "juniper_mem",