Module: check_mk
Branch: master
Commit: 76c4238bf41fec448d87bb48d17e01a937b58121
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76c4238bf41fec…
Author: Bastian Kuhn <bk(a)mathias-kettner.de>
Date: Thu Dec 17 12:57:39 2015 +0100
#1600 check_mk_agent.linux: Diskstat Sektion now supports s390 DASDs (zLinux on IBM
Mainframes)
---
.werks/1600 | 9 +++++++++
ChangeLog | 1 +
agents/check_mk_agent.linux | 2 +-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.werks/1600 b/.werks/1600
new file mode 100644
index 0000000..deb10df
--- /dev/null
+++ b/.werks/1600
@@ -0,0 +1,9 @@
+Title: check_mk_agent.linux: Diskstat Sektion now supports s390 DASDs (zLinux on IBM
Mainframes)
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.7i4
+Date: 1450353376
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index 890a41f..e779401 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,7 @@
* 2870 dotnet_clrmemory, wmi_cpuload, wmi_webservices, msexch_activesync,
msexch_autodiscovery, msexch_availability, msexch_isstore, msexch_owa,
msexch_rpcclientaccess: a whole slew of new checks relating to monitoring MS Exchange...
* 2816 check_mail_loop: now supports STARTTLS for IMAP authentification
* 2817 cmc_temp: New temperature check for Rittal devices using the CMC MIB
+ * 1600 check_mk_agent.linux: Diskstat Sektion now supports s390 DASDs (zLinux on IBM
Mainframes)
* 2660 FIX: fixed windows agent using the wrong working directory...
* 2664 FIX: ps: Speedup in situation with many matching processes...
* 2661 FIX: windows agent: fixed incomplete process list...
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index 20e0b86..b6f07e3 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -333,7 +333,7 @@ fi
# Performancecounter Platten
echo '<<<diskstat>>>'
date +%s
-egrep '
(x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*) ' <
/proc/diskstats
+egrep '
(x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*|mmcblk.*|dasd[a-z]*)
' < /proc/diskstats
if type dmsetup >/dev/null ; then
echo '[dmsetup_info]'
dmsetup info -c --noheadings --separator ' ' -o name,devno,vg_name,lv_name