[checkmk-commits] Check_MK Git: check_mk: Speed-O-Meter: now measure only service checks.

Module: check_mk Branch: master Commit: 1160d132e254f076a0afb6157b3fa9ad76690f4d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1160d132e254f0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Oct 13 18:44:35 2013 +0200 Speed-O-Meter: now measure only service checks. --- ChangeLog | 5 +++++ web/htdocs/sidebar.py | 17 ++++++----------- web/plugins/sidebar/shipped.py | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 521484e..7d15bf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ 1.2.3i5: + Multisite: + * Speed-O-Meter: now measure only service checks. Host checks + are omitted, since they do not really matter and make the + results less useful when using CMC. + WATO: * You can now have site-specific global settings when using distributed WATO (available in the "Distributed Monitoring") diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index e8eece5..e134dc9 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -440,9 +440,9 @@ def ajax_speedometer(): # Get the current rates and the program start time. If there # are more than one site, we simply add the start times. data = html.live.query_summed_stats("GET status\n" - "Columns: service_checks_rate host_checks_rate program_start") - current_rate = data[0] + data[1] - program_start = data[2] + "Columns: service_checks_rate program_start") + current_rate = data[0] + program_start = data[1] # Recompute the scheduled_rate only if it is not known (first call) # or if one of the sites has been restarted. The computed value cannot @@ -451,16 +451,11 @@ def ajax_speedometer(): # scheduled checks rate needs to loop over all hosts and services. if last_program_start != program_start: - # 1. First compute number of expected host checks per second - scheduled_rate = html.live.query_summed_stats( - "GET hosts\n" - "Stats: suminv check_interval\n")[0] / 60.0 - - # 2. Now get data of all active services and of passive/non-check_mk-services. + # 1. Get data of all active services and of passive/non-check_mk-services. # For passive services we assume that they are scheduled with the rate the # is configured via "check_interval". Nagios does not use this setting for i # passive checks, but we have no other option. - scheduled_rate += html.live.query_summed_stats( + scheduled_rate = html.live.query_summed_stats( "GET services\n" "Stats: suminv check_interval\n" "Filter: active_checks_enabled = 1\n" @@ -490,7 +485,7 @@ def ajax_speedometer(): scheduled_rate += float(num_services) / check_interval / 60.0 percentage = 100.0 * current_rate / scheduled_rate; - title = _("Scheduled check rate: %.1f/s, current rate: %.1f/s, that is " + title = _("Scheduled service check rate: %.1f/s, current rate: %.1f/s, that is " "%.0f%% of the scheduled rate" % (scheduled_rate, current_rate, percentage)) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 26adfc6..63287be 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -743,11 +743,11 @@ speedometer_show_speed(0, 0, 0); sidebar_snapins["speedometer"] = { - "title" : _("Speed-O-Meter"), - "description" : _("A gadget that shows your current check rate in relation to " + "title" : _("Service Speed-O-Meter"), + "description" : _("A gadget that shows your current service check rate in relation to " "the scheduled check rate. If the Speed-O-Meter shows a speed " - "of 100 percent, then all checks are being executed in exactly " - "the rate that is configured (via check_interval)"), + "of 100 percent, all service checks are being executed in exactly " + "the rate that is desired."), "render" : render_speedometer, "allowed" : [ "admin", ], "styles" : """