Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 6af54024b320e6c0b4d93af6685e2b42d5cf3a34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6af54024b320e6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 16:40:50 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: rebuild check_mk_agent.exe

by Andreas Boesl

Module: check_mk Branch: master Commit: fb38f3d35fb789e7bd6fe580dfcabe2abdcf0aaf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fb38f3d35fb789… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 4 15:19:05 2013 +0100 rebuild check_mk_agent.exe --- agents/windows/check_mk_agent.exe | Bin 111104 -> 111104 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent.exe | Bin 129333 -> 130870 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 5ac572e..e1fbb05 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 767e1f9..50080b7 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 575166b..9b001ac 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index c350ecc..798b142 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

11 years, 3 months

Check_MK Git: check_mk: Prediction: better rendering of curves

by Mathias Kettner

Module: check_mk Branch: master Commit: cc6dd7ef3614c0abc128787409f075a6091386c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc6dd7ef3614c0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 13:47:09 2013 +0100 Prediction: better rendering of curves --- web/htdocs/js/prediction.js | 9 +++++++-- web/htdocs/prediction.py | 25 +++++++++++++++++-------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/web/htdocs/js/prediction.js b/web/htdocs/js/prediction.js index cdf23d3..0f29d2d 100644 --- a/web/htdocs/js/prediction.js +++ b/web/htdocs/js/prediction.js @@ -201,7 +201,7 @@ function render_point(t, v, color) } -function render_curve(points, color, w) +function render_curve(points, color, w, square) { var canvas = document.getElementById(canvas_id); var c = canvas.getContext('2d'); @@ -210,6 +210,7 @@ function render_curve(points, color, w) c.strokeStyle = color; c.lineWidth = w; + var op; var time_step = (until_time - from_time) / points.length; var first = true; for (i=0; i<points.length; i++) { @@ -223,8 +224,12 @@ function render_curve(points, color, w) c.moveTo(p[0], p[1]); first = false; } - else + else { + if (square) + c.lineTo(p[0], op[1]); c.lineTo(p[0], p[1]); + } + op = p; } c.stroke(); } diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 624f5d7..41374ae 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -124,13 +124,13 @@ def page_graph(): if "levels_lower" in timegroup: render_dual_area(swapped["average"], swapped["lower_warn"], "#ffffff", 0.5) - render_curve(swapped["lower_warn"], "#e0e000") - render_curve(swapped["lower_crit"], "#f0b0a0") + render_curve(swapped["lower_warn"], "#e0e000", square=True) + render_curve(swapped["lower_crit"], "#f0b0a0", square=True) if "levels_upper" in timegroup: render_dual_area(swapped["upper_warn"], swapped["average"], "#ffffff", 0.5) - render_curve(swapped["upper_warn"], "#e0e000") - render_curve(swapped["upper_crit"], "#f0b0b0") + render_curve(swapped["upper_warn"], "#e0e000", square=True) + render_curve(swapped["upper_crit"], "#f0b0b0", square=True) render_curve(swapped["average"], "#000000") render_curve(swapped["average"], "#000000") # render_curve(stack(swapped["average"], swapped["stdev"], -1), "#008040") @@ -168,14 +168,22 @@ def compute_vertical_scala(low, high): v = 0 vert_scala = [] + steps = (max(0, high) - min(0, low)) / factor + if steps < 3: + step = 0.2 * factor + elif steps < 6: + step = 0.5 * factor + else: + step = factor + while v <= max(0, high): vert_scala.append( [v, "%.1f%s" % (v / factor, letter)] ) - v += factor + v += step v = -factor while v >= min(0, low): vert_scala = [ [v, "%.1f%s" % (v / factor, letter)] ] + vert_scala - v -= factor + v -= step return vert_scala @@ -255,8 +263,9 @@ def render_coordinates(v_scala, t_scala): html.javascript('render_coordinates(%r, %r);' % (v_scala, t_scala)) -def render_curve(points, color, width=1): - html.javascript('render_curve(%r, %r, %d);' % (points, color, width)) +def render_curve(points, color, width=1, square=False): + html.javascript('render_curve(%r, %r, %d, %d);' % ( + points, color, width, square and 1 or 0)) def render_point(t, v, color): html.javascript('render_point(%r, %r, %r);' % (t, v, color))

11 years, 3 months

Check_MK Git: check_mk: Prediction: fix vertical scale

by Mathias Kettner

Module: check_mk Branch: master Commit: 5074524621f6acac9334dffe03ae2b7591ba7616 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5074524621f6ac… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 13:34:29 2013 +0100 Prediction: fix vertical scale --- web/htdocs/prediction.py | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index abe1f5e..624f5d7 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -91,6 +91,7 @@ def page_graph(): html.select("timegroup", choices, choices[0], onchange="document.prediction.submit();") html.hidden_fields() html.end_form() + html.log("HIRN") # Get prediction data tg_data = eval(file(dir + "/" + timegroup["name"]).read()) @@ -115,9 +116,9 @@ def page_graph(): render_dual_area(swapped["lower_crit"], swapped["lower_warn"], "#fff000", 0.4) render_area(swapped["lower_crit"], "#ff0000", 0.1) - vert_scala = [ [x, "%.1f" % x] for x in range(int(vertical_range[0]), int(vertical_range[1] + 1)) ] - while len(vert_scala) > 15: - vert_scala = vert_scala[::2] + vscala_low = vertical_range[0] + vscala_high = vertical_range[1] + vert_scala = compute_vertical_scala(vscala_low, vscala_high) time_scala = [ [timegroup["range"][0] + i*3600, "%02d:00" % i] for i in range(0, 25, 2) ] render_coordinates(vert_scala, time_scala); @@ -145,6 +146,39 @@ def page_graph(): html.footer() +vranges = [ + ( 'n', 1024.0**-3 ), + ( 'u', 1024.0**-2 ), + ( 'm', 1024.0**-1 ), + ( '', 1024.0**0 ), + ( 'K', 1024.0**1 ), + ( 'M', 1024.0**2 ), + ( 'G', 1024.0**3 ), + ( 'T', 1024.0**4 ), +] + +def compute_vertical_scala(low, high): + m = max(abs(low), abs(high)) + for letter, factor in vranges: + if m <= 15 * factor: + break + else: + letter = 'P' + factor = 1024.0**5 + + v = 0 + vert_scala = [] + while v <= max(0, high): + vert_scala.append( [v, "%.1f%s" % (v / factor, letter)] ) + v += factor + + v = -factor + while v >= min(0, low): + vert_scala = [ [v, "%.1f%s" % (v / factor, letter)] ] + vert_scala + v -= factor + + return vert_scala + def get_current_perfdata(host, service, dsname): perf_data = html.live.query_value("GET services\nFilter: host_name = %s\nFilter: description = %s\nColumns: perf_data" % ( host, service))

11 years, 3 months

Check_MK Git: check_mk: Predictive monitoring also for diskstat (throughput )

by Mathias Kettner

Module: check_mk Branch: master Commit: 009c2f9dda67a0d8a1ff9b5419b3444220b66bc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=009c2f9dda67a0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 13:08:23 2013 +0100 Predictive monitoring also for diskstat (throughput) --- checks/cpu | 4 +++- checks/diskstat.include | 24 +++++++++++++----------- checks/kernel | 4 +++- modules/check_mk_base.py | 17 +++++++++++++---- modules/prediction.py | 8 ++++++++ web/htdocs/wato.py | 16 ++++++++++++++-- web/plugins/wato/check_parameters.py | 18 ++++++++---------- 7 files changed, 62 insertions(+), 29 deletions(-) diff --git a/checks/cpu b/checks/cpu index 9e71b27..03d78f5 100644 --- a/checks/cpu +++ b/checks/cpu @@ -54,7 +54,9 @@ def check_cpu_load(item, params, info): state, text, perf = check_levels(load[2], 'load15', params, factor = num_cpus) perfdata += perf - infotext = "15min load %.2f at %d CPUs%s" % (load[2], num_cpus, text) + infotext = "15min load %.2f at %d CPUs" % (load[2], num_cpus) + if text: + infotext += ", " + text return state, infotext, perfdata def inventory_cpu_threads(info): diff --git a/checks/diskstat.include b/checks/diskstat.include index aac8092..8be5e57 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -94,12 +94,13 @@ def check_diskstat_line(this_time, item, params, line): perfdata = [] infos = [] status = 0 + prediction_perf = [] for what, ctr in [ ("read", line[1]), ("write", line[2]) ]: countername = "diskstat.%s.%s" % (item, what) # unpack levels now, need also for perfdata levels = params.get(what) - if levels: + if type(levels) == tuple: warn, crit = levels else: warn, crit = None, None @@ -109,22 +110,22 @@ def check_diskstat_line(this_time, item, params, line): bytes_per_sec = sectors_per_sec * 512 infos.append("%s/sec %s" % (get_bytes_human_readable(bytes_per_sec), what)) perfdata.append( (what, bytes_per_sec, warn, crit) ) + dsname = what # compute average of the rate over ___ minutes if average_range != None: timedif, avg = get_average(countername + ".avg", this_time, bytes_per_sec, average_range) - perfdata.append( (what + ".avg", avg) ) + dsname = what + ".avg" + perfdata.append( (dsname, avg) ) bytes_per_sec = avg # check levels - if levels != None: - mb_per_sec = bytes_per_sec / 1048576 - if mb_per_sec >= crit: - status = 2 - infos[-1] += "(!!)" - elif mb_per_sec >= warn: - status = max(status, 1) - infos[-1] += "(!)" + state, text, extraperf = check_levels(bytes_per_sec, dsname, levels, + unit = "MB/s", factor = 1.0 / 1048576, statemarkers=True) + if text: + infos.append(text) + status = max(state, status) + prediction_perf += extraperf # Add performance data for averaged IO if average_range != None: @@ -191,8 +192,9 @@ def check_diskstat_line(this_time, item, params, line): if params.get("ql_perfdata"): perfdata.append((what + "_ql", ql)) + perfdata += prediction_perf - return (status, nagios_state_names[status] + " - " + ", ".join(infos) , perfdata) + return (status, ", ".join(infos) , perfdata) def check_diskstat_generic(item, params, this_time, info): diff --git a/checks/kernel b/checks/kernel index 1b62e04..52a9d20 100644 --- a/checks/kernel +++ b/checks/kernel @@ -67,7 +67,9 @@ def check_kernel(item, params, info): perfdata = [ (counter, per_sec, warn, crit) ] state, text, extraperf = check_levels(per_sec, counter, params) perfdata += extraperf - infotext = "%.0f/s in last %d secs%s" % (per_sec, timedif, text) + infotext = "%.0f/s in last %d secs" % (per_sec, timedif) + if text: + infotext += ", " + text return state, infotext, perfdata kernel_util_default_levels = None diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 4697eb8..9036ab9 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1272,7 +1272,11 @@ def nodes_of(hostname): # Generic function for checking a value against levels. This also support # predictive levels. -def check_levels(value, dsname, params, factor = 1.0): +def check_levels(value, dsname, params, unit = "", factor = 1.0, statemarkers=False): + + if params == None or params == (None, None): + return 0, "", [] + perfdata = [] infotext = "" @@ -1287,12 +1291,12 @@ def check_levels(value, dsname, params, factor = 1.0): ref_value, ((warn_upper, crit_upper), (warn_lower, crit_lower)) = \ get_predictive_levels(dsname, params, "MAX", levels_factor=factor) if ref_value: - infotext += ", predicted reference: %.2f" % ref_value + infotext += "predicted reference: %.2f%s" % (ref_value * factor, unit) else: - infotext += ", no reference for prediction yet" + infotext += "no reference for prediction yet" if ref_value: - perfdata.append(('predict_load15', ref_value)) + perfdata.append(('predict_' + dsname, ref_value)) # Critical cases if crit_upper != None and value >= crit_upper: @@ -1314,6 +1318,11 @@ def check_levels(value, dsname, params, factor = 1.0): else: state = 0 + if state and statemarkers: + if state == 1: + infotext += "(!)" + else: + infotext += "(!!)" return state, infotext, perfdata diff --git a/modules/prediction.py b/modules/prediction.py index 46f0731..482347e 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -129,6 +129,9 @@ def group_by_wday(t): def group_by_day(t): return "everyday", (t - time.timezone) % 86400 +def group_by_everyhour(t): + return "everyhour", (t - time.timezone) % 3600 + prediction_periods = { "wday" : { "slice" : 86400, @@ -139,6 +142,11 @@ prediction_periods = { "slice" : 86400, "groupby" : group_by_day, "valid" : 1, + }, + "hour" : { + "slice" : 3600, + "groupby" : group_by_everyhour, + "valid" : 1, } } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1b6e5d8..c02a1ea 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10824,7 +10824,8 @@ def PredictiveLevels(**args): title = _("Base prediction on"), choices = [ ( "wday", _("Day of the week (00:00 - 24:00 in local time)") ), - ( "day", _("Hour of the day") ), + ( "day", _("Hour of the day") ), + ( "hour", _("Minute of the hour (00-59)") ), ] )), ( "horizon", @@ -10907,10 +10908,19 @@ def PredictiveLevels(**args): # To be used as ValueSpec for levels on numeric values, with # prediction +def match_levels_alternative(v): + if type(v) == dict: + return 2 + elif type(v) == tuple and v != (None, None): + return 1 + else: + return 0 + def Levels(**kwargs): help = kwargs.get("help") unit = kwargs.get("unit") - default_levels = kwargs.get("default_levels", (None, None)) + title = kwargs.get("title") + default_levels = kwargs.get("default_levels", (0.0, 0.0)) default_difference = kwargs.get("default_difference", (0,0)) if "default_value" in kwargs: default_value = kwargs["default_value"] @@ -10918,6 +10928,7 @@ def Levels(**kwargs): default_value = default_levels and default_levels or None return Alternative( + title = title, help = help, show_titles = False, elements = [ @@ -10937,6 +10948,7 @@ def Levels(**kwargs): default_difference = default_difference, ), ], + match = match_levels_alternative, default_value = default_value, ) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 9ce1d63..6457856 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -2043,19 +2043,17 @@ checkgroups.append(( Dictionary( elements = [ ( "read", - Tuple( + Levels( title = _("Read throughput"), - elements = [ - Float(title = _("warning at"), unit = _("MB/s")), - Float(title = _("critical at"), unit = _("MB/s")) - ])), + unit = _("MB/s"), + default_value = None, + default_levels = (50.0, 100.0))), ( "write", - Tuple( + Levels( title = _("Write throughput"), - elements = [ - Float(title = _("warning at"), unit = _("MB/s")), - Float(title = _("critical at"), unit = _("MB/s")) - ])), + unit = _("MB/s"), + default_value = None, + default_levels = (50.0, 100.0))), ( "average", Integer( title = _("Average"),

11 years, 3 months

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: 05c918ab497dcbde869362f2aec90793dc093635 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05c918ab497dcb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 12:01:40 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 3 months

Check_MK Git: check_mk: Simplify check API: allow check to omit "OK -"

by Mathias Kettner

Module: check_mk Branch: master Commit: ac0ce49b2f7bd67a1c04fb89c01c9909fb5fa7bb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac0ce49b2f7bd6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 12:01:05 2013 +0100 Simplify check API: allow check to omit "OK -" The prefix will now automatically be added, if missing. --- ChangeLog | 2 ++ modules/check_mk_base.py | 32 ++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dffbad..83f8560 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Core: * Agents can send data for other hosts "piggyback". This is being used by the vSphere and SAP plugins + * Checks can now omit the typical "OK - " or "WARN -". This text + will be added automatically if missing. Multisite: * New availability view for arbitrary host/service collections diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 9b23c84..7f307c9 100755 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1022,13 +1022,13 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): if info or info == []: num_success += 1 try: - check_funktion = check_info[checkname]["check_function"] + check_function = check_info[checkname]["check_function"] except: - check_funktion = check_unimplemented + check_function = check_unimplemented try: dont_submit = False - result = check_funktion(item, params, info) + result = check_function(item, params, info) # handle check implementations that do not yet support the # handling of wrapped counters via exception. Do not submit # any check result in that case: @@ -1037,7 +1037,7 @@ def do_all_checks_on_host(hostname, ipaddress, only_check_types = None): print "Counter wrapped, not handled by check, ignoring this check result: %s" % e dont_submit = True except Exception, e: - result = (3, "UNKNOWN - invalid output from agent, invalid check parameters or error in implementation of check %s. Please set <tt>debug_log</tt> to a filename in <tt>main.mk</tt> for enabling exception logging." % checkname) + result = (3, "invalid output from agent, invalid check parameters or error in implementation of check %s. Please set <tt>debug_log</tt> to a filename in <tt>main.mk</tt> for enabling exception logging." % checkname) if debug_log: try: import traceback, pprint @@ -1145,19 +1145,31 @@ def convert_perf_data(p): def submit_check_result(host, servicedesc, result, sa): + if len(result) >= 3: + state, infotext, perfdata = result[:3] + else: + state, infotext = result + perfdata = None + + if not ( + infotext.startswith("OK -") or + infotext.startswith("WARN -") or + infotext.startswith("CRIT -") or + infotext.startswith("UNKNOWN -")): + infotext = nagios_state_names[state] + " - " + infotext + global nagios_command_pipe # [<timestamp>] PROCESS_SERVICE_CHECK_RESULT;<host_name>;<svc_description>;<return_code>;<plugin_output> # Aggregated service -> store for later if sa != "": - store_aggregated_service_result(host, servicedesc, sa, result[0], result[1]) + store_aggregated_service_result(host, servicedesc, sa, state, infotext) # performance data - if any - is stored in the third part of the result perftexts = []; perftext = "" - if len(result) > 2: - perfdata = result[2] + if perfdata: # Check may append the name of the check command to the # list of perfdata. It is of type string. And it might be # needed by the graphing tool in order to choose the correct @@ -1177,15 +1189,15 @@ def submit_check_result(host, servicedesc, result, sa): perftext = "|" + (" ".join(perftexts)) if not opt_dont_submit: - submit_to_nagios(host, servicedesc, result[0], result[1] + perftext) + submit_to_nagios(host, servicedesc, state, infotext + perftext) if opt_verbose: if opt_showperfdata: p = ' (%s)' % (" ".join(perftexts)) else: p = '' - color = { 0: tty_green, 1: tty_yellow, 2: tty_red, 3: tty_magenta }[result[0]] - print "%-20s %s%s%-56s%s%s" % (servicedesc, tty_bold, color, result[1], tty_normal, p) + color = { 0: tty_green, 1: tty_yellow, 2: tty_red, 3: tty_magenta }[state] + print "%-20s %s%s%-56s%s%s" % (servicedesc, tty_bold, color, infotext, tty_normal, p) def submit_to_nagios(host, service, state, output):

11 years, 3 months

Check_MK Git: check_mk: Prediction: check kernel now supports prediction

by Mathias Kettner

Module: check_mk Branch: master Commit: e0b2d4a1466007a1244687a8ff7d85f08c4e10d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0b2d4a1466007… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Mar 4 12:01:22 2013 +0100 Prediction: check kernel now supports prediction --- checks/cpu | 47 ++++++---------------------------- checks/kernel | 41 ++++------------------------- modules/check_mk_base.py | 46 +++++++++++++++++++++++++++++++++ modules/prediction.py | 7 +++- web/htdocs/wato.py | 35 +++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 39 ++++++---------------------- 6 files changed, 108 insertions(+), 107 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e0b2d4a146…

11 years, 3 months

Check_MK Git: check_mk: Prediction: implementation for kernel check

by Mathias Kettner

Module: check_mk Branch: master Commit: c65a408bca820d6381143a7863d5c08108c409e4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c65a408bca820d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Mar 3 23:28:49 2013 +0100 Prediction: implementation for kernel check --- checks/cpu | 3 +- checks/kernel | 49 +++++++++---- web/htdocs/wato.py | 95 ++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 123 ++++++---------------------------- 4 files changed, 151 insertions(+), 119 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c65a408bca…

11 years, 3 months

Check_MK Git: check_mk: Prediction: handle case where no historic data available

by Mathias Kettner

Module: check_mk Branch: master Commit: 805ea18758f174cb738fabdc5ed248ede793b1eb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=805ea18758f174… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 27 16:24:53 2013 +0100 Prediction: handle case where no historic data available --- checks/cpu | 5 +++- modules/prediction.py | 65 +++++++++++++++++++++---------------------------- 2 files changed, 32 insertions(+), 38 deletions(-) diff --git a/checks/cpu b/checks/cpu index ae0b078..97eafcf 100644 --- a/checks/cpu +++ b/checks/cpu @@ -56,7 +56,10 @@ def check_cpu_load(item, params, info): else: ref_value, ((warn_upper, crit_upper), (warn_lower, crit_lower)) = \ get_predictive_levels('load15', params, "MAX") - infotext += ", predicted reference: %.2f" % ref_value + if ref_value: + infotext += ", predicted reference: %.2f" % ref_value + else: + infotext += ", no reference for prediction yet" perfdata = [ ('load' + str(z), l, warn_upper, crit_upper, 0, num_cpus ) for (z,l) in [ (1,load[0]), (5,load[1]), (15, load[2]) ] ] if ref_value: diff --git a/modules/prediction.py b/modules/prediction.py index fd05771..c6c03e9 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -1,5 +1,6 @@ #!/usr/bin/python # -*- encoding: utf-8; py-indent-offset: 4 -*- + # +------------------------------------------------------------------+ # | ____ _ _ __ __ _ __ | # | / ___| |__ ___ ___| | __ | \/ | |/ / | @@ -29,6 +30,9 @@ # Export data from an RRD file. This requires an up-to-date # version of the rrdtools. +def debug(x): + import pprint ; pprint.pprint(x) + def rrd_export(filename, ds, cf, fromtime, untiltime, rrdcached=None): # rrdtool xport --json -s 1361554418 -e 1361640814 --step 60 DEF:x=/omd/sites/heute/X.rrd:1:AVERAGE XPORT:x:HIRNI cmd = "rrdtool xport --json -s %d -e %d --step 60 " % (fromtime, untiltime) @@ -136,12 +140,16 @@ def compute_prediction(pred_file, timegroup, params, period_info, from_time, dsn num_points = len(slices[0][2]) consolidated = [] for i in xrange(num_points): + # print "PUNKT %d --------------------------------------" % i point_line = [] for from_time, scale, data in slices: - date_str = time.strftime("%Y-%m-%d %H:%M", time.localtime(from_time)) - d = data[i / scale] + d = data[int(i / float(scale))] if d != None: point_line.append(d) + # else: + # date_str = time.strftime("%Y-%m-%d %H:%M", time.localtime(fr + ((un - fr) * i / float(num_points)))) + # print "Keine Daten fur %s / %d/%s/ %.2f " % (date_str, i, float(scale),i/float(scale)) + if point_line: average = sum(point_line) / len(point_line) consolidated.append([ @@ -151,7 +159,7 @@ def compute_prediction(pred_file, timegroup, params, period_info, from_time, dsn stdev(point_line, average), ]) else: - consolidated.append((None, None, None)) + consolidated.append([None, None, None, None]) result = { "num_points" : num_points, @@ -235,40 +243,23 @@ def get_predictive_levels(dsname, params, cf): ref_value = reference["average"] stdev = reference["stdev"] levels = [] - for what, sig in [ ( "upper", 1 ), ( "lower", -1 )]: - p = "levels_" + what - if p in params: - how, (warn, crit) = params[p] - if how == "absolute": - levels.append((ref_value + (sig * warn), ref_value + (sig * crit))) - elif how == "relative": - levels.append((ref_value + sig * (ref_value * warn / 100), - ref_value + sig * (ref_value * crit / 100))) - else: # how == "stdev": - levels.append((ref_value + sig * (stdev * warn), - ref_value + sig * (stdev * crit))) - else: - levels.append((None, None)) + if not ref_value: # No reference data available + levels = ((None, None), (None, None)) + else: + for what, sig in [ ( "upper", 1 ), ( "lower", -1 )]: + p = "levels_" + what + if p in params: + how, (warn, crit) = params[p] + if how == "absolute": + levels.append((ref_value + (sig * warn), ref_value + (sig * crit))) + elif how == "relative": + levels.append((ref_value + sig * (ref_value * warn / 100), + ref_value + sig * (ref_value * crit / 100))) + else: # how == "stdev": + levels.append((ref_value + sig * (stdev * warn), + ref_value + sig * (stdev * crit))) + else: + levels.append((None, None)) # print levels return ref_value, levels - - -### TEST CODE -# import os, time, sys, pprint -# class MKGeneralException(Exception): -# def __init__(self, reason): -# self.reason = reason -# def __str__(self): -# return self.reason -# omd_root = os.getenv("OMD_ROOT") -# rrdcached_socket = None -# execfile(omd_root + "/etc/check_mk/defaults") -# opt_debug = True -# data = get_rrd_data("test_1", "Check_MK", "execution_time", time.time() - 86400, time.time()) -# pprint.pprint(data) - -# HINWEISE für nicht-OMD-Nutzer -# - RRD_STORAGE_TYPE muss MULTIPLE sein - single wird nicht unterstützt. Sonst -# müssten wir noch das XML-File auswerten. -# - rrdcached_socket muss in main.mk definiert werden, wenn rrdcached verwendet wird.

11 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2013