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" : """
Module: check_mk
Branch: master
Commit: d1737ae555fe9e6ddcc948686f349443166f51c1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1737ae555fe9e…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Oct 14 00:19:58 2013 +0200
Updated bug entries #0889
---
.bugs/889 | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/.bugs/889 b/.bugs/889
index e8d43d6..1d627f9 100644
--- a/.bugs/889
+++ b/.bugs/889
@@ -1,6 +1,6 @@
Title: unify CPU load checks, avoid incompatible check parameters
Component: checks
-State: open
+State: done
Date: 2013-03-25 11:23:06
Targetversion: 1.4.0
Class: bug
@@ -8,3 +8,9 @@ Class: bug
Several checks are in the group "cpu_load". All these checks need to
support predecitve levels by using get_levels(). Resolution: work with
an include file that does the actual checking.
+
+2013-10-13 23:48:43: changed state open -> done
+All three CPU load checks now use a new include file.
+
+2013-10-14 00:19:48: changed state done -> done
+Found yet more of those and fixed them.
Module: check_mk
Branch: master
Commit: 8e23bcae3ad5c367291827c75c042b109d3f6231
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e23bcae3ad5c3…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Oct 13 21:48:07 2013 +0200
Updated bug entries #0902
---
.bugs/902 | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/.bugs/902 b/.bugs/902
index 6947328..f607ed2 100644
--- a/.bugs/902
+++ b/.bugs/902
@@ -1,9 +1,9 @@
Title: Problem with check_mk notify in manually setup check_mk
Component: core
-State: open
+Class: bug
+State: done
Date: 2013-03-01 12:42:36
Targetversion: 1.2.3i2
-Class: bug
When enable "Debug notifications" from wato (Global settings/Noificatoins)
no notification email are sent, and no debug info is written.
@@ -22,3 +22,7 @@ directory needs to be created in setup.sh
2013-09-23 bs: should be fixed, added creation of directory to setup.sh
but TEST IS STILL OPEN, needs to wait for 1055 to be fixed
+
+2013-10-13 21:48:05: changed state open -> done
+We assume that it is fixed. Just the fix was not ported
+to the master branch! I've done that now.
Module: check_mk
Branch: master
Commit: 207e68c8723336349e309c8f9fcf10cf6f5251bb
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=207e68c8723336…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Oct 13 22:19:00 2013 +0200
Updated bug entries #0829
---
.bugs/829 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/829 b/.bugs/829
index ee785b3..1b23478 100644
--- a/.bugs/829
+++ b/.bugs/829
@@ -1,10 +1,13 @@
Title: Diskstat latency at many times on 1.0ms
Component: checks
-State: open
+Class: bug
+State: done
Date: 2013-08-20 12:48:52
Targetversion: future
-Class: bug
The graph for diskstat latency show on many times a latency from 1.0ms. But this is the wrong value.
Compared to the ios graph, it seems possible that 1.0ms really is 0ms.
There is a screenshot in owncloud://Technik/BUGs
+
+2013-10-13 22:18:58: changed state open -> done
+Removed latency computation for Linux diskstat. It was ever incorrect.