Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: WATO: sort_sites, improved sort function

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b745d5434be1e6628b7ed34cec563d7f89f58c42 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b745d5434be1e6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 11 00:01:05 2012 +0200 WATO: sort_sites, improved sort function --- web/htdocs/wato.py | 17 +++-------------- 1 files changed, 3 insertions(+), 14 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2c44274..08058c1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6027,20 +6027,9 @@ def find_usage_of_timeperiod(tpname): # Sort given sites argument by peer/local, followed by slaves def sort_sites(sites): def custom_sort(a,b): - if a[1].get("replication","peer") == b[1].get("replication","peer"): - # Compare by alias - if a[1].get("alias") == b[1].get("alias"): - return 0 - elif a[1].get("alias") > b[1].get("alias"): - return 1 - else: - return -1 - elif a[1].get("replication") == "slave" and b[1].get("replication","peer") != "slave": - return 1 - elif a[1].get("replication","peer") != "slave" and b[1].get("replication") == "slave": - return -1 - else: - return 0 + return cmp(a[1].get("replication","peer"), b[1].get("replication","peer")) or \ + -cmp(a[1].get("repl_priority",0), b[1].get("repl_priority",0)) or \ + cmp(a[1].get("alias"), b[1].get("alias")) sites.sort(cmp = custom_sort) def mode_sites(phase):

12 years, 1 month

Check_MK Git: check_mk: WATO: ajax_replication now with prepare_folder_info () initialization

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 61759dec5058756d8c56ea1e3dbd675d2a05d7ac URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61759dec505875… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 11 00:04:28 2012 +0200 WATO: ajax_replication now with prepare_folder_info() initialization --- web/htdocs/wato.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 08058c1..aa3ba21 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7018,6 +7018,9 @@ def ajax_replication(): need_sync = srs.get("need_sync", False) need_restart = srs.get("need_restart", False) + # Initialise g_root_folder, load all folder information + prepare_folder_info() + site = config.site(site_id) try: if need_sync:

12 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: 50c9c8b4a9e57de581fc9ae27cf84be5c7c1249a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=50c9c8b4a9e57d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 10 23:59:04 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0661

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b5abb561dcaf473dee17663677260219d1ffa19f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b5abb561dcaf47… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu May 10 14:39:04 2012 +0200 Updated bug entries #0661 --- .bugs/661 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/661 b/.bugs/661 new file mode 100644 index 0000000..7d0f6eb --- /dev/null +++ b/.bugs/661 @@ -0,0 +1,11 @@ +Title: Do no monitor host leads to host monitored on all sites +Component: wato +State: open +Date: 2012-05-10 14:36:38 +Targetversion: 1.2.0 +Class: bug + +If you set a host to "do not monitor" in the "monitored on" attribute, +then that host will be monitored on *all* sites instead of on none. +Solution: currently no site: tag is set in that case, but we rather +should set an empty site: tag.

12 years, 1 month

Check_MK Git: check_mk: WATO: global settings: make values clickable

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 82cac9385a2fc971abf68c3a178ecdeeba22c02f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82cac9385a2fc9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 17:52:14 2012 +0200 WATO: global settings: make values clickable --- web/htdocs/wato.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index efdcc1d..573dc9a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5202,13 +5202,15 @@ def mode_globalvars(phase): html.icon_button(toggle_url, _("Immediately toggle this setting"), "snapin_greyswitch_" + (current_settings[varname] and "on" or "off")) else: - html.write(valuespec.value_to_text(current_settings[varname])) + html.write('<a href="%s">%s</a>' % + (edit_url, valuespec.value_to_text(current_settings[varname]))) else: if isinstance(valuespec, Checkbox): html.icon_button(toggle_url, _("Immediately toggle this setting"), "snapin_greyswitch_" + (defaultvalue and "on" or "off")) else: - html.write(valuespec.value_to_text(defaultvalue)) + html.write('<a href="%s">%s</a>' % + (edit_url, valuespec.value_to_text(defaultvalue))) html.write("</td>") html.write('</tr>') html.write("</table>")

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0679

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 68851828762c4ccff7c5318d0ccae388d2b37034 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68851828762c4c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 15:57:47 2012 +0200 Updated bug entries #0679 --- .bugs/679 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/.bugs/679 b/.bugs/679 index eb27992..5d809fd 100644 --- a/.bugs/679 +++ b/.bugs/679 @@ -1,4 +1,4 @@ -Title: Logwatch ruleeditor (or ValueSpec ListOf) breaks on older Iceweasel +Title: Logwatch ruleeditor (or ValueSpec ListOf) breaks on Iceweasel on Debian 6.0 Component: multisite State: open Date: 2012-04-24 12:07:14

12 years, 1 month

Check_MK Git: check_mk: Better styling of confirm dialog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: d0cb58eb8ad151df0b7b7253d1f5cb8aafec2c06 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0cb58eb8ad151… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 18:35:48 2012 +0200 Better styling of confirm dialog --- web/htdocs/pages.css | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index d861b05..01b207b 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -532,3 +532,8 @@ div.really h1, div.success h1, div.error h1, div.message h1, div.warning h1 { margin-left: 0px; } +form.confirm { + margin-top: 8px; + position: relative; + left: -1px; +}

12 years, 1 month

Check_MK Git: check_mk: Cleanup of implementation of spheres

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 918411aac9d0156221485380b73a4ad483b651a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=918411aac9d015… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed May 9 16:30:57 2012 +0200 Cleanup of implementation of spheres --- .bugs/684 | 8 ++++++-- web/htdocs/dashboard.py | 37 ++++++++++++++++++++++--------------- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.bugs/684 b/.bugs/684 index 03c489d..d88bc06 100644 --- a/.bugs/684 +++ b/.bugs/684 @@ -1,10 +1,14 @@ Title: Host/Service stastics globe: check scale Component: multisite -State: open +Class: nastiness +State: done Date: 2012-05-09 15:10:19 Targetversion: 1.2.0 -Class: nastiness It seems to me that the sizes of the critical/warning spheres are too large. Checks this out and maybe fix it. + +2012-05-09 16:30:41: changed state open -> done +I've checked this out. The scale is really correct. The human +eye does not realize the exponent here. diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index fa97d32..e4ca77c 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -543,29 +543,36 @@ def render_statistics(pie_id, what, table, filter): r = 0.0 pie_parts = [] if total > 0: - # Counter number of non-zero classes + # Count number of non-empty classes num_nonzero = 0 for info, value in pies: if value > 0: num_nonzero += 1 - # Each non-zero class gets at least a view pixels of visible thickness - separator = 0.05 # 5% of radius - rest_radius = 1 - num_nonzero * separator - - # Make sure, that each class that is not zero has at least a certain - # amount so that it will be visible - totalpart = 1 - # Loop over classes, begin with red (most inner ball) - sum_separator = num_nonzero * separator + # Each non-zero class gets at least a view pixels of visible thickness. + # We reserve that space right now. All computations are done in percent + # of the radius. + separator = 0.02 # 3% of radius + remaining_separatorspace = num_nonzero * separator # space for separators + remaining_radius = 1 - remaining_separatorspace # remaining space + remaining_part = 1.0 # keep track of remaining part, 1.0 = 100% + + # Loop over classes, begin with most outer sphere. Inner spheres show + # worse states and appear larger to the user (which is the reason we + # are doing all this stuff in the first place) for (name, color, viewurl, q), value in pies[::1]: - part = float(value) / total - if value > 0 and totalpart > 0: - radius = sum_separator + rest_radius * totalpart ** (1/3.0) + if value > 0 and remaining_part > 0: # skip empty classes + + # compute radius of this sphere *including all inner spheres!* The first + # sphere always gets a radius of 1.0, of course. + radius = remaining_separatorspace + remaining_radius * (remaining_part ** (1/3.0)) pie_parts.append('chart_pie("%s", %f, %f, %r);' % (pie_id, pie_right_aspect, radius, color)) pie_parts.append('chart_pie("%s", -%f, %f, %r);' % (pie_id, pie_left_aspect, radius, color)) - totalpart -= part - sum_separator -= separator + + # compute relative part of this class + part = float(value) / total # ranges from 0 to 1 + remaining_part -= part + remaining_separatorspace -= separator html.write("</div>")

12 years, 1 month

Check_MK Git: check_mk: WATO: Fix minor problem with replication priority

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0b7fd5cfa4626806fef98dd07886c276700d677d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b7fd5cfa46268… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 10 09:27:44 2012 +0200 WATO: Fix minor problem with replication priority --- web/htdocs/wato.py | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 573dc9a..48f9052 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6186,6 +6186,7 @@ def mode_sites(phase): + "</th><th>" + _("Timeout") + "</th><th>" + _("Pers.") + "</th><th>" + _("Replication") + + "</th><th>" + _("Prio") + "</th><th>" + _("Login") + "</th></tr>\n") @@ -6238,11 +6239,14 @@ def mode_sites(phase): if site.get("replication") == "slave": repl = _("Slave") elif site.get("replication") == "peer": - repl = _("Peer") + _(" - Priority %s") % site.get("repl_priority",0) + repl = _("Peer") else: - repl = _("Local - Priority %s") % site.get("repl_priority",0) + repl = "" html.write("<td>%s</td>" % repl) + html.write("<td class=number>%s</td>" % + ( site.get("replication") != "slave" and str(site.get("repl_priority", 0)) or "")) + # Login-Button for Replication html.write("<td>") if repl: @@ -6580,7 +6584,8 @@ def mode_edit_site(phase): html.write("<br><br>") html.write("<b>%s</b><br><i>%s</i><br>" % ( _("Peer replication priority"), - _("The replication priority is used to determine the master site from the available peers and local sites.<br>" + _("The replication priority is used to determine the master site " + "from the available peers and local sites. " "The site with the highest number takes precedence."))) html.number_input("repl_priority", site.get("repl_priority", 0), size=2) @@ -7140,7 +7145,7 @@ def get_login_secret(create_on_demand = False): urandom = file("/dev/urandom") while len(secret) < 32: c = urandom.read(1) - if ord(c) >= 33 and ord(c) <= 127: + if ord(c) >= 48 and ord(c) <= 90: secret += c write_settings_file(path, secret) return secret

12 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: a70f9b2f6b4630884878dd352823ebbc315467d4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a70f9b2f6b4630… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 10 09:27:47 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 1 month

← Newer
1
...
32
33
34
35
36
37
38
...
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