Checkmk git commits March 2013

checkmk-commits@lists.checkmk.com

3 participants
209 discussions

Check_MK Git: check_mk: Fix cleanup of obsolete prediction files

by Mathias Kettner

Module: check_mk Branch: master Commit: 2b113dfcf8e1e9fbb071e6a41f86f37ee4465979 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b113dfcf8e1e9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 2 20:26:38 2013 +0100 Fix cleanup of obsolete prediction files --- modules/prediction.py | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/modules/prediction.py b/modules/prediction.py index e7875c0..b7a85f1 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -246,20 +246,8 @@ def get_predictive_levels(dsname, params, cf): if opt_debug: sys.stderr.write("Prediction parameters have changed.\n") last_info = None - # Remove all prediction files that result from other - # prediction periods. This is e.g. needed if the user switches - # the parameter from 'wday' to 'day'. - for f in os.listdir(dir): - if f.endswith(".info"): - try: - info = eval(file(dir + "/" + f).read()) - if info["period"] != params["period"]: - os.remove(dir + "/" + f) - os.remove(dir + "/" + f[:-5]) - except: - pass break - except Exception, e: + except IOError: if opt_debug: sys.stderr.write("No previous prediction for group %s available.\n" % timegroup) last_info = None @@ -274,6 +262,21 @@ def get_predictive_levels(dsname, params, cf): prediction = eval(file(pred_file).read()) else: + # Remove all prediction files that result from other + # prediction periods. This is e.g. needed if the user switches + # the parameter from 'wday' to 'day'. + for f in os.listdir(dir): + if f.endswith(".info"): + try: + info = eval(file(dir + "/" + f).read()) + if info["period"] != params["period"]: + if opt_debug: + sys.stderr.write("Removing obsolete prediction %s\n" % f[:-5]) + os.remove(dir + "/" + f) + os.remove(dir + "/" + f[:-5]) + except: + pass + if opt_debug: sys.stderr.write("Computing prediction for time group %s.\n" % timegroup) prediction = compute_prediction(pred_file, timegroup, params, period_info, from_time, dsname, cf)

11 years, 4 months

Check_MK Git: check_mk: Prediction: graph does now also show RRD data

by Mathias Kettner

Module: check_mk Branch: master Commit: dfefe49fe419a1ec65620878564301a0744147d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfefe49fe419a1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 2 20:16:54 2013 +0100 Prediction: graph does now also show RRD data --- modules/prediction.py | 24 ++++++++++++++---- web/htdocs/js/prediction.js | 21 ++++++++++++---- web/htdocs/prediction.css | 7 +++-- web/htdocs/prediction.py | 44 +++++++++++++++++++++++++++------- web/plugins/wato/check_parameters.py | 2 +- 5 files changed, 74 insertions(+), 24 deletions(-) diff --git a/modules/prediction.py b/modules/prediction.py index ea08712..e7875c0 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -126,8 +126,8 @@ def group_by_wday(t): day_of_epoch, rel_time = divmod(t - time.timezone, 86400) return daynames[wday], rel_time -def group_by_hour(t): - return "%02d" % ((t % 86400) / 3600), t % 3600 +def group_by_day(t): + return "everyday", (t - time.timezone) % 86400 prediction_periods = { "wday" : { @@ -135,10 +135,10 @@ prediction_periods = { "groupby" : group_by_wday, "valid" : 7, }, - "hour" : { - "slice" : 3600, - "groupby" : group_by_hour, - "valid" : 24, + "day" : { + "slice" : 86400, + "groupby" : group_by_day, + "valid" : 1, } } @@ -246,6 +246,18 @@ def get_predictive_levels(dsname, params, cf): if opt_debug: sys.stderr.write("Prediction parameters have changed.\n") last_info = None + # Remove all prediction files that result from other + # prediction periods. This is e.g. needed if the user switches + # the parameter from 'wday' to 'day'. + for f in os.listdir(dir): + if f.endswith(".info"): + try: + info = eval(file(dir + "/" + f).read()) + if info["period"] != params["period"]: + os.remove(dir + "/" + f) + os.remove(dir + "/" + f[:-5]) + except: + pass break except Exception, e: if opt_debug: diff --git a/web/htdocs/js/prediction.js b/web/htdocs/js/prediction.js index df41dbc..cdf23d3 100644 --- a/web/htdocs/js/prediction.js +++ b/web/htdocs/js/prediction.js @@ -37,6 +37,8 @@ var right_border = 50; var top_border = 40; var bottom_border = 50; +var None = null; // make us compatible with Python repr() + function create_graph(cid, ft, ut, vmi, vma) { // Keep important data as global variables, needed by @@ -199,21 +201,30 @@ function render_point(t, v, color) } -function render_curve(points, color) +function render_curve(points, color, w) { var canvas = document.getElementById(canvas_id); var c = canvas.getContext('2d'); c.beginPath(); c.strokeStyle = color; - c.lineWidth = 1; + c.lineWidth = w; - var p0 = point(points[0][0], points[0][1]); var time_step = (until_time - from_time) / points.length; - c.moveTo(p0[0], p0[1]); + var first = true; for (i=0; i<points.length; i++) { + if (points[i] == null) { + c.stroke(); + first = true; + continue; + } var p = point(from_time + time_step * i, points[i]); - c.lineTo(p[0], p[1]); + if (first) { + c.moveTo(p[0], p[1]); + first = false; + } + else + c.lineTo(p[0], p[1]); } c.stroke(); } diff --git a/web/htdocs/prediction.css b/web/htdocs/prediction.css index a07296c..68a7e90 100644 --- a/web/htdocs/prediction.css +++ b/web/htdocs/prediction.css @@ -30,6 +30,7 @@ table.prediction canvas { } table.prediction { + margin-top: 10px; border: 1px solid black; box-shadow: 0.5px 0.5px 2px #888; border-spacing: 0px; @@ -53,9 +54,9 @@ table.prediction td.legend div { table.prediction td.legend div.color { border: 1px solid black; - height: 14px; - width: 14px; - vertical-align: middle; + height: 12px; + width: 12px; + vertical-align: bottom; display: inline-block; box-shadow: 0.5px 0.5px 1px #888; } diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index e37e794..58aaedd 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -32,6 +32,25 @@ from lib import * graph_size = 2000, 700 +# Import helper functions from check_mk module prediction.py. Maybe we should +# find some more clean way some day for creating common Python code between +# Check_MK CCE and Multisite. +execfile(defaults.modules_dir + "/prediction.py") +rrd_path = defaults.rrd_path +rrdcached_socket = None +omd_root = None +try: + omd_root = default.omd_root + if omd_root: + rrdcached_socket = omd_root + "/tmp/run/rrdcached.sock" + else: + try: + rrdcached_socket = config.rrdcached_socket + except: + pass +except: + pass + def page_graph(): host = html.var("host") service = html.var("service") @@ -61,6 +80,9 @@ def page_graph(): timegroup = tg_info timegroups.sort(cmp = lambda a,b: cmp(a["range"], b["range"])) + if not timegroup: + timegroup = timegroups[0] + choices = [ (tg_info["name"], tg_info["name"].title()) for tg_info in timegroups ] @@ -70,9 +92,7 @@ def page_graph(): html.hidden_fields() html.end_form() - title = _("Prediction for %s") % timegroup["name"] - # time_range aus info-Datei holen - # v_range ermitteln + # Get prediction data tg_data = eval(file(dir + "/" + timegroup["name"]).read()) swapped = swap_and_compute_levels(tg_data, timegroup) vertical_range = compute_vertical_range(swapped) @@ -85,7 +105,7 @@ def page_graph(): if current_value != None: legend.append( ("#0000ff", _("Current value: %.2f") % current_value) ) - create_graph(timegroup["name"], title, graph_size, timegroup["range"], vertical_range, legend) + create_graph(timegroup["name"], graph_size, timegroup["range"], vertical_range, legend) if "levels_upper" in timegroup: render_dual_area(swapped["upper_warn"], swapped["upper_crit"], "#fff000", 0.4) @@ -96,13 +116,15 @@ def page_graph(): 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] time_scala = [ [timegroup["range"][0] + i*3600, "%02d:00" % i] for i in range(0, 25, 2) ] render_coordinates(vert_scala, time_scala); 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"], "#j0b0a0") + render_curve(swapped["lower_crit"], "#f0b0a0") if "levels_upper" in timegroup: render_dual_area(swapped["upper_warn"], swapped["average"], "#ffffff", 0.5) @@ -112,6 +134,11 @@ def page_graph(): render_curve(swapped["average"], "#000000") # render_curve(stack(swapped["average"], swapped["stdev"], -1), "#008040") + # Try to get current RRD data and render it also + from_time, until_time = timegroup["range"] + rrd_step, rrd_data = get_rrd_data(host, service, dsname, "MAX", from_time, until_time) + render_curve(rrd_data, "#0000ff", 2) + if current_value != None: rel_time = time.time() % timegroup["slice"] render_point(timegroup["range"][0] + rel_time, current_value, "#0000ff") @@ -178,8 +205,7 @@ def compute_vertical_range(swapped): mmin = min(mmin, min(points)) return mmin, mmax -def create_graph(name, title, size, range, v_range, legend): - html.write('<h3 class=prediction>%s</h3>' % title) +def create_graph(name, size, range, v_range, legend): html.write('<table class=prediction><tr><td>') html.write('<canvas class=prediction id="content_%s" style="width: %dpx; height: %dpx;" width=%d height=%d></canvas>' % ( name, size[0]/2, size[1]/2, size[0], size[1])) @@ -195,8 +221,8 @@ def render_coordinates(v_scala, t_scala): html.javascript('render_coordinates(%r, %r);' % (v_scala, t_scala)) -def render_curve(points, color): - html.javascript('render_curve(%r, %r);' % (points, color)) +def render_curve(points, color, width=1): + html.javascript('render_curve(%r, %r, %d);' % (points, color, width)) def render_point(t, v, color): html.javascript('render_point(%r, %r, %r);' % (t, v, color)) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 17eb527..cc19f64 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1413,7 +1413,7 @@ checkgroups.append(( title = _("Base prediction on"), choices = [ ( "wday", _("Day of the week (00:00 - 24:00 in local time)") ), - ( "hour", _("Hour of the day") ), + ( "day", _("Hour of the day") ), ] )), ( "horizon",

11 years, 4 months

Check_MK Git: check_mk: Prediction: select timegroup with dropdown choice

by Mathias Kettner

Module: check_mk Branch: master Commit: 59d73fd74cb1622a1c73ea899f7839241d64cd7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59d73fd74cb162… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 2 17:05:03 2013 +0100 Prediction: select timegroup with dropdown choice --- modules/prediction.py | 1 + web/htdocs/js/prediction.js | 16 ++++++ web/htdocs/prediction.css | 2 +- web/htdocs/prediction.py | 114 ++++++++++++++++++++++++++++--------------- 4 files changed, 93 insertions(+), 40 deletions(-) diff --git a/modules/prediction.py b/modules/prediction.py index c8c3120..ea08712 100644 --- a/modules/prediction.py +++ b/modules/prediction.py @@ -270,6 +270,7 @@ def get_predictive_levels(dsname, params, cf): "range" : (from_time, until_time), "cf" : cf, "dsname" : dsname, + "slice" : period_info["slice"], } info.update(params) file(info_file, "w").write("%r\n" % info) diff --git a/web/htdocs/js/prediction.js b/web/htdocs/js/prediction.js index 09d4527..df41dbc 100644 --- a/web/htdocs/js/prediction.js +++ b/web/htdocs/js/prediction.js @@ -183,6 +183,22 @@ function line(c, t0, v0, t1, v1) c.stroke(); } +function render_point(t, v, color) +{ + var canvas = document.getElementById(canvas_id); + var c = canvas.getContext('2d'); + var p = point(t, v); + c.beginPath(); + c.lineWidth = 4; + c.strokeStyle = color; + c.moveTo(p[0]-6, p[1]-6); + c.lineTo(p[0]+6, p[1]+6); + c.moveTo(p[0]+6, p[1]-6); + c.lineTo(p[0]-6, p[1]+6); + c.stroke(); +} + + function render_curve(points, color) { var canvas = document.getElementById(canvas_id); diff --git a/web/htdocs/prediction.css b/web/htdocs/prediction.css index a0e3175..a07296c 100644 --- a/web/htdocs/prediction.css +++ b/web/htdocs/prediction.css @@ -42,7 +42,7 @@ table.prediction td { table.prediction td.legend { padding-left: 43px; color: #000000; - padding-bottom: 9px; + padding-bottom: 12px; padding-top: 2px; } diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 331f581..e37e794 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -26,6 +26,8 @@ import defaults import os +import time + from lib import * graph_size = 2000, 700 @@ -39,60 +41,91 @@ def page_graph(): javascripts=["prediction"], stylesheets=["pages", "prediction"]) + # Get current value from perf_data via Livestatus + current_value = \ + get_current_perfdata(host, service, dsname) + dir = "%s/prediction/%s/%s/%s" % ( defaults.var_dir, host, pnp_cleanup(service), pnp_cleanup(dsname)) # Load all prediction information, sort by time of generation + tg_name = html.var("timegroup") + timegroup = None timegroups = [] for f in os.listdir(dir): if f.endswith(".info"): tg_info = eval(file(dir + "/" + f).read()) tg_info["name"] = f[:-5] timegroups.append(tg_info) + if tg_info["name"] == tg_name: + timegroup = tg_info timegroups.sort(cmp = lambda a,b: cmp(a["range"], b["range"])) - for tg_info in timegroups: - title = _("Prediction for %s") % tg_info["name"] - # time_range aus info-Datei holen - # v_range ermitteln - tg_data = eval(file(dir + "/" + tg_info["name"]).read()) - swapped = swap_and_compute_levels(tg_data, tg_info) - vertical_range = compute_vertical_range(swapped) - legend = [ - ( "#ff0000", _("Critical area") ), - ( "#ffff00", _("Warning area") ), - ( "#ffffff", _("OK area") ), - ( "#000000", _("Reference") ), - ] - create_graph(tg_info["name"], title, graph_size, tg_info["range"], vertical_range, legend) - - if "levels_upper" in tg_info: - render_dual_area(swapped["upper_warn"], swapped["upper_crit"], "#fff000", 0.4) - render_area_reverse(swapped["upper_crit"], "#ff0000", 0.1) - - if "levels_lower" in tg_info: - 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)) ] - time_scala = [ [tg_info["range"][0] + i*3600, "%02d:00" % i] for i in range(0, 25, 2) ] - render_coordinates(vert_scala, time_scala); - - if "levels_lower" in tg_info: - render_dual_area(swapped["average"], swapped["lower_warn"], "#ffffff", 0.5) - render_curve(swapped["lower_warn"], "#e0e000") - render_curve(swapped["lower_crit"], "#j0b0a0") - - if "levels_upper" in tg_info: - 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["average"], "#000000") - render_curve(swapped["average"], "#000000") - # render_curve(stack(swapped["average"], swapped["stdev"], -1), "#008040") + choices = [ (tg_info["name"], tg_info["name"].title()) + for tg_info in timegroups ] + + html.begin_form("prediction") + html.write(_("Show prediction for ")) + html.select("timegroup", choices, choices[0], onchange="document.prediction.submit();") + html.hidden_fields() + html.end_form() + + title = _("Prediction for %s") % timegroup["name"] + # time_range aus info-Datei holen + # v_range ermitteln + tg_data = eval(file(dir + "/" + timegroup["name"]).read()) + swapped = swap_and_compute_levels(tg_data, timegroup) + vertical_range = compute_vertical_range(swapped) + legend = [ + ( "#000000", _("Reference") ), + ( "#ffffff", _("OK area") ), + ( "#ffff00", _("Warning area") ), + ( "#ff0000", _("Critical area") ), + ] + if current_value != None: + legend.append( ("#0000ff", _("Current value: %.2f") % current_value) ) + + create_graph(timegroup["name"], title, graph_size, timegroup["range"], vertical_range, legend) + + if "levels_upper" in timegroup: + render_dual_area(swapped["upper_warn"], swapped["upper_crit"], "#fff000", 0.4) + render_area_reverse(swapped["upper_crit"], "#ff0000", 0.1) + + if "levels_lower" in timegroup: + 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)) ] + time_scala = [ [timegroup["range"][0] + i*3600, "%02d:00" % i] for i in range(0, 25, 2) ] + render_coordinates(vert_scala, time_scala); + + 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"], "#j0b0a0") + + 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["average"], "#000000") + render_curve(swapped["average"], "#000000") + # render_curve(stack(swapped["average"], swapped["stdev"], -1), "#008040") + + if current_value != None: + rel_time = time.time() % timegroup["slice"] + render_point(timegroup["range"][0] + rel_time, current_value, "#0000ff") html.footer() +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)) + for part in perf_data.split(): + name, rest = part.split("=") + if name == dsname: + return float(rest.split(";")[0]) + # Compute check levels from prediction data and check parameters def swap_and_compute_levels(tg_data, tg_info): columns = tg_data["columns"] @@ -165,6 +198,9 @@ def render_coordinates(v_scala, t_scala): def render_curve(points, color): html.javascript('render_curve(%r, %r);' % (points, color)) +def render_point(t, v, color): + html.javascript('render_point(%r, %r, %r);' % (t, v, color)) + def render_area(points, color, alpha=1.0): html.javascript('render_area(%r, %r, %f);' % (points, color, alpha))

11 years, 4 months

Check_MK Git: check_mk: Prediction: fixed time zone in prediction graph

by Mathias Kettner

Module: check_mk Branch: master Commit: 19cf69e32cf18f3bca5c1406ce8d4efb13de57d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=19cf69e32cf18f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 2 21:46:27 2013 +0100 Prediction: fixed time zone in prediction graph --- web/htdocs/prediction.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/prediction.py b/web/htdocs/prediction.py index 58aaedd..abe1f5e 100644 --- a/web/htdocs/prediction.py +++ b/web/htdocs/prediction.py @@ -140,7 +140,7 @@ def page_graph(): render_curve(rrd_data, "#0000ff", 2) if current_value != None: - rel_time = time.time() % timegroup["slice"] + rel_time = (time.time() - time.timezone) % timegroup["slice"] render_point(timegroup["range"][0] + rel_time, current_value, "#0000ff") html.footer()

11 years, 4 months

Check_MK Git: check_mk: Implement predictive monitoring

by Mathias Kettner

Module: check_mk Branch: master Commit: 7ea5d33c46761a759894719df3d01768e7ed7ae0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ea5d33c46761a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 24 17:17:03 2013 +0100 Implement predictive monitoring --- checks/cpu | 58 ++++++-- modules/check_mk.py | 13 +- modules/check_mk_base.py | 4 + modules/prediction.py | 239 +++++++++++++++++++++++++++++---- pnp-templates/check_mk-cpu.loads.php | 54 ++++++-- web/htdocs/check_mk.css | 9 +- web/htdocs/images/icon_prediction.png | Bin 0 -> 2935 bytes web/htdocs/js/prediction.js | 54 ++++++++ web/htdocs/prediction.css | 32 +++++ web/htdocs/prediction.py | 66 +++++++++ web/htdocs/valuespec.py | 24 +++- web/plugins/icons/builtin.py | 30 ++++ web/plugins/pages/shipped.py | 2 + web/plugins/wato/check_parameters.py | 108 ++++++++++++++- 14 files changed, 622 insertions(+), 71 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7ea5d33c46…

11 years, 4 months

Check_MK Git: check_mk: Prediction: Improve analysing graph

by Mathias Kettner

Module: check_mk Branch: master Commit: 69862e5cfd409b65748eb4628b8aeba98da17bd1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=69862e5cfd409b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 2 16:23:31 2013 +0100 Prediction: Improve analysing graph --- modules/prediction.py | 51 +++++++++- web/htdocs/js/prediction.js | 227 +++++++++++++++++++++++++++++++++++++++---- web/htdocs/prediction.css | 35 +++++++- web/htdocs/prediction.py | 139 +++++++++++++++++++++++--- 4 files changed, 413 insertions(+), 39 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=69862e5cfd…

11 years, 4 months

Check_MK Git: check_mk: Merge branch 'prediction'

by Mathias Kettner

Module: check_mk Branch: master Commit: 8592cc505d1d4f41b78f7cc58e1297670389d0ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8592cc505d1d4f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 2 21:46:57 2013 +0100 Merge branch 'prediction' ---

11 years, 4 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: ac3993a465fb651314ced1e4d2f0c4df52928858 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac3993a465fb65… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Mar 2 21:47:22 2013 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 4 months

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

by Lars Michelsen

Module: check_mk Branch: master Commit: 3bc2270f60d6cc0a54bcdf4d30d0fcaab5ffff91 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3bc2270f60d6cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 1 15:09:19 2013 +0100 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 4 months

Check_MK Git: check_mk: Fixed stripped signs

by Lars Michelsen

Module: check_mk Branch: master Commit: 924b5bbe43a21c1d48b4ae2fb24b1eb3578177f8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=924b5bbe43a21c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 1 15:08:51 2013 +0100 Fixed stripped signs --- agents/windows/plugins/mssql.vbs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agents/windows/plugins/mssql.vbs b/agents/windows/plugins/mssql.vbs index d990591..f515f14 100644 --- a/agents/windows/plugins/mssql.vbs +++ b/agents/windows/plugins/mssql.vbs @@ -32,17 +32,17 @@ On Error Resume Next ' MSSQL >= 10 ' try SQL Server 2012: Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement11") -If Err.Number 0 Then +If Err.Number <> 0 Then Err.Clear() ' try SQL Server 2008 Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement10") - If Err.Number 0 Then + If Err.Number <> 0 Then Err.Clear() ' try MSSQL < 10 Set WMI = GetObject("WINMGMTS:\\.\root\Microsoft\SqlServer\ComputerManagement") - If Err.Number 0 Then + If Err.Number <> 0 Then wscript.echo "Error: " & Err.Number & " " & Err.Description Err.Clear() wscript.quit()

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