[checkmk-commits] Check_MK Git: check_mk: Multisite: fix computation of buffer slots

Module: check_mk Branch: master Commit: 7ba84dde72a5df15aed9ab7e6f517c41e94d5268 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7ba84dde72a5df… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Thu Oct 28 21:02:29 2010 +0200 Multisite: fix computation of buffer slots --- LIESMICH.zutun | 6 ------ web/plugins/sidebar/shipped.py | 10 +++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/LIESMICH.zutun b/LIESMICH.zutun index cf4dadb..587ebf2 100644 --- a/LIESMICH.zutun +++ b/LIESMICH.zutun @@ -3,12 +3,6 @@ BUGS beheben bis => 1.1.8 -------------------------------------------------------------------------------- CHECK_MK: -bei den Server Perf Werten "Com. buf. max.total" wird nicht der eigene -sonderen einer der anderen sites angezeigt, -Eigentlich: es sollte (meiner Meinung nach) addiert werden oder evtl. -auch das MAX genommen werden. Oder ganz rausfliegen. Es muss unbedingt -konsisten mit den übrigen werden sein. - -------------------------------------------------------------------------------- BUGS beheben ab 1.1.9i1 -------------------------------------------------------------------------------- diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 52393dc..586eff6 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -547,12 +547,12 @@ def render_performance(): ("Process creations", 4, "%.2f/s"), ("New log messages", 5, "%.2f/s"), ("Cached log messages", 6, "%d")]: - html.write(("<tr><td class=left>%s:</td><td class=right>" + format + "</td></tr>\n") % (what, sum([row[col] for row in data]))) - size, usage, max = html.live.query("GET status\nColumns: external_command_buffer_slots external_command_buffer_usage external_command_buffer_max\n")[0] - # html.write("<tr><td class=left>Com. buf. c/max/t</td>" - # "<td class=right>%05d/%05d/%05d</td></tr>" % (usage, max, size)) + html.write(("<tr><td class=left>%s:</td><td class=right>" + format + "</td></tr>\n") % (what, sum([row[col] for row in data]))) + data = html.live.query("GET status\nColumns: external_command_buffer_slots external_command_buffer_max\n") + size = sum([row[0] for row in data]) + maxx = sum([row[1] for row in data]) html.write("<tr><td class=left>Com. buf. max/total</td>" - "<td class=right>%d / %d</td></tr>" % (max, size)) + "<td class=right>%d / %d</td></tr>" % (maxx, size)) html.write("</table>\n") sidebar_snapins["performance"] = {