Module: check_mk
Branch: master
Commit: 516470251b18d474c0fd13bcf0dc88bfe13a1bf2
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=516470251b18d4…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Aug 28 15:01:36 2014 +0200
#1149 FIX check_mk-ibm_svc_systemstats.diskio, check_mk-ibm_svc_systemstats.iops: fix
exception in Perf-O-Meter
---
.werks/1149 | 9 +++++++++
ChangeLog | 1 +
web/plugins/perfometer/check_mk.py | 12 ++++++------
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/.werks/1149 b/.werks/1149
new file mode 100644
index 0000000..210b9fc
--- /dev/null
+++ b/.werks/1149
@@ -0,0 +1,9 @@
+Title: check_mk-ibm_svc_systemstats.diskio, check_mk-ibm_svc_systemstats.iops: fix
exception in Perf-O-Meter
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i6
+Date: 1409230838
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 06ba20f..5843001 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,7 @@
* 0650 FIX: f5_bigip_pool: limits to the number of active nodes are now correctly
applied...
NOTE: Please refer to the migration notes!
* 1102 FIX: esx_vsphere_counters: no longer raise false alarms because of invalid
data from ESX Host...
+ * 1149 FIX: check_mk-ibm_svc_systemstats.diskio, check_mk-ibm_svc_systemstats.iops:
fix exception in Perf-O-Meter
Multisite:
* 1066 Implemented Dashboard Designer...
diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py
index 53b1455..703eb2d 100644
--- a/web/plugins/perfometer/check_mk.py
+++ b/web/plugins/perfometer/check_mk.py
@@ -646,9 +646,9 @@ perfometers["check_mk-ibm_svc_nodestats.diskio"] =
perfometer_check_mk_diskstat
perfometers["check_mk-ibm_svc_systemstats.diskio"] =
perfometer_check_mk_diskstat
def perfometer_check_mk_iops_r_w(row, check_command, perf_data):
- iops_r = int(perf_data[0][1])
- iops_w = int(perf_data[1][1])
- text = "%d IO/s %s IO/s" % (iops_r, iops_w)
+ iops_r = float(perf_data[0][1])
+ iops_w = float(perf_data[1][1])
+ text = "%.0f IO/s %.0f IO/s" % (iops_r, iops_w)
return text, perfometer_logarithmic_dual(
iops_r, "#60e0a0", iops_w, "#60a0e0", 100000, 10)
@@ -656,9 +656,9 @@ perfometers["check_mk-ibm_svc_nodestats.iops"] =
perfometer_check_mk_iops_r_w
perfometers["check_mk-ibm_svc_systemstats.iops"] =
perfometer_check_mk_iops_r_w
def perfometer_check_mk_disk_latency_r_w(row, check_command, perf_data):
- latency_r = int(perf_data[0][1])
- latency_w = int(perf_data[1][1])
- text = "%d ms %s ms" % (latency_r, latency_w)
+ latency_r = float(perf_data[0][1])
+ latency_w = float(perf_data[1][1])
+ text = "%.1f ms %.1f ms" % (latency_r, latency_w)
return text, perfometer_logarithmic_dual(
latency_r, "#60e0a0", latency_w, "#60a0e0", 20, 10)