Checkmk git commits April 2011

checkmk-commits@lists.checkmk.com

2 participants
103 discussions

Check_MK Git: check_mk: Fixed handling of embedded graphs to support the changed made in the PNP webservice

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5375a0746ca0382298c523fc34e24840eccf448c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5375a0746ca038… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 15:30:09 2011 +0200 Fixed handling of embedded graphs to support the changed made in the PNP webservice --- web/htdocs/js/check_mk.js | 7 ++++--- web/plugins/views/painters.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/htdocs/js/check_mk.js b/web/htdocs/js/check_mk.js index 4983831..75b11d5 100644 --- a/web/htdocs/js/check_mk.js +++ b/web/htdocs/js/check_mk.js @@ -161,7 +161,8 @@ function pnp_response_handler(data, code) { response = eval(code); for(var i in response) { var graph = response[i]; - create_graph(data, '&' + graph['image_url'].replace('&view=1', '')); + var view = data['view'] == '' ? '0' : data['view']; + create_graph(data, '&' + graph['image_url'].replace('&view='+view, '')); i = null; } } catch(e) { @@ -207,8 +208,8 @@ function render_pnp_graphs(container, site, host, service, pnpview, base_url, pn 'pnp_url': pnp_url, 'site': site, 'host': host, 'service': service, 'with_link': with_link, 'view': pnpview}; - get_url(pnp_url + 'index.php/json?&host=' + host + '&srv=' + service + '&source=0', - pnp_response_handler, data, pnp_error_response_handler); + get_url(pnp_url + 'index.php/json?&host=' + host + '&srv=' + service + '&source=0&view=' + pnpview, + pnp_response_handler, data, pnp_error_response_handler); } // ---------------------------------------------------------------------------- diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 225122b..168816c 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -77,7 +77,7 @@ import bi # needed for aggregation icon multisite_painter_options["pnpview"] = { "title" : "PNP Timerange", "default" : "1", - "values" : [ ("0", "4 Hours"), ("1", "25 Hours"), ("2", "One week"), ("3", "One Month"), ("4", "One Year"), ] + "values" : [ ("0", "4 Hours"), ("1", "25 Hours"), ("2", "One week"), ("3", "One Month"), ("4", "One Year"), ("", "All") ] } multisite_painter_options["ts_format"] = {

13 years, 1 month

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

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: c0aeb455882aa0791203fad4c3d0ed2c5acff7b8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0aeb455882aa0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 15:32:46 2011 +0200 Merge branch 'master' of ssh://git.mathias-kettner.de/var/www/80/git.mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: Updated changelog

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: fe57ad0da0934aeb850e645b000f517df3998aba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fe57ad0da0934a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 15:32:41 2011 +0200 Updated changelog --- ChangeLog | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index eafc253..d46ad59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,8 @@ * FIX: Nagios-Snapin: avoid duplicate slash in URL * FIX: custom_style_sheet now also honored by sidebar * FIX: ignore case when sorting groups in ...groups snapin + * FIX: Fixed handling of embedded graphs to support the changes made to + the PNP webservice * Added snmp_uptime, uptime and printer_supply perfometers BI:

13 years, 1 month

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4620d8d7f11f33f7c117c4e63c202a852219838c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4620d8d7f11f33… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 15:08:49 2011 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

13 years, 1 month

Check_MK Git: check_mk: find configuration file in subdirectories of conf. d also

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 23cb931b753c88d650c74c6d7195e07244795975 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=23cb931b753c88… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 15:05:56 2011 +0200 find configuration file in subdirectories of conf.d also --- ChangeLog | 1 + modules/check_mk.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index eafc253..22b3738 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * --debug now implies -v * new option --debug: creates execution profile of check_mk itself * sped up use of stored snmp walks + * find configuration file in subdirectories of conf.d also Multisite: * FIX: webservice: suppress livestatus errors in multi-site setups diff --git a/modules/check_mk.py b/modules/check_mk.py index da09961..0066b10 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3846,7 +3846,9 @@ def all_nonfunction_vars(): # Create list of all files to be included -list_of_files = glob.glob(check_mk_configdir + '/*.mk') +list_of_files = reduce(lambda a,b: a+b, + [ [ "%s/%s" % (d, f) for f in fs if f.endswith(".mk")] + for d, sb, fs in os.walk(check_mk_configdir) ], []) list_of_files.sort() list_of_files = [ check_mk_configfile ] + list_of_files final_mk = check_mk_basedir + "/final.mk"

13 years, 1 month

Check_MK Git: check_mk: Changed general bg_brighten class to individual code again

by lm＠mathias-kettner.de

Module: check_mk Branch: master Commit: b4ba00601f3365459da16701e0e3779b2d2ed3b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4ba00601f3365… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 29 12:14:43 2011 +0200 Changed general bg_brighten class to individual code again --- web/htdocs/check_mk.css | 15 ++++++++------- web/htdocs/permissions.py | 2 +- web/htdocs/views.py | 10 +++++----- web/htdocs/wato.py | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index bcc2895..1673660 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -45,13 +45,6 @@ div { padding: 0; } -/* Lightens up background colors of tables/divs and so on - * form_background.png is a fully transparent image */ -.bg_brighten { - background-image: url("images/form_background.png"); - background-repeat: repeat; -} - /* __ __ _ | \/ | __ _(_)_ __ @@ -1020,6 +1013,8 @@ h2.formcaption { } table.form { + background-image: url("images/form_background.png"); + background-repeat: repeat; border-collapse: collapse; empty-cells: show; border-spacing: 0px; @@ -1063,6 +1058,8 @@ table.form td.legend.border { border-right-style: solid; } table.form td.hilite { + background-image: url("images/form_background.png"); + background-repeat: repeat; margin: 10px; } @@ -1452,6 +1449,8 @@ div.columneditor { div.columneditor table { padding: 0; margin: 0; + background-image: url("images/form_background.png"); + background-repeat: repeat; border: 1px solid #fff; -moz-border-radius: 5px; width: 100%; @@ -1586,6 +1585,8 @@ table.add_snapin i { */ .wato table.auditlog { + background-image: url("images/form_background.png"); + background-repeat: repeat; border-collapse: collapse; margin-top: 3px; margin-bottom: 1em; diff --git a/web/htdocs/permissions.py b/web/htdocs/permissions.py index 7a2e219..1c5bb28 100644 --- a/web/htdocs/permissions.py +++ b/web/htdocs/permissions.py @@ -87,7 +87,7 @@ def page_edit_permissions(h): section_title = config.permission_sections[section] if section != current_section: current_section = section - html.write('<tr><td class="legend border hilite bg_brighten" colspan=%d><b>%s</b></td></tr>\n' % (len(config.roles) + 1, section_title)) + html.write('<tr><td class="legend border hilite" colspan=%d><b>%s</b></td></tr>\n' % (len(config.roles) + 1, section_title)) if current_section == None: title = "<b>%s</b><br><i>%s</i>" % (perm["title"], perm["description"]) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index d5585e5..96a7aa7 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -99,7 +99,7 @@ def show_filter_form(is_open, filters): html.begin_form("filter") html.write("<div class=whiteborder>\n") - html.write("<table class=\"form bg_brighten\">\n") + html.write("<table class=\"form\">\n") # sort filters according to title s = [(f.sort_index, f.title, f) for f in filters] s.sort() @@ -133,7 +133,7 @@ def show_painter_options(painter_options): html.begin_form("painteroptions") html.write("<div class=whiteborder>\n") - html.write("<table class=\"form bg_brighten\">\n") + html.write("<table class=\"form\">\n") for on in painter_options: opt = multisite_painter_options[on] html.write("<tr>") @@ -496,7 +496,7 @@ def page_edit_view(h): html.begin_form("view") html.hidden_field("back", html.var("back", "")) html.hidden_field("old_name", viewname) # safe old name in case user changes it - html.write("<table class=\"form bg_brighten\">\n") + html.write("<table class=\"form\">\n") html.write("<tr><td class=legend>Title</td><td class=content>") html.text_input("view_title") @@ -677,7 +677,7 @@ function toggle_section(nr, oImg) { def view_edit_column(n, var_prefix, maxnum, allowed): collist = [ ("", "") ] + [ (name, p["title"]) for name, p in allowed.items() ] - html.write("<div class=columneditor id=%seditor_%d><table class=bg_brighten><tr>" % (var_prefix, n)) + html.write("<div class=columneditor id=%seditor_%d><table><tr>" % (var_prefix, n)) html.write('<td rowspan=3>') html.write('<img onclick="delete_view_column(this);" ' 'onmouseover=\"hilite_icon(this, 1)\" ' @@ -1543,7 +1543,7 @@ def show_action_form(is_open, datasource): html.hidden_field("actions", "yes") html.hidden_fields() # set all current variables, exception action vars html.write("<div class=whiteborder>\n") - html.write("<table class=\"form bg_brighten\">\n") + html.write("<table class=\"form\">\n") if what in [ "host", "service" ]: show_host_service_actions(what) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ddf44dd..b3034d8 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -242,7 +242,7 @@ def host_link(hostname): def render_audit_log(log, what, with_filename = False): - htmlcode = '<table class="wato auditlog bg_brighten">' + htmlcode = '<table class="wato auditlog">' even = "even" for t, filename, user, action, text in log: text = parse_host_names(text)

13 years, 1 month

Check_MK Git: check_mk: mcdata_fcport: fix computation of traffic

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f96071ee5af8fb3e09af98f7b7d1a7dd5d8ebf41 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f96071ee5af8fb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 10:02:36 2011 +0200 mcdata_fcport: fix computation of traffic --- checks/mcdata_fcport | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/checks/mcdata_fcport b/checks/mcdata_fcport index ed71956..2dff73b 100644 --- a/checks/mcdata_fcport +++ b/checks/mcdata_fcport @@ -27,7 +27,7 @@ mcdata_fcport_speedbits = { "2": '1000000000', "3": '2000000000' } mcdata_fcport_opstatus = { "1" : "1", "2": "2", "3": "testing", "4": "faulty" } -def mcdata_bin_to_64(bin): +def mcdata_bin_to_64(bin, mult = 1): # McData encodes 64 bit counters as big endian HEX strings, # e.g. Hex-STRING: 00 00 00 01 AC C2 8C EE. Check_MK converts # such strings into binary Python strings @@ -36,7 +36,7 @@ def mcdata_bin_to_64(bin): for byte in bin[::-1]: value += mult * ord(byte) mult *= 256 - return str(value) + return str(value * mult) def mcdata_fcport_convert_to_if64(info): return map(mcdata_fcport_convert_line_to_if64, info) @@ -55,13 +55,13 @@ def mcdata_fcport_convert_line_to_if64(line): '6', # ifType 2 speed, # ifSpeed 3 opStatus, # ifOperStatus 4 - mcdata_bin_to_64(rxWords64), # ifHCInOctets 5 + mcdata_bin_to_64(rxWords64, 4), # ifHCInOctets 5 mcdata_bin_to_64(rxFrames64), # ifHCInUcastPkts 6 '0', # ifHCInMulticastPkts 7 '0', # ifHCInBroadcastPkts 8 '0', # ifInDiscards 9 crcs, # ifInErrors 10 - mcdata_bin_to_64(txWords64), # ifHCOutOctets 11 + mcdata_bin_to_64(txWords64, 4), # ifHCOutOctets 11 mcdata_bin_to_64(txFrames64), # ifHCOutUcastPkts 12 '0', # ifHCOutMulticastPkts 13 '0', # ifHCOutBroadcastPkts 14

13 years, 1 month

Check_MK Git: check_mk: New option --profile, for profiling check_mk itself

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1460f4343d1f0bf5afe6490403124336457fc7be URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1460f4343d1f0b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 09:48:13 2011 +0200 New option --profile, for profiling check_mk itself --- ChangeLog | 1 + modules/check_mk.py | 34 ++++++++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b5b2c5..b3a28e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ cases where OIDs are missing) * Allow merging of dictionary based check parameters * --debug now implies -v + * new option --debug: creates execution profile of check_mk itself Multisite: * FIX: webservice: suppress livestatus errors in multi-site setups diff --git a/modules/check_mk.py b/modules/check_mk.py index 4cb4457..da09961 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -34,9 +34,18 @@ check_mk_version = '(inofficial)' # Some things have to be done before option parsing and might # want to output some verbose messages. +g_profile = None + if __name__ == "__main__": opt_debug = '--debug' in sys.argv[1:] opt_verbose = opt_debug or '-v' in sys.argv[1:] or '--verbose' in sys.argv[1:] + if '--profile' in sys.argv[1:]: + import cProfile + g_profile = cProfile.Profile() + g_profile.enable() + if opt_verbose: + sys.stderr.write("Enabled profiling.\n") + else: opt_verbose = False opt_debug = False @@ -4010,6 +4019,18 @@ backup_paths = [ ] +def output_profile(): + if g_profile: + g_profile.dump_stats("profile.out") + file("show_profile.py", "w")\ + .write("#!/usr/bin/python\n" + "import pstats\n" + "stats = pstats.Stats('profile.out')\n" + "stats.sort_stats('time').print_stats()\n") + os.chmod("show_profile.py", 0755) + + sys.stderr.write("Profile 'profile.out' written. Please run ./show_profile.py.\n") + # +----------------------------------------------------------------------+ # | __ __ _ | # | | \/ | __ _(_)_ __ | @@ -4027,7 +4048,7 @@ if __name__ == "__main__": "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", "flush", "package", "donate", "snmpwalk", "usewalk", "scan-parents", "procs=", "automation=", - "snmpget=", + "snmpget=", "profile", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", "man", "nowiki", "config-check", "backup=", "restore=", "check-inventory=", "paths", "cleanup-autochecks", "checks=" ] @@ -4081,12 +4102,12 @@ if __name__ == "__main__": for o,a in opts: if o in [ '-h', '--help' ]: usage() - sys.exit(0) + done = True elif o in [ '-V', '--version' ]: print_version() - sys.exit(0) + done = True elif o in [ '-X', '--config-check' ]: - sys.exit(0) # already done + done = True elif o in [ '-S', '-H' ]: sys.stderr.write(tty_bold + tty_red + "ERROR" + tty_normal + "\n") sys.stderr.write("The options -S and -H have been replaced with the option -N. If you \n") @@ -4205,8 +4226,7 @@ if __name__ == "__main__": (host, clust, ",".join(missing), clust)) # if the host is part of a cluster and # the other nodes of that cluster are - # also present in the list, then we also - # drop the checks of the clusters + # also present in the list, then we also # drop the checks of the clusters else: for host in all_active_hosts() + all_active_clusters(): @@ -4231,6 +4251,7 @@ if __name__ == "__main__": if done: + output_profile() sys.exit(0) elif len(args) == 0 or len(args) > 2: usage() @@ -4251,3 +4272,4 @@ if __name__ == "__main__": sys.exit(2) do_check(hostname, ipaddress) +

13 years, 1 month

Check_MK Git: check_mk: sped up use of stored snmp walks

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 498b206a903b97daad7bba663f89a18ece1348c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=498b206a903b97… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Apr 29 09:53:20 2011 +0200 sped up use of stored snmp walks --- ChangeLog | 1 + modules/snmp.py | 5 +++++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3a28e9..eafc253 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ * Allow merging of dictionary based check parameters * --debug now implies -v * new option --debug: creates execution profile of check_mk itself + * sped up use of stored snmp walks Multisite: * FIX: webservice: suppress livestatus errors in multi-site setups diff --git a/modules/snmp.py b/modules/snmp.py index e9e0e60..bec9d6b 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -365,13 +365,16 @@ def get_stored_snmpwalk(hostname, oid): sys.stderr.write("Getting %s from %s\n" % (oid, path)) if not os.path.exists(path): raise MKGeneralException("No snmpwalk file %s\n" % path) + rowinfo = [] + hot = False for line in file(path): parts = line.split(None, 1) o = parts[0] if o.startswith('.'): o = o[1:] if o == oid or o.startswith(oid_prefix + "."): + hot = True if len(parts) > 1: value = parts[1] if agent_simulator: @@ -381,4 +384,6 @@ def get_stored_snmpwalk(hostname, oid): rowinfo.append((o, strip_snmp_value(value))) # return pair of OID and value if dot_star: return rowinfo # only return first (used by get_single_oid) + elif hot: # end of interesting part, no point in further search + return rowinfo return rowinfo

13 years, 1 month

Check_MK Git: check_mk: FIX: fix bug in snmp when using OID_END

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 077d2ad962ec45804ccc5e4bac1f54837aed7820 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=077d2ad962ec45… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 28 17:06:12 2011 +0200 FIX: fix bug in snmp when using OID_END --- modules/snmp.py | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/snmp.py b/modules/snmp.py index 6c592be..e9e0e60 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -191,6 +191,11 @@ def get_snmp_table(hostname, ip, oid_info): max_len_col = -1 for column in targetcolumns: + fetchoid = oid + if suboid: + fetchoid += "." + str(suboid) + fetchoid += "." + str(column) + # column may be integer or string like "1.5.4.2.3" colno += 1 # if column is 0, we do not fetch any data from snmp, but use @@ -201,14 +206,10 @@ def get_snmp_table(hostname, ip, oid_info): # string or as binary UTF-8 encoded number string if column in [ OID_END, OID_STRING, OID_BIN ]: index_column = colno - columns.append([]) + columns.append((fetchoid, [])) index_format = column continue - fetchoid = oid - if suboid: - fetchoid += "." + str(suboid) - fetchoid += "." + str(column) if opt_use_snmp_walk or is_usewalk_host(hostname): rowinfo = get_stored_snmpwalk(hostname, fetchoid)

13 years, 1 month

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2011