Checkmk git commits July 2011

checkmk-commits@lists.checkmk.com

2 participants
40 discussions

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d6f40daac0e5da4e8ac06554776ca778cd703355 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d6f40daac0e5da… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Tue Jul 12 13:59:57 2011 +0200 Code cleanup --- checks/f5_bigip_temp | 35 +++++++++++++++-------------------- web/plugins/perfometer/check_mk.py | 4 ---- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/checks/f5_bigip_temp b/checks/f5_bigip_temp index 91ef6d1..48c21fb 100644 --- a/checks/f5_bigip_temp +++ b/checks/f5_bigip_temp @@ -41,7 +41,7 @@ def f5_bigip_temp_genitem(info): sensors = [] # parse all detected sensors and name them according to the mib section they came from. - # we will assign a base "nominal" temperature here based on sample MIB data + # we will assign a base "nominal" temperature here based on sample MIB data for chassis_sensor in info[0]: id = chassis_sensor[0] type = "Chassis" @@ -54,14 +54,14 @@ def f5_bigip_temp_genitem(info): cur_temp = int(cpu_sensor[1]) nom_temp = 55 sensors.append([ ("%s %s" % (id, type)), cur_temp, nom_temp ]) - + return sensors def inventory_f5_bigip_temp(checkname, info): inventory = [] for sensor in f5_bigip_temp_genitem(info): - inventory.append([sensor[0], sensor[2]]) + inventory.append([sensor[0], nom_temp]) return inventory @@ -70,33 +70,28 @@ def check_f5_bigip_temp(item, params, info): for sensor in f5_bigip_temp_genitem(info): if item == sensor[0]: - cur_temp = sensor[1] - nom_temp = sensor[2] - # allow some increase in temperature to avoid false alarms - warn = nom_temp + 9 - crit = nom_temp + 18 - msgtxt = " - Temperature is %dC, Levels at %d/%d" % (cur_temp, warn, crit) - perfdata = [("temp", cur_temp, warn, crit)] - if warn >= cur_temp: - return (0, "OK" + msgtxt, perfdata) - elif crit <= cur_temp: - return (2, "CRIT" + msgtxt + "!!", perfdata) - elif warn < cur_temp: - return (1, "WARN" + msgtxt + "!", perfdata) + tmpdiff = sensor[1] - sensor[2] + msgtxt = " - Temperature is %dC" % (sensor[1]) + if 5 >= tmpdiff: + return (0, "OK" + msgtxt) + elif tmpdiff > 15: + return (2, "CRIT" + msgtxt + "!!") + elif tmpdiff > 10: + return (1, "WARN" + msgtxt + "!") else: return (3, "UNKNOWN - unable to read Temperature") + - - + return (3, "UNKNOWN - item not found in SNMP output") - + snmp_info["f5_bigip_temp"] = \ [ (".1.3.6.1.4.1.3375.2.1.3.2.3.2.1", [ 1, 2 ]), ( ".1.3.6.1.4.1.3375.2.1.3.1.2.1", [ 1, 2 ]), ] -check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "TEMP %s", 1, inventory_f5_bigip_temp) +check_info["f5_bigip_temp"] = (check_f5_bigip_temp, "TEMP %s", 0, inventory_f5_bigip_temp ) # Get ID and Speed from the CPU and chassis fan tables diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 071ab55..f978e06 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -187,10 +187,6 @@ def perfometer_check_mk_ipmi_sensors(row, check_command, perf_data): # Also all checks dealing with temperature can use this perfometer perfometers["check_mk-ipmi_sensors"] = perfometer_check_mk_ipmi_sensors perfometers["check_mk-nvidia.temp"] = perfometer_check_mk_ipmi_sensors -perfometers["check_mk-f5_bigip_temp"] = perfometer_check_mk_ipmi_sensors -perfometers["check_mk-apc_symmetra_temp"] = perfometer_check_mk_ipmi_sensors -perfometers["check_mk-apc_symmetra_ext_temp"] = perfometer_check_mk_ipmi_sensors -perfometers["check_mk-cmctc.temp"] = perfometer_check_mk_ipmi_sensors def perfometer_check_mk_if(row, check_command, perf_data): txt = []

13 years, 4 months

Check_MK Git: check_mk: wato: Added hooks for folder/file creation

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 18120b63ed769e5e2e022e3970af0473cb73df2c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18120b63ed769e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 8 16:05:58 2011 +0200 wato: Added hooks for folder/file creation --- web/htdocs/wato.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index dd6503f..faf7891 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -372,6 +372,7 @@ def mode_editfolder(phase, what, new): g_folder["." + what + "s"][name] = new_thing log_audit(new_thing, "new-" + what, _("Created new %s %s") % (the_what, title)) + call_hook_file_or_folder_created(what, new_thing) else: the_thing["title"] = title @@ -2037,6 +2038,7 @@ def delete_folder_after_confirm(del_folder): save_folder_config() log_audit(file_os_path(del_folder), "delete-folder", _("Deleted empty folder %s")% file_os_path(del_folder)) + call_hook_file_or_folder_deleted('folder', del_folder) html.reload_sidebar() # refresh WATO snapin return "folder" elif c == False: # not yet confirmed @@ -2062,6 +2064,7 @@ def delete_file_after_confirm(del_file): del g_folder[".files"][del_file[".name"]] delete_configuration_file(g_folder, del_file) save_folder_config() + call_hook_file_or_folder_deleted('file', del_file) call_hook_host_changed(g_folder) global g_file g_file = None @@ -2938,6 +2941,17 @@ def call_hook_host_changed(the_thing): # called for file or folder hosts = collect_hosts(g_root_folder) call_hooks("all-hosts-changed", hosts) +def call_hook_file_or_folder_created(what, the_thing): + if what == 'file' and "file-created" in hooks: + call_hooks("file-created", the_thing) + elif what == 'folder' and 'folder-created' in hooks: + call_hooks("folder-created", the_thing) + +def call_hook_file_or_folder_deleted(what, the_thing): + if what == 'file' and "file-deleted" in hooks: + call_hooks("file-deleted", the_thing) + elif what == 'folder' and 'folder-deleted' in hooks: + call_hooks("folder-deleted", the_thing) # +----------------------------------------------------------------------+ # | ____ _ _ |

13 years, 5 months

Check_MK Git: check_mk: Updated bug entries

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2c8c84b386883f93d619686cdb7ea5324aff5155 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c8c84b386883f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 7 13:48:15 2011 +0200 Updated bug entries --- .bugs/188 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/188 b/.bugs/188 new file mode 100644 index 0000000..e9d7502 --- /dev/null +++ b/.bugs/188 @@ -0,0 +1,11 @@ +Title: Create Agent Simulator Docs +Component: doku +Benefit: 2 +State: open +Cost: 3 +Date: 2011-07-07 13:02:35 +Class: todo + +The agent simulator feature can not be found in the docs yet. Some +users asked me how to get better "demonstration" data in offline +demo systems.

13 years, 5 months

Check_MK Git: check_mk: Revert "apc_symmetra: Calculating time left correctly now (Thanks to Mirko Witt)"

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: ce36a16e1638b683fa37d411ab55c1510f8a6444 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce36a16e1638b6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 7 13:48:18 2011 +0200 Revert "apc_symmetra: Calculating time left correctly now (Thanks to Mirko Witt)" This reverts commit f709c817af47ca80fd573826e4681886b1e05030. --- ChangeLog | 1 - checks/apc_symmetra | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9dfcc59..9eb7cc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,7 +22,6 @@ softwareLoopback interface. The will not be found by inventory now. * vbox_guest: new check for checking guest additions of Linux virtual box hosts * windows_updates: Added missing manpage - * apc_symmetra: Calculating time left correctly now (Thanks to Mirko Witt) Multisite: * FIX: make non-Ascii characters in services names work again diff --git a/checks/apc_symmetra b/checks/apc_symmetra index 2998fd9..a50523f 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -114,10 +114,9 @@ def check_apc(item, params, info): # 8. run time remaining # RunTimeRemaining == "0:0:26:00.00" - # RunTimeRemaining = 672000 ## 1:52:00 - hrs = int(RunTimeRemaining) / 360000 - mins, secs = divmod(int(RunTimeRemaining) % 360000, 6000) - single_states.append( (0, "run time remaining: %02d:%02d:%02d" % (hrs, mins,secs), None) ) + hrs = int(RunTimeRemaining) / 3600 + mins, secs = divmod(int(RunTimeRemaining) % 3600, 60) + single_states.append( (0, "run time remaining: %02d:%02d:%02d" % (hrs, mins, secs), None) ) # create summary state worst_state = max([x[0] for x in single_states])

13 years, 5 months

Check_MK Git: check_mk: apc_symmetra: Calculating time left correctly now ( Thanks to Mirko Witt)

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: f709c817af47ca80fd573826e4681886b1e05030 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f709c817af47ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 7 09:59:28 2011 +0200 apc_symmetra: Calculating time left correctly now (Thanks to Mirko Witt) --- ChangeLog | 1 + checks/apc_symmetra | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9eb7cc5..9dfcc59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ softwareLoopback interface. The will not be found by inventory now. * vbox_guest: new check for checking guest additions of Linux virtual box hosts * windows_updates: Added missing manpage + * apc_symmetra: Calculating time left correctly now (Thanks to Mirko Witt) Multisite: * FIX: make non-Ascii characters in services names work again diff --git a/checks/apc_symmetra b/checks/apc_symmetra index a50523f..2998fd9 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -114,9 +114,10 @@ def check_apc(item, params, info): # 8. run time remaining # RunTimeRemaining == "0:0:26:00.00" - hrs = int(RunTimeRemaining) / 3600 - mins, secs = divmod(int(RunTimeRemaining) % 3600, 60) - single_states.append( (0, "run time remaining: %02d:%02d:%02d" % (hrs, mins, secs), None) ) + # RunTimeRemaining = 672000 ## 1:52:00 + hrs = int(RunTimeRemaining) / 360000 + mins, secs = divmod(int(RunTimeRemaining) % 360000, 6000) + single_states.append( (0, "run time remaining: %02d:%02d:%02d" % (hrs, mins,secs), None) ) # create summary state worst_state = max([x[0] for x in single_states])

13 years, 5 months

Check_MK Git: check_mk: Wato: Better error handling on exceptions in wato code

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 191150de688a98301e401c9922a0b9987fff2081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=191150de688a98… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 1 15:12:58 2011 +0200 Wato: Better error handling on exceptions in wato code --- web/htdocs/wato.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f0e6026..dd6503f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -158,7 +158,8 @@ def page_handler(): modefunc("content") except Exception, e: - html.show_error(e) + import traceback + html.show_error(traceback.format_exc().replace('\n', '<br />')) html.write("</div>\n") html.footer()

13 years, 5 months

Check_MK Git: check_mk: progress dialog: Fixed JSON formating

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 84b671c78a3afb893fe51d0eeb9866a2a3389712 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84b671c78a3afb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 1 10:43:16 2011 +0200 progress dialog: Fixed JSON formating --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ad30896..f0e6026 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2230,7 +2230,7 @@ def interactive_progress(items, title, stats, finishvars, timewait, success_stat html.write("</table>") html.write("</center>") json_items = '[ %s ]' % ','.join([ "'" + h + "'" for h in items ]) - success_stats = '[ %s ]' % ','.join(success_stats) + success_stats = '[ %s ]' % ','.join(map(str, success_stats)) # Remove all sel_* variables. We do not need them for our ajax-calls. # They are just needed for the Abort/Finish links. Those must be converted # to POST.

13 years, 5 months

Check_MK Git: check_mk: FIX: Problems with { and } in manpage parsing has been fixed

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 081bef65dc5efcda4e5f8a315d7d306fe7d4713e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=081bef65dc5efc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 1 10:23:33 2011 +0200 FIX: Problems with { and } in manpage parsing has been fixed --- modules/check_mk.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index ac0bc3e..d023305 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -2328,7 +2328,8 @@ def show_check_manual(checkname): print "SA:checks" def markup(line, ignored=None): - return line.replace("{", "<b>").replace("}", "</b>") + # preserve the inner { and } in double braces and then replace the braces left + return line.replace('{{', '{{').replace('}}', '}}').replace("{", "<b>").replace("}", "</b>") def print_sectionheader(line, ignored): print "H1:" + line @@ -2359,11 +2360,12 @@ def show_check_manual(checkname): else: name = left typ = "" - print "<tr><td class=tt>%s</td><td>%s</td><td>%s</td></tr>" % (name, typ, text) + print "<tr><td class=tt>%s</td><td>%s</td><td>%s</td></tr>" % (name, typ, markup(text)) else: def markup(line, attr): - return line.replace("{", bold_color).replace("}", tty_normal + attr) + # Replaces braces in the line but preserves the inner braces + return re.sub('(?<!{){', bold_color, re.sub('(?<!})}', tty_normal + attr, line)) def print_sectionheader(left, right): print_splitline(title_color_left, "%-19s" % left, title_color_right, right) @@ -2399,7 +2401,8 @@ def show_check_manual(checkname): print_line("", tty(7,4)) def print_len(word): - netto = word.replace("{", "").replace("}", "") + # In case of double braces remove only one brace for counting the length + netto = word.replace('{{', 'x').replace('}}', 'x').replace("{", "").replace("}", "") netto = re.sub("\033[^m]+m", "", netto) return len(netto)

13 years, 5 months

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 70ce8feafb97023102787c71eda57d84469a6778 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70ce8feafb9702… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 1 10:23:54 2011 +0200 Updated changelog --- ChangeLog | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9af8c04..9eb7cc5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * FIX: Fixed OID_END handling in SNMP based checks (e.g. canon_pages) Checks & Agents: + * FIX: Problems with { and } in manpage parsing has been fixed * FIX: apc_symmetra: fix remaining runtime calculation (by factor 100) * FIX: Added PNP-template for winperf_phydisk * FIX: if64: fix UNKNOWN in case of non-unique ifAlias

13 years, 5 months

Check_MK Git: check_mk: The progress dialog now supports a optional URL to redirect to when nothing has been found

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6119f4104d9fc5618fe7dbf26d85c3960a11b9a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6119f4104d9fc5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Jul 1 10:24:22 2011 +0200 The progress dialog now supports a optional URL to redirect to when nothing has been found --- web/htdocs/js/wato.js | 37 +++++++++++++++++++++++++++---------- web/htdocs/wato.py | 11 +++++++---- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index 1779d93..7e3d447 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -83,8 +83,17 @@ var progress_items = null; var failed_items = null; // Number of total items to handle var progress_total_num = 0; +// Contains the total number of items which have been successfully processed +// This is e.g. used to decide if the dialog needs to redirect to end_url +// or to the term_url +var progress_found = 0; +// The fields which signal that something has been successfully processed. +// this is used together with progress_found to find out the correct redirect url +var progress_success_stats = []; // The URL to redirect to after finish/abort button pressed var progress_end_url = ''; +// The URL to redirect to after finish/abort button pressed when nothing found +var progress_term_url = ''; // The text to show in the progress bar after finished processing var progress_fin_txt = ''; // Is set to true while one request is waiting for a response @@ -180,10 +189,14 @@ function progress_finished() { function progress_end() { // Mark as ended to catch currently running requests progress_ended = true; - location.href = progress_end_url; + if(progress_found > 0) + location.href = progress_end_url; + else + location.href = progress_term_url; } function clear_progress_stats() { + progress_found = 0 for(var i = 1; i < 100; i++) { var o = document.getElementById('progress_stat' + (i - 1)); if (o) { @@ -199,6 +212,8 @@ function update_progress_stats(header) { for(var i = 1; i < header.length; i++) { var o = document.getElementById('progress_stat' + (i - 1)); if (o) { + if(progress_success_stats.indexOf(i) !== -1) + progress_found += parseInt(header[i]); o.innerHTML = parseInt(o.innerHTML) + parseInt(header[i]); o = null; } @@ -237,17 +252,19 @@ function progress_clean_log() { log = null; } -function progress_scheduler(mode, url_prefix, timeout, items, end_url, finished_txt) { +function progress_scheduler(mode, url_prefix, timeout, items, end_url, success_stats, term_url, finished_txt) { // Initialize if (progress_items === null) { - progress_items = items; - failed_items = Array(); - progress_total_num = items.length; - progress_end_url = end_url; - progress_fin_txt = finished_txt; - progress_mode = mode; - progress_url = url_prefix; - progress_timeout = timeout; + progress_items = items; + failed_items = Array(); + progress_total_num = items.length; + progress_end_url = end_url; + progress_term_url = term_url; + progress_success_stats = success_stats; + progress_fin_txt = finished_txt; + progress_mode = mode; + progress_url = url_prefix; + progress_timeout = timeout; } // Escape the loop when ended diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index a308f82..ad30896 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2200,7 +2200,9 @@ def render_folder_path(the_folder = 0, the_file = 0, link_to_last = False): # | buttons for aborting and pausing. | # +----------------------------------------------------------------------+ -def interactive_progress(items, title, stats, finishvars, timewait): +def interactive_progress(items, title, stats, finishvars, timewait, success_stats = [], termvars = []): + if not termvars: + termvars = finishvars; html.write("<center>") html.write("<table class=progress>") html.write("<tr><th colspan=2>%s</th></tr>" % title) @@ -2227,13 +2229,14 @@ def interactive_progress(items, title, stats, finishvars, timewait): html.write("</td></tr>") html.write("</table>") html.write("</center>") - json_items = '[ %s ]' % ','.join([ "'" + h + "'" for h in items ]) + json_items = '[ %s ]' % ','.join([ "'" + h + "'" for h in items ]) + success_stats = '[ %s ]' % ','.join(success_stats) # Remove all sel_* variables. We do not need them for our ajax-calls. # They are just needed for the Abort/Finish links. Those must be converted # to POST. base_url = html.makeuri([], remove_prefix = "sel_") - html.javascript(('progress_scheduler("%s", "%s", 50, %s, "%s", "' + _("FINISHED.") + '");') % - (html.var('mode'), base_url, json_items, html.makeuri(finishvars))) + html.javascript(('progress_scheduler("%s", "%s", 50, %s, "%s", %s, "%s", "' + _("FINISHED.") + '");') % + (html.var('mode'), base_url, json_items, html.makeuri(finishvars), success_stats, html.makeuri(termvars),)) # +----------------------------------------------------------------------+ # | _ _ _ _ _ _ |

13 years, 5 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits July 2011