Module: check_mk
Branch: master
Commit: 17648383cce742d41d16067f27ec9edd061e28ea
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17648383cce742…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Tue Feb 4 10:08:54 2014 +0100
FIX winperf_msx_queues: Support output of Exchange 2013
Exchange2013 supports multiple priorities of queues and therefore outputs
more than one counter. The check can now handle this.
---
.werks/688 | 10 ++++++++++
ChangeLog | 1 +
checks/winperf_msx_queues | 10 +++++++++-
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/.werks/688 b/.werks/688
new file mode 100644
index 0000000..b252e9a
--- /dev/null
+++ b/.werks/688
@@ -0,0 +1,10 @@
+Title: winperf_msx_queues: Support output of Exchange 2013
+Level: 1
+Component: checks
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1391504873
+
+Exchange2013 supports multiple priorities of queues and therefore outputs
+more than one counter. The check can now handle this.
diff --git a/ChangeLog b/ChangeLog
index 13e051b..354348d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -153,6 +153,7 @@
* 0575 FIX: cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin,
cmciii_lcp_waterout: improved handling of warning state...
* 0272 FIX: if checks: port type 56 (fibrechannel) is no longer inventorized per
default...
* 0577 FIX: fileinfo.groups: new date pattern is now available for inventory check as
well
+ * 0688 FIX: winperf_msx_queues: Support output of Exchange 2013...
Multisite:
* 0371 Added log class filter to hostsvcevents view
diff --git a/checks/winperf_msx_queues b/checks/winperf_msx_queues
index 029710f..2f3129d 100644
--- a/checks/winperf_msx_queues
+++ b/checks/winperf_msx_queues
@@ -45,6 +45,14 @@
# 10362 0 rawcount
# 10364 811 rawcount
+# Example output from a Exchange 2013 server:
+# <<<winperf_msx_queues>>>
+# 1385554029.05 12048
+# 4 instances: niedrige_priorität normale_priorität hohe_priorität _total
+# 2 0 0 0 0 rawcount
+# 4 0 0 0 0 rawcount
+# 6 0 0 0 0 rawcount
+
# Default warn/crit levels for length of queues
msx_queues_default_levels = (500, 2000)
@@ -68,7 +76,7 @@ def check_winperf_msx_queues(item, params, info):
for line in info[2:]:
if line[0] == winperf_msx_queues.get(item):
- length = int(line[1])
+ length = int(line[-2])
warn, crit = params
perfdata = [("length", length, warn, crit)]
infotext = "%d entries" % length