Module: check_mk
Branch: master
Commit: 5f6db1558a99ef3d42593595b1ccf8e2da480832
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f6db1558a99ef…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Mar 13 13:26:00 2013 +0100
resolve merge conflict
---
ChangeLog | 3 ++-
agents/check_mk_agent.linux | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f05e66e..3fc9973 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,7 +75,8 @@
* FIX: livecheck: fixed compilation bug
Checks & Agents:
- * FIX: jolokia_metrics.mem - now able to handle negative/missing heap values
+ * FIX: jolokia_metrics.mem - now able to handle negative/missing max values
+ * ADD: tcp_conn_stats: now additionally uses /proc/net/tcp6
Livestatus:
* FIX: possible crash with VERY long downtime comments
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index b5e10aa..a5ee2d8 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -209,7 +209,7 @@ fi
echo '<<<tcp_conn_stats>>>'
# waitmax 10 netstat -nt | awk ' /^tcp/ { c[$6]++; } END { for (x in c) { print x,
c[x]; } }'
# New implementation: netstat is very slow for large TCP tables
-awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }' <
/proc/net/tcp
+cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for (x
in c) { print x, c[x]; } }'
# Platten- und RAID-Status von LSI-Controlleren, falls vorhanden
if type cfggen > /dev/null ; then