Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

fixed: service description and some other globals weren' t always available during precompile_params

by Sebastian Herbord

Module: check_mk Branch: master Commit: d92641e86675a22b0307f68375723479f128e998 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d92641e86675a2… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 22 16:31:43 2015 +0200 fixed: service description and some other globals weren't always available during precompile_params --- modules/check_mk.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/check_mk.py b/modules/check_mk.py index 261dd5d..7888b78 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3478,6 +3478,12 @@ def get_precompiled_check_table(hostname, remove_duplicates=True, world="config" host_checks = get_sorted_check_table(hostname, remove_duplicates, world) precomp_table = [] for check_type, item, params, description, deps in host_checks: + # make these globals available to the precompile function + global g_service_description, g_check_type, g_checked_item + g_service_description = description + g_check_type = check_type + g_checked_item = item + aggr_name = aggregated_service_name(hostname, description) params = get_precompiled_check_parameters(hostname, item, params, check_type) precomp_table.append((check_type, item, params, description, aggr_name)) # deps not needed while checking

8 years, 8 months

fixed: change from recent commit df9ea24fda8c4a088a2f31f5a0c99934dd264f5d now works as advertised

by Sebastian Herbord

Module: check_mk Branch: master Commit: 9a98b882ade19c32bfbef0b164c7f07ba700fb34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a98b882ade19c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 22 16:29:53 2015 +0200 fixed: change from recent commit df9ea24fda8c4a088a2f31f5a0c99934dd264f5d now works as advertised --- modules/check_mk.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 09d6dea..261dd5d 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3511,8 +3511,8 @@ def get_precompiled_check_parameters(hostname, item, params, check_type): # the running system. # Make service levels available during check execution -service_service_levels = extra_service_conf.get("_ec_sl", []) -host_service_levels = extra_host_conf.get("_ec_sl", []) +service_service_levels = None +host_service_levels = None derived_config_variable_names = [ "hosttags", "service_service_levels", "host_service_levels" ] # These variables are part of the Check_MK configuration, but are not needed @@ -5891,6 +5891,10 @@ def read_config_files(with_conf_d=True, validate_hosts=True): collect_hosttags() + global service_service_levels, host_service_levels + service_service_levels = extra_service_conf.get("_ec_sl", []) + host_service_levels = extra_host_conf.get("_ec_sl", []) + if validate_hosts: duplicates = duplicate_hosts() if duplicates:

8 years, 8 months

added function to query the effective service level from a check

by Sebastian Herbord

Module: check_mk Branch: master Commit: 5dd361e4eac04cc84da7f7ad179f689e6f7f66ae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5dd361e4eac04c… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 22 16:35:50 2015 +0200 added function to query the effective service level from a check the effective service level is the service level for that service if one is configured, otherwise the one of the host. --- modules/check_mk_base.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 762aa9d..dd6a756 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -2253,6 +2253,20 @@ def check_timeperiod(timeperiod): return timeperiod not in g_inactive_timerperiods +# retrive the service level that applies to the calling check. +def get_effective_service_level(): + service_levels = service_extra_conf(g_hostname, g_service_description, + service_service_levels) + + if service_levels: + return service_levels[0] + else: + service_levels = host_extra_conf(g_hostname, host_service_levels) + if service_levels: + return service_levels[0] + return 0 + + #. # .--Aggregation---------------------------------------------------------. # | _ _ _ |

8 years, 8 months

Reserved 10 Werk IDS

by Sebastian Herbord

Module: check_mk Branch: master Commit: f2350c30c41dfeaea5055370bf7e2a4035407337 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f2350c30c41dfe… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Thu Oct 22 16:35:15 2015 +0200 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 807a3f9..c98e88a 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -2703 +2713

8 years, 8 months

Put service level information into packed configuration

by Mathias Kettner

Module: check_mk Branch: master Commit: df9ea24fda8c4a088a2f31f5a0c99934dd264f5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df9ea24fda8c4a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 22 14:27:44 2015 +0200 Put service level information into packed configuration --- modules/check_mk.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 1bab85b..09d6dea 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3510,7 +3510,10 @@ def get_precompiled_check_parameters(hostname, item, params, check_type): # use those files, so that changes in the actual config do not harm # the running system. -derived_config_variable_names = [ "hosttags" ] +# Make service levels available during check execution +service_service_levels = extra_service_conf.get("_ec_sl", []) +host_service_levels = extra_host_conf.get("_ec_sl", []) +derived_config_variable_names = [ "hosttags", "service_service_levels", "host_service_levels" ] # These variables are part of the Check_MK configuration, but are not needed # by the Check_MK keepalive mode, so exclude them from the packed config

8 years, 8 months

Restructured internal code, so precompile of params is always executed

by Mathias Kettner

Module: check_mk Branch: master Commit: d79be0171cf0b69f5645ec40db69e5d617a30423 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d79be0171cf0b6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 22 14:18:57 2015 +0200 Restructured internal code, so precompile of params is always executed --- checks/fileinfo | 15 +++++---------- modules/check_mk.py | 22 +++++++++++++--------- modules/check_mk_base.py | 11 ++--------- modules/discovery.py | 2 +- 4 files changed, 21 insertions(+), 29 deletions(-) diff --git a/checks/fileinfo b/checks/fileinfo index 4650f26..f030189 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -135,8 +135,11 @@ def fileinfo_groups_precompile(hostname, item, params): if type(pattern) == str: # support old format pattern = (pattern, '') patterns.append(pattern) - params['precompiled_patterns'] = patterns - return params + + precomped = params.copy() + precomped['precompiled_patterns'] = patterns + return precomped + def check_fileinfo_groups(item, params, info): if not info: @@ -148,14 +151,6 @@ def check_fileinfo_groups(item, params, info): import fnmatch reftime = int(info[0][0]) - # Get the grouping patterns (either compile or reuse the precompiled ones) - # Check_MK creates an empty string if the precompile function has - # not been exectued yet. The precompile function creates an empty - # list when no rules/patterns are defined. - if 'precompiled_patterns' not in params: - # TODO: it's not allowed to modify params!! - fileinfo_groups_precompile(g_hostname, item, params) - count_all = 0 age_oldest = None age_newest = 0 diff --git a/modules/check_mk.py b/modules/check_mk.py index 4b4656c..1bab85b 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3218,7 +3218,7 @@ no_discovery_possible = None output.write("%s = %r\n" % (var, globals()[var])) output.write("\n# Checks for %s\n\n" % hostname) - output.write("def get_sorted_check_table(hostname, remove_duplicates=False, world='config'):\n return %r\n\n" % check_table) + output.write("def get_precompiled_check_table(hostname, remove_duplicates=False, world='config'):\n return %r\n\n" % check_table) # Do we need to load the SNMP module? This is the case, if the host # has at least one SNMP based check. Also collect the needed check @@ -3474,19 +3474,23 @@ no_discovery_possible = None sys.stderr.write(" ==> %s.\n" % compiled_filename) -def get_precompiled_check_table(hostname): - host_checks = get_sorted_check_table(hostname, remove_duplicates=True) +def get_precompiled_check_table(hostname, remove_duplicates=True, world="config"): + host_checks = get_sorted_check_table(hostname, remove_duplicates, world) precomp_table = [] - for checktype, item, params, description, deps in host_checks: + for check_type, item, params, description, deps in host_checks: aggr_name = aggregated_service_name(hostname, description) - # some checks need precompilation of parameters - precomp_func = precompile_params.get(checktype) - if precomp_func: - params = precomp_func(hostname, item, params) - precomp_table.append((checktype, item, params, description, aggr_name)) # deps not needed while checking + params = get_precompiled_check_parameters(hostname, item, params, check_type) + precomp_table.append((check_type, item, params, description, aggr_name)) # deps not needed while checking return precomp_table +def get_precompiled_check_parameters(hostname, item, params, check_type): + precomp_func = precompile_params.get(check_type) + if precomp_func: + return precomp_func(hostname, item, params) + else: + return params + #. # .--Pack config---------------------------------------------------------. diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 0ec829f..762aa9d 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1361,12 +1361,12 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): g_hostname = hostname num_success = 0 error_sections = set([]) - check_table = get_sorted_check_table(hostname, remove_duplicates=True, world=opt_keepalive and "active" or "config") + check_table = get_precompiled_check_table(hostname, remove_duplicates=True, world=opt_keepalive and "active" or "config") problems = [] parsed_infos = {} # temporary cache for section infos, maybe parsed - for checkname, item, params, description, aggrinfo in check_table: + for checkname, item, params, description, aggrname in check_table: if only_check_types != None and checkname not in only_check_types: continue @@ -1388,13 +1388,6 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): sys.stderr.write("Service %s: timeperiod %s is currently active.\n" % (description, period)) - # In case of a precompiled check table aggrinfo is the aggrated - # service name. In the non-precompiled version there are the dependencies - if type(aggrinfo) == str: - aggrname = aggrinfo - else: - aggrname = aggregated_service_name(hostname, description) - infotype = checkname.split('.')[0] try: if infotype in parsed_infos: diff --git a/modules/discovery.py b/modules/discovery.py index f5c3057..cf5c766 100644 --- a/modules/discovery.py +++ b/modules/discovery.py @@ -998,7 +998,7 @@ def get_check_preview(hostname, use_caches, do_snmp_scan, on_error): if exitcode == None: check_function = check_info[check_type]["check_function"] if check_source != 'manual': - params = compute_check_parameters(hostname, check_type, item, params) + params = get_precompiled_check_parameters(hostname, item, compute_check_parameters(hostname, check_type, item, params), check_type) try: reset_wrapped_counters()

8 years, 8 months

Updated bug entries #2381

by Mathias Kettner

Module: check_mk Branch: master Commit: 4ac975e263b1ad7b344558f85acde22fb982f040 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ac975e263b1ad… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 22 13:45:27 2015 +0200 Updated bug entries #2381 --- .bugs/2381 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bugs/2381 b/.bugs/2381 new file mode 100644 index 0000000..5ad34d5 --- /dev/null +++ b/.bugs/2381 @@ -0,0 +1,11 @@ +Title: Remove service_aggregations +Component: core +State: open +Date: 2015-10-22 13:44:00 +Targetversion: future +Class: todo + +We should finally remove this obscure feature. First step is to let the code +still live, but fail with an error if it is used and provide a setting where +it can be reenabled. That way users are aware that they need to find another +solution.

8 years, 8 months

Minor code cleanup

by Mathias Kettner

Module: check_mk Branch: master Commit: 36a8dec80c62101895b7c17eb703a59289394c92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=36a8dec80c6210… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 22 13:37:59 2015 +0200 Minor code cleanup --- checks/fileinfo | 5 ++++- modules/check_mk.py | 30 ++++++++++++++++++------------ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/checks/fileinfo b/checks/fileinfo index ba91896..4650f26 100644 --- a/checks/fileinfo +++ b/checks/fileinfo @@ -144,6 +144,7 @@ def check_fileinfo_groups(item, params, info): outof_range_txt = fileinfo_check_timeranges(params) + # TODO: import in check functions is not allowed import fnmatch reftime = int(info[0][0]) @@ -152,7 +153,8 @@ def check_fileinfo_groups(item, params, info): # not been exectued yet. The precompile function creates an empty # list when no rules/patterns are defined. if 'precompiled_patterns' not in params: - params = fileinfo_groups_precompile(g_hostname, item, params) + # TODO: it's not allowed to modify params!! + fileinfo_groups_precompile(g_hostname, item, params) count_all = 0 age_oldest = None @@ -212,6 +214,7 @@ def check_fileinfo_groups(item, params, info): return fileinfo_check_function(check_definition, params, outof_range_txt) def fileinfo_check_function(check_definition, params, outof_range_txt): + # TODO: use lambda a, b: a<b instead.... import operator state = 0 infos = [] diff --git a/modules/check_mk.py b/modules/check_mk.py index 605bb96..4b4656c 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -316,7 +316,7 @@ check_info = {} # all known checks inv_info = {} # inventory plugins checkgroup_of = {} # groups of checks with compatible parametration check_includes = {} # library files needed by checks -precompile_params = {} # optional functions for parameter precompilation, look at df for an example +precompile_params = {} # optional functions for parameter precompilation check_default_levels = {} # dictionary-configured checks declare their default level variables here factory_settings = {} # factory settings for dictionary-configured checks check_config_variables = [] # variables (names) in checks/* needed for check itself @@ -3121,17 +3121,6 @@ def find_check_plugins(checktype): return paths -def get_precompiled_check_table(hostname): - host_checks = get_sorted_check_table(hostname, remove_duplicates=True) - precomp_table = [] - for checktype, item, params, description, deps in host_checks: - aggr_name = aggregated_service_name(hostname, description) - # some checks need precompilation of parameters - precomp_func = precompile_params.get(checktype) - if precomp_func: - params = precomp_func(hostname, item, params) - precomp_table.append((checktype, item, params, description, aggr_name)) # deps not needed while checking - return precomp_table def precompile_hostchecks(): if not os.path.exists(precompiled_hostchecks_dir): @@ -3145,6 +3134,7 @@ def precompile_hostchecks(): sys.stderr.write("Error precompiling checks for host %s: %s\n" % (host, e)) sys.exit(5) + # read python file and strip comments g_stripped_file_cache = {} def stripped_python_file(filename): @@ -3158,6 +3148,7 @@ def stripped_python_file(filename): g_stripped_file_cache[filename] = a return a +# TODO: move this into a new module nagios.py (for creating Nagios config) def precompile_hostcheck(hostname): if opt_verbose: sys.stderr.write("%s%s%-16s%s:" % (tty_bold, tty_blue, hostname, tty_normal)) @@ -3482,6 +3473,21 @@ no_discovery_possible = None if opt_verbose: sys.stderr.write(" ==> %s.\n" % compiled_filename) + +def get_precompiled_check_table(hostname): + host_checks = get_sorted_check_table(hostname, remove_duplicates=True) + precomp_table = [] + for checktype, item, params, description, deps in host_checks: + aggr_name = aggregated_service_name(hostname, description) + # some checks need precompilation of parameters + precomp_func = precompile_params.get(checktype) + if precomp_func: + params = precomp_func(hostname, item, params) + precomp_table.append((checktype, item, params, description, aggr_name)) # deps not needed while checking + return precomp_table + + + #. # .--Pack config---------------------------------------------------------. # | ____ _ __ _ |

8 years, 8 months

Fix missing help text in Transform() valuespecs

by Mathias Kettner

Module: check_mk Branch: master Commit: 68bb926d7ac57721aa25c673e386ab62a9bc39cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68bb926d7ac577… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 22 12:03:56 2015 +0200 Fix missing help text in Transform() valuespecs --- web/htdocs/valuespec.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ff5b17e..c3617da 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -3139,6 +3139,12 @@ class Transform(ValueSpec): else: return self._valuespec.title() + def help(self): + if self._help: + return self._help + else: + return self._valuespec.help() + def render_input(self, varprefix, value): self._valuespec.render_input(varprefix, self.forth(value))

8 years, 8 months

ListOf(): Allow to specify render text for empty list

by Mathias Kettner

Module: check_mk Branch: master Commit: df5981f3dd71de50aadfebd74d641bf9898adc91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df5981f3dd71de… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 22 12:03:24 2015 +0200 ListOf(): Allow to specify render text for empty list --- web/htdocs/valuespec.py | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 42272b5..ff5b17e 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -837,15 +837,16 @@ class ListOfIntegers(ListOfStrings): class ListOf(ValueSpec): def __init__(self, valuespec, **kwargs): ValueSpec.__init__(self, **kwargs) - self._valuespec = valuespec - self._magic = kwargs.get("magic", "@!@") - self._rowlabel = kwargs.get("row_label") - self._add_label = kwargs.get("add_label", _("Add new element")) - self._del_label = kwargs.get("del_label", _("Delete this entry")) - self._movable = kwargs.get("movable", True) - self._totext = kwargs.get("totext") - self._allow_empty = kwargs.get("allow_empty", True) - self._empty_text = kwargs.get("empty_text") + self._valuespec = valuespec + self._magic = kwargs.get("magic", "@!@") + self._rowlabel = kwargs.get("row_label") + self._add_label = kwargs.get("add_label", _("Add new element")) + self._del_label = kwargs.get("del_label", _("Delete this entry")) + self._movable = kwargs.get("movable", True) + self._totext = kwargs.get("totext") # pattern with option %d + self._text_if_empty = kwargs.get("text_if_empty", _("No entries")) + self._allow_empty = kwargs.get("allow_empty", True) + self._empty_text = kwargs.get("empty_text") # complain text if empty if not self._empty_text: self._empty_text = _("Please specify at least one entry") @@ -930,21 +931,26 @@ class ListOf(ValueSpec): "valuespec_listof_add('%s', '%s')" % (varprefix, self._magic)); html.javascript("valuespec_listof_fixarrows(document.getElementById('%s_table').childNodes[0]);" % varprefix) + def canonical_value(self): return [] + def value_to_text(self, value): if self._totext: if "%d" in self._totext: return self._totext % len(value) else: return self._totext + elif not value: + return self._text_if_empty else: s = '<table>' for v in value: s += '<tr><td>%s</td></tr>' % self._valuespec.value_to_text(v) return s + '</table>' + def get_indexes(self, varprefix): count = int(html.var(varprefix + "_count")) n = 1

8 years, 8 months

← Newer
1
...
12
13
14
15
16
17
18
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015