Module: check_mk Branch: master Commit: 7adb721130938d2108fae1145f1228a08d314d21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7adb721130938d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 8 13:22:37 2010 +0100 base: rename if.functions into if.include and check_libs into check_includes --- checks/if | 2 +- checks/{if.functions => if.include} | 0 checks/if64 | 2 +- modules/check_mk.py | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/checks/if b/checks/if index 1c451d1..3a35a55 100644 --- a/checks/if +++ b/checks/if @@ -37,7 +37,7 @@ def if_convert_to_if64(info): return newinfo check_info['if'] = (check_if, "Interface %s", 1, inventory_if) -check_libs['if'] = [ "if.functions" ] +check_includes['if'] = [ "if.include" ] snmp_info['if'] = \ ( ".1.3.6.1.2.1.2.2.1", [ diff --git a/checks/if.functions b/checks/if.include similarity index 100% rename from checks/if.functions rename to checks/if.include diff --git a/checks/if64 b/checks/if64 index 79d21c4..6797c24 100644 --- a/checks/if64 +++ b/checks/if64 @@ -31,7 +31,7 @@ def check_if64(item, params, info): return check_if_common(item, params, info) check_info['if64'] = (check_if64, "Interface %s", 1, inventory_if64) -check_libs['if64'] = [ "if.functions" ] +check_includes['if64'] = [ "if.include" ] snmp_info['if64'] = \ ( ".1.3.6.1.2.1", [ diff --git a/modules/check_mk.py b/modules/check_mk.py index b5eec95..3062899 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -304,7 +304,7 @@ ip_to_hostname_cache = None # The following data structures will be filled by the various checks # found in the checks/ directory. check_info = {} # all known checks -check_libs = {} # library files needed by checks +check_includes = {} # library files needed by checks precompile_params = {} # optional functions for parameter precompilation, look at df for an example check_config_variables = [] # variables (names) in checks/* needed for check itself snmp_info = {} # whichs OIDs to fetch for which check (for tabular information) @@ -2025,11 +2025,11 @@ filesystem_default_levels = None filenames.add(path) # Add library files needed by check - for lib in check_libs.get(checktype, []): + for lib in check_includes.get(checktype, []): filenames.add(checks_dir + "/" + lib) output.write("check_info = {}\n" + - "check_libs = {}\n" + + "check_includes = {}\n" + "precompile_params = {}\n" + "check_config_variables = []\n" + "snmp_info = {}\n" +