Checkmk git commits October 2015

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

Check_MK Git: check_mk: Fixed exception on BI availability page when no aggregations are defined

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ed634d3e5a98fc187e222db7d180a6bb8b556f3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ed634d3e5a98f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 2 10:39:28 2015 +0200 Fixed exception on BI availability page when no aggregations are defined --- web/plugins/views/availability.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 79ff03d..b643119 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -487,7 +487,7 @@ def render_bi_availability(title, aggr_rows): avoptions = render_availability_options("bi") - + timewarpcode = "" if not html.has_user_errors(): spans = [] for aggr_row in aggr_rows: @@ -544,8 +544,6 @@ def render_bi_availability(title, aggr_rows): '<table class="data table timewarp"><tr class="data odd0"><td class="%s">' % tdclass + \ htmlcode + \ '</td></tr></table>' - else: - timewarpcode = "" av_rawdata = availability.spans_by_object(spans) av_data = availability.compute_availability("bi", av_rawdata, avoptions)

9 years

Check_MK Git: check_mk: Merge mathias-kettner.de:check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 7157142a4e0d368cc848a3252e6dd7d548892c80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7157142a4e0d36… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Oct 2 10:52:50 2015 +0200 Merge mathias-kettner.de:check_mk ---

9 years

Check_MK Git: check_mk: Create traceback for debugging problems in PNP template generation

by Mathias Kettner

Module: check_mk Branch: master Commit: be604f18670c0a61160407a9db83296a22eafa1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be604f18670c0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Oct 2 10:41:25 2015 +0200 Create traceback for debugging problems in PNP template generation --- web/htdocs/metrics.py | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/web/htdocs/metrics.py b/web/htdocs/metrics.py index f919fda..1c388ea 100644 --- a/web/htdocs/metrics.py +++ b/web/htdocs/metrics.py @@ -978,25 +978,30 @@ def get_graph_range(graph_template, translated_metrics): # Called with exactly one variable: the template ID. Example: # "check_mk-kernel.util:guest,steal,system,user,wait". def page_pnp_template(): - template_id = html.var("id") + try: + template_id = html.var("id") - check_command, perf_var_string = template_id.split(":", 1) - perf_var_names = perf_var_string.split(",") + check_command, perf_var_string = template_id.split(":", 1) + perf_var_names = perf_var_string.split(",") - # Fake performance values in order to be able to find possible graphs - perf_data = [ ( varname, 1, "", 1, 1, 1, 1 ) for varname in perf_var_names ] - translated_metrics = translate_metrics(perf_data, check_command) - if not translated_metrics: - return # check not supported + # Fake performance values in order to be able to find possible graphs + perf_data = [ ( varname, 1, "", 1, 1, 1, 1 ) for varname in perf_var_names ] + translated_metrics = translate_metrics(perf_data, check_command) + if not translated_metrics: + return # check not supported - # Collect output in string. In case of an exception to not output - # any definitions - output = "" - for graph_template in get_graph_templates(translated_metrics): - graph_code = render_graph_pnp(graph_template, translated_metrics) - output += graph_code + # Collect output in string. In case of an exception to not output + # any definitions + output = "" + for graph_template in get_graph_templates(translated_metrics): + graph_code = render_graph_pnp(graph_template, translated_metrics) + output += graph_code - html.write(output) + html.write(output) + + except Exception, e: + import traceback + html.write("An error occured:\n%s\n" % traceback.format_exc()) # TODO: some_value.max not yet working

9 years

Check_MK Git: check_mk: updates to the per-process details in ps checks

by Sebastian Herbord

Module: check_mk Branch: master Commit: 244f577c32591f07640568cfdac4882e63698cce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=244f577c32591f… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri Oct 2 10:24:34 2015 +0200 updates to the per-process details in ps checks the option to produce long output is now available in "State and count of processes" as well. Also: fixed a bug accessing uninitialised variable "pid". --- checks/ps.include | 14 ++++++-------- web/plugins/wato/check_parameters.py | 32 ++++++++++++++++---------------- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/checks/ps.include b/checks/ps.include index e457e53..89d180c 100644 --- a/checks/ps.include +++ b/checks/ps.include @@ -61,7 +61,7 @@ def inventory_ps_common(invdata, invrules, info): inv_entry += ([],) default_levels = inv_entry[3:7] - entries.append(inv_entry[:3] + [None] + ({ "levels" : default_levels },) + ["disable"]) + entries.append(inv_entry[:3] + [None] + ({ "levels" : default_levels },)) # Handle new WATO style inventory rules for rule in invrules: @@ -78,9 +78,9 @@ def inventory_ps_common(invdata, invrules, info): v = rule[0] - entries.append((v['descr'], v.get('match'), v.get('user'), v.get('icon'), v.get('default_params', v), v.get('process_info', 'disable'))) + entries.append((v['descr'], v.get('match'), v.get('user'), v.get('icon'), v.get('default_params', v))) - for servicedesc, pattern, userspec, icon, default_params, process_info in entries: + for servicedesc, pattern, userspec, icon, default_params in entries: num_perc_s = servicedesc.count("%s") for line in info: # First entry in line is the node name or None for non-clusters @@ -122,8 +122,6 @@ def inventory_ps_common(invdata, invrules, info): if icon: inv_params["icon"] = icon - inv_params["process_info"] = process_info - # default_params is either a clean dict with optional parameters to set as default # or - from version 1.2.4 - the dict from the rule itself. In the later case # we need o remove the keys that do not specify default parameters @@ -369,6 +367,7 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes", handle_count += handle_c process.append(("cpu usage (user space)", (user_perc, "%"))) process.append(("cpu_usage (kernel space)", (kernel_perc, "%"))) + process.append(("pid", (pid, ""))) else: # addinfo[3] contains the used CPU time and possibly, separated by /, also # the total elapsed time since the birth of the process. @@ -392,13 +391,12 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes", cputime = 0 pcpu = cputime * 100 + process.append(("pid", (pid, ""))) else: pcpu = savefloat(addinfo[3]) percent_cpu += pcpu process.append(("cpu usage", (pcpu, "%"))) - process.append(("pid", (pid, ""))) - extended_perfdata = True elif len(line) > 1: # otherwise we have only two fields, one of which is the node. if the remaining @@ -522,7 +520,7 @@ def check_ps_common(item, params, info, cpu_cores = 1, info_name = "processes", state = max(state, 1) infotext += "(!)" - if "process_info" in params and params["process_info"] != "disable": + if params.get("process_info", None) is not None: infotext += "\r\n" + format_process_list(processes, params["process_info"] == "html") return state, infotext, perfdata diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 2c8ef22..0262b3f 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1164,6 +1164,22 @@ process_level_elements = [ ), ], )), + ('process_info', DropdownChoice( + title = _("Enable per-process details in long-output"), + label = _("Enable per-process details"), + help = _("If active, the long output of this service will contain a list of " + "all the matching processes and their details (i.e. pid, cpu usage, memory usage. " + "Please note that HTML output will only work if \"Escape HTML codes in plugin output\" is " + "disabled in global settings. This might expose you to Cross-Site-Scripting (everyone " + "with write-access to checks could get scripts executed on the monitoring site in the context " + "of the user of the monitoring site) so please do this if you understand the consequences."), + choices = [ + (None, _("Disable")), + ("text", _("Text output")), + ("html", _("HTML output")) + ], + default_value = "disable", + )), ] # In version 1.2.4 the check parameters for the resulting ps check @@ -1265,22 +1281,6 @@ register_rule(group + '/' + subgroup_inventory, title = _("Add custom icon or action"), help = _("You can assign icons or actions to the found services in the status GUI."), )), - ('process_info', DropdownChoice( - title = _("Enable per-process details in long-output"), - label = _("Enable per-process details"), - help = _("If active, the long output of this service will contain a list of " - "all the matching processes and their details (i.e. pid, cpu usage, memory usage. " - "Please note that HTML output will only work if \"Escape HTML codes in plugin output\" is " - "disabled in global settings. This might expose you to Cross-Site-Scripting (everyone " - "with write-access to checks could get scripts executed on the monitoring site in the context " - "of the user of the monitoring site) so please do this if you understand the consequences."), - choices = [ - ("disable", _("Disable")), - ("text", _("Text output")), - ("html", _("HTML output")) - ], - default_value = "disable", - )), ('default_params', Dictionary( title = _("Default parameters for detected services"),

9 years

Check_MK Git: check_mk: new gitbug

by Simon Betz

Module: check_mk Branch: master Commit: 3b482b596352836bf6beda48db1f12922755ffae URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b482b59635283… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Oct 2 07:52:12 2015 +0200 new gitbug --- .bugs/2369 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2369 b/.bugs/2369 new file mode 100644 index 0000000..00dbeca --- /dev/null +++ b/.bugs/2369 @@ -0,0 +1,10 @@ +Title: SNMP scan functions: improvement +Component: checks +State: open +Date: 2015-10-02 07:42:54 +Targetversion: future +Class: todo + +There are too many OIDs which are checked so we have to improve the SNMP scan functions in the checks. +But there are some exceptions e.g. interfaces. +This should be done before version 1.2.8 \ No newline at end of file

9 years

Check_MK Git: check_mk: Updated werk utility

by Mathias Kettner

Module: check_mk Branch: master Commit: de1e0ba1ff61544e9547fa023a59796d681d881a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de1e0ba1ff6154… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Oct 1 14:39:23 2015 +0200 Updated werk utility --- .werks/config | 2 ++ werk | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.werks/config b/.werks/config index 70e48bc..057edee 100644 --- a/.werks/config +++ b/.werks/config @@ -28,3 +28,5 @@ compatible = [ ("compat", "Compatible"), ("incomp", "Incompatible"), ] + +online_url = "http://mathias-kettner.de/check_mk_werks.php?werk_id=%d" diff --git a/werk b/werk index 4225adc..10882c9 100755 --- a/werk +++ b/werk @@ -40,11 +40,11 @@ else: def tty_colors(c): return "" -grep_colors = [ +grep_colors = [ tty_bold + tty_magenta, tty_bold + tty_cyan, tty_bold + tty_green, -] +] def get_tty_size(): import termios,struct,fcntl @@ -63,7 +63,7 @@ def bail_out(text): sys.exit(1) def goto_werksdir(): - global g_base_dir + global g_base_dir g_base_dir = os.path.abspath('.') while not os.path.exists(".werks") and os.path.abspath('.') != '/': os.chdir("..") @@ -453,7 +453,7 @@ def main_show(args): ids = [ g_last_werk ] elif ids[0] == 'all': ids = [ id for (id, werk) in g_werks.items() ] - + for id in ids: if id != ids[0]: sys.stdout.write("-------------------------------------------------------------------------------\n") @@ -471,7 +471,7 @@ def get_input(what, default = ""): return default else: return value - + def get_long_input(what): sys.stdout.write("Enter %s. End with CTRL-D.\n" % what) usertext = sys.stdin.read() @@ -563,7 +563,7 @@ def main_blame(args): def main_url(args): id = get_werk_arg(args) - sys.stdout.write("http://mathias-kettner.de/check_mk_werks.php?werk_id=%d\n" % id) + sys.stdout.write(online_url % id + "\n") def main_resolve(args): @@ -602,7 +602,7 @@ def grep(line, kw, n): else: col = grep_colors[n % len(grep_colors)] return line[0:i] + col + line[i:i+len(kw)] + tty_normal + line[i+len(kw):] - + def main_grep(args): if '-v' in args:

9 years

Check_MK Git: check_mk: lnx_quota: Cleaned up a bit

by Lars Michelsen

Module: check_mk Branch: master Commit: fabe2fe2aa90b80039aaacde8d09e2874f184278 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fabe2fe2aa90b8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 1 11:38:59 2015 +0200 lnx_quota: Cleaned up a bit --- checks/lnx_quota | 93 +++++++++++++++++++++--------------------------------- 1 file changed, 36 insertions(+), 57 deletions(-) diff --git a/checks/lnx_quota b/checks/lnx_quota index 204e58a..6387ec8 100644 --- a/checks/lnx_quota +++ b/checks/lnx_quota @@ -64,18 +64,19 @@ def parse_lnx_quota(info): mode, fs = parts # new filesystem for quota - if fs not in parsed: - parsed[fs] = {} - if mode not in parsed[fs]: - parsed[fs][mode] = {} + parsed.setdefault(fs, {}) + parsed[fs].setdefault(mode, {}) + elif fs and mode and len(line) == 10: # new table entry for quota parsed[fs][mode][line[0]] = map(int, line[2:]) + return parsed def lnx_quota_limit_check(mode, what, user, used, soft, hard, grace): - fmt = lambda value, what: what == 'files' and '%d' % value or get_bytes_human_readable(value*1000, 1000) + fmt = lambda value, what: what == 'files' and '%d' % value \ + or get_bytes_human_readable(value*1000, 1000) if mode == 'usr': txt = 'User %s' % user @@ -109,7 +110,7 @@ def lnx_quota_limit_check(mode, what, user, used, soft, hard, grace): txt += ', within grace time' else: state = 0 - txt = '' + txt = None return state, txt @@ -132,57 +133,35 @@ def check_lnx_quota(item, params, parsed): # params were empty dictionary and enabled by standard user checking params = { 'user': True } - if 'user' in params and params['user'] == True: - # check user quota only - i = 0 - for user, values in parsed[item]['usr'].items(): - for what, (used, soft, hard, grace) in [ - ('blocks', values[:4]), - ('files', values[4:]) ]: - - if soft == 0 and hard == 0: - continue # skip entries without limits - - # check function - state, txt = lnx_quota_limit_check('usr', what, user, used, soft, hard, grace) - - # calculate performance data - perfdata.append(('%s_%s' % (user, what), used*1000, soft*1000, hard*1000, 0, hard*1000)) - - if txt == '': - continue - else: - yield state, (txt + ', '), perfdata - i += 1 - if i == 0: - yield 0, 'All users within quota limits', perfdata - - if 'group' in params and params['group'] == True: - # check group quota only - i = 0 - for group, values in parsed[item]['grp'].items(): - for what, (used, soft, hard, grace) in [ - ('blocks', values[:4]), - ('files', values[4:]) ]: - - if soft == 0 and hard == 0: - continue # skip entries without limits - - # check function - state, txt = lnx_quota_limit_check('grp', what, group, used, soft, hard, grace) - - # calculate performance data - perfdata.append(('group_%s_%s' % (group, what), used*1000, soft*1000, hard*1000, 0, hard*1000)) - - if txt == '': - continue - else: - yield state, txt + ', ', perfdata - i += 1 - if i == 0: - yield 0, 'All groups within quota limits', perfdata - - if 'user' in params and params['user'] == False and 'group' in params and params['group'] == False: + for param_key, perf_prefix, thing, name in [ + ('user', '', 'usr', 'users'), + ('group', 'group_', 'grp', 'groups') + ]: + if params.get(param_key) == True: + at_least_one_problematic = False + for user, values in parsed[item][thing].items(): + for what, (used, soft, hard, grace) in [ + ('blocks', values[:4]), + ('files', values[4:]) ]: + + if soft == 0 and hard == 0: + continue # skip entries without limits + + state, txt = lnx_quota_limit_check(thing, what, user, used, soft, hard, grace) + + perfdata.append(('%s%s_%s' % (perf_prefix, user, what), + used*1000, soft*1000, hard*1000, 0, hard*1000)) + + if txt: + at_least_one_problematic = True + yield state, (txt + ', '), perfdata + else: + yield state, None, perfdata + + if not at_least_one_problematic: + yield 0, 'All %s within quota limits' % name + + if params.get('user') == False and params.get('group') == False: yield 0, 'Disabled quota checking'

9 years

Check_MK Git: check_mk: Improved error handling during upload of MIB files

by Lars Michelsen

Module: check_mk Branch: master Commit: c46e28510f829d42b1a780d63b5d410d69c62cb9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c46e28510f829d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 1 09:32:40 2015 +0200 Improved error handling during upload of MIB files --- mkeventd/web/plugins/wato/mkeventd.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index aa710cd..56427b5 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -2000,14 +2000,14 @@ def validate_and_compile_mib(mibname, content): results = compiler.compile(mibname, ignoreErrors=True, genTexts=True) errors = [] - for name, state in sorted(results.items()): - if mibname == name and state == 'failed': - raise Exception(_('Failed to compile your module.')) + for name, state_obj in sorted(results.items()): + if mibname == name and state_obj == 'failed': + raise Exception(_('Failed to compile your module: %s') % state_obj.error) - if state == 'missing': + if state_obj == 'missing': errors.append(_('%s - Dependency missing') % name) - elif state == 'failed': - errors.append(_('%s - Failed to compile') % name) + elif state_obj == 'failed': + errors.append(_('%s - Failed to compile (%s)') % (name, state_obj.error)) msg = _("MIB file %s uploaded.") % mibname if errors:

9 years

Check_MK Git: check_mk: Merge mathias-kettner.de:check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 988c407889b4577d4bc0fefb189f48b8aef1d42b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=988c407889b457… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 1 09:32:49 2015 +0200 Merge mathias-kettner.de:check_mk ---

9 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2015