Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 108b1cf206407ddcac01d78f8f3c34716531735d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=108b1cf206407d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 14:05:42 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed bug managing local site in WATO sites management page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6e0621960d61d413cb3863d2869d6cb7f5c3d108 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e0621960d61d4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 13:57:39 2012 +0200 FIX: Fixed bug managing local site in WATO sites management page --- web/htdocs/wato.py | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ffa9bea..71ec08a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6260,7 +6260,7 @@ def mode_edit_site(phase): vs_conn_method = CascadingDropdown( html_separator = " ", choices = [ - ( "local", _("Connect to the local site") ), + ( None, _("Connect to the local site") ), ( "tcp", _("Connect via TCP"), Tuple( orientation = "float", elements = [ @@ -6319,8 +6319,6 @@ def mode_edit_site(phase): else: new_site["socket"] = method - html.debug(new_site) - # Timeout timeout = html.var("timeout", "").strip() if timeout != "": @@ -6426,10 +6424,10 @@ def mode_edit_site(phase): forms.header(_("Livestatus settings")) forms.section(_("Connection")) - method = site.get("socket", "local") - if method.startswith("unix:"): + method = site.get("socket", None) + if method and method.startswith("unix:"): method = ('unix', method[5:]) - elif method.startswith("tcp:"): + elif method and method.startswith("tcp:"): method = ('tcp', tuple(method.split(":")[1:])) vs_conn_method.render_input("method", method)

12 years, 4 months

Check_MK Git: check_mk: Updated bug entries #0686

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 50fcd7e24505a4ff8d5c21e6a069b49015d42609 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50fcd7e24505a4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 13:44:42 2012 +0200 Updated bug entries #0686 --- .bugs/686 | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.bugs/686 b/.bugs/686 index c63e070..0a0afff 100644 --- a/.bugs/686 +++ b/.bugs/686 @@ -1,12 +1,17 @@ Title: Dashboard/Sidebar on Chrome sometimes not sized Component: multisite -State: open +Class: bug +State: done Date: 2012-05-11 10:46:54 Targetversion: 1.2.0 -Class: bug It seems like we miss an initial resize() event on Chrome. This affects both the sidebar and the dashboard. Can we simulate that event somehow? Currently the dashboard and sidebar sometimes only work after a manual resize of the browser window. + +2012-05-24 13:44:40: changed state open -> done +We are using window.onload and body.onload now in addition. +Seems to work nicely on Chrome and does not break anything +on Firefox.

12 years, 4 months

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: 64df2fad10fd942379c1f0a279db2bef81005364 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=64df2fad10fd94… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 13:43:29 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: FIX: fix sometimes-broken sizing of sidebar and dashboard on Chrome

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 865fbd86089b40103ca65b60f09b3960b98645fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=865fbd86089b40… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 13:43:24 2012 +0200 FIX: fix sometimes-broken sizing of sidebar and dashboard on Chrome --- ChangeLog | 1 + web/htdocs/dashboard.py | 1 + web/htdocs/sidebar.py | 3 ++- 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17c6bf1..66e1e96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ * FIX: disable checkbox button in non-checkboxable layouts * FIX: fix table layout for views (gaps where missing sometimes) * FIX: Fixed sorting views by perfdata values which contain floats + * FIX: fix sometimes-broken sizing of sidebar and dashboard on Chrome Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 99b3c17..eec2183 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -154,6 +154,7 @@ var refresh_dashlets = %r; var dashboard_name = '%s'; set_dashboard_size(); window.onresize = function () { set_dashboard_size(); } +window.onload = function () { set_dashboard_size(); } dashboard_scheduler(1); """ % (header_height, screen_margin, title_height, dashlet_padding, corner_overlap, refresh_dashlets, name)) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 3010413..d37c239 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -146,7 +146,7 @@ def page_side(): if not config.may("see_sidebar"): return html.html_head(_("Check_MK Sidebar"), javascripts=["sidebar"], stylesheets=["sidebar", "status"]) - html.write('<body class="side" onload="initScrollPos()" onunload="storeScrollPos()">\n') + html.write('<body class="side" onload="initScrollPos(); setSidebarHeight();" onunload="storeScrollPos()">\n') html.write('<div id="check_mk_sidebar">\n') views.load_views() @@ -180,6 +180,7 @@ def page_side(): html.write("restart_snapins = %r;\n" % restart_snapins) html.write("sidebar_scheduler();\n") html.write("window.onresize = function() { setSidebarHeight(); }\n") + # html.write("window.onload = function() { setSidebarHeight(); }\n") html.write("</script>\n") # html.write("</div>\n")

12 years, 4 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 115393ab3efecc717a85ad63cb85ea5df4d6ba32 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=115393ab3efecc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 13:36:05 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 4 months

Check_MK Git: check_mk: Fixed another styling issue

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 08115427bc75b4a8ff3202f71d6d88307e74f58f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=08115427bc75b4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 13:30:57 2012 +0200 Fixed another styling issue --- web/htdocs/status.css | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index bebe26a..34e7877 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -53,7 +53,7 @@ td.state { white-space: nowrap; } /* WARN */ -.state1, .state1 a { +.state1, .state1 a, tr.groupheader td.state1 { background-color: #ff0; color: #000; }

12 years, 4 months

Check_MK Git: check_mk: FIX: handle UTF-8 encoded binary strings correctly (e.g. in host alias)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 8012550c8c7084dcfb60af754b4545839c87ca1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8012550c8c7084… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 13:17:37 2012 +0200 FIX: handle UTF-8 encoded binary strings correctly (e.g. in host alias) --- ChangeLog | 3 +++ modules/check_mk.py | 24 +++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa653c7..5321aad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ 1.2.0b5: + Core: + * FIX: handle UTF-8 encoded binary strings correctly (e.g. in host alias) + WATO: * FIX: fix folding problems with dependent host tags * FIX: Detecting duplicate tag ids between regular tags and auxtags diff --git a/modules/check_mk.py b/modules/check_mk.py index d1e9288..e8459e6 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -343,7 +343,6 @@ except Exception, e: sys.exit(5) - # +----------------------------------------------------------------------+ # | ____ _ _ _ _ | # | / ___| |__ ___ ___| | __ | |__ ___| |_ __ ___ _ __ ___ | @@ -1087,6 +1086,12 @@ def service_description(check_type, item): # | |___/ |_| | # +----------------------------------------------------------------------+ +def make_utf8(x): + if type(x) == unicode: + return x.encode('utf-8') + else: + return x + def output_conf_header(outfile): outfile.write("""# # Created by Check_MK. Do not edit. @@ -1494,7 +1499,7 @@ def create_nagios_hostdefs(outfile, hostname): outfile.write("\ndefine host {\n") outfile.write(" host_name\t\t\t%s\n" % hostname) outfile.write(" use\t\t\t\t%s\n" % (is_clust and cluster_template or host_template)) - outfile.write(" address\t\t\t%s\n" % (ip and ip.encode('utf-8') or "0.0.0.0")) + outfile.write(" address\t\t\t%s\n" % (ip and make_utf8(ip) or "0.0.0.0")) outfile.write(" _TAGS\t\t\t\t%s\n" % " ".join(tags_of_host(hostname))) # Levels for host check @@ -1561,10 +1566,11 @@ def create_nagios_hostdefs(outfile, hostname): if len(aliases) == 0: outfile.write(" alias\t\t\t\t%s\n" % alias) else: - alias = aliases[0].encode("utf-8") + alias = make_utf8(aliases[0]) + # Custom configuration last -> user may override all other values - outfile.write(extra_host_conf_of(hostname).encode("utf-8")) + outfile.write(make_utf8(extra_host_conf_of(hostname))) outfile.write("}\n") @@ -1910,7 +1916,7 @@ define hostgroup { hostgroup_name\t\t%s alias\t\t\t\t%s } -""" % (hg, alias.encode('utf-8'))) +""" % (hg, make_utf8(alias))) # No creation of host groups but we need to define # default host group @@ -1940,7 +1946,7 @@ define servicegroup { servicegroup_name\t\t%s alias\t\t\t\t%s } -""" % (sg, alias.encode('utf-8'))) +""" % (sg, make_utf8(alias))) def create_nagios_config_contactgroups(outfile): if define_contactgroups: @@ -1957,7 +1963,7 @@ def create_nagios_config_contactgroups(outfile): outfile.write("\ndefine contactgroup {\n" " contactgroup_name\t\t%s\n" " alias\t\t\t\t%s\n" - "}\n" % (name, alias.encode('utf-8'))) + "}\n" % (name, make_utf8('utf-8'))) def create_nagios_config_commands(outfile): @@ -2004,7 +2010,7 @@ def create_nagios_config_timeperiods(outfile): tp = timeperiods[name] outfile.write("define timeperiod {\n timeperiod_name\t\t%s\n" % name) if "alias" in tp: - outfile.write(" alias\t\t\t\t%s\n" % tp["alias"].encode("utf-8")) + outfile.write(" alias\t\t\t\t%s\n" % make_utf(tp["alias"])) for key, value in tp.items(): if key not in [ "alias", "exclude" ]: times = ",".join([ ("%s-%s" % (fr, to)) for (fr, to) in value ]) @@ -2034,7 +2040,7 @@ def create_nagios_config_contacts(outfile): outfile.write("define contact {\n contact_name\t\t\t%s\n" % cname) if "alias" in contact: - outfile.write(" alias\t\t\t\t%s\n" % contact["alias"].encode("utf-8")) + outfile.write(" alias\t\t\t\t%s\n" % make_utf8(contact["alias"])) if "email" in contact: outfile.write(" email\t\t\t\t%s\n" % contact["email"]) if "pager" in contact:

12 years, 4 months

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: 4c2f6208c38e4b3309d15ccfe29030094604dc05 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4c2f6208c38e4b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 13:17:44 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 4 months

Check_MK Git: check_mk: FIX: Fixed sorting views by perfdata values which contain float

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: eec95b75ee88fd2f78860252286e9b2bdd91b61f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eec95b75ee88fd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 13:08:56 2012 +0200 FIX: Fixed sorting views by perfdata values which contain float --- ChangeLog | 1 + web/plugins/views/sorters.py | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index aa653c7..9a741af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ * FIX: fix repeated stacked refresh when toggling columns * FIX: disable checkbox button in non-checkboxable layouts * FIX: fix table layout for views (gaps where missing sometimes) + * FIX: Fixed sorting views by perfdata values which contain floats Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/plugins/views/sorters.py b/web/plugins/views/sorters.py index 57f00aa..dcab883 100644 --- a/web/plugins/views/sorters.py +++ b/web/plugins/views/sorters.py @@ -157,13 +157,7 @@ declare_1to1_sorter("svc_group_memberlist", cmp_string_list) declare_1to1_sorter("svc_acknowledged", cmp_simple_number) def cmp_perfdata_nth_value(r1, r2, n): - def saveint(s): - # Change None or empty strings to -1 to make these lines - # appear below the lines with a value of 0 - if s is None or s == '': - return -1 - return int(s) - return cmp(saveint(get_perfdata_nth_value(r1, n)), saveint(get_perfdata_nth_value(r2, n))) + return cmp(savefloat(get_perfdata_nth_value(r1, n)), savefloat(get_perfdata_nth_value(r2, n))) multisite_sorters['svc_perf_val01'] = { "title" : _("Service performance data - value number %02d") % 1,

12 years, 4 months

← Newer
1
...
13
14
15
16
17
18
19
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012