Module: check_mk
Branch: master
Commit: 828cda62b449f2c048ffa13083954c8685e32e93
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=828cda62b449f2…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Apr 29 18:08:04 2013 +0200
Linux agent: remove obsolete old <<<netif>>> and
<<<netctr>>> sections
---
ChangeLog | 1 +
agents/check_mk_agent.linux | 17 -----------------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9c031fb..d260bdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,6 +78,7 @@
* windows agent: new config section plugins, now able to set timeouts for specific
plugins
new global config option: timeout_plugins_total
* lnx_if in Linux agent: force deterministical order of network devices
+ * Linux agent: remove obsolete old <<<netif>>> and
<<<netctr>>> sections
Notifications:
* notify.py: unique spoolfiles name no longer created with uuid
diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux
index dc137a1..86fc62e 100755
--- a/agents/check_mk_agent.linux
+++ b/agents/check_mk_agent.linux
@@ -158,16 +158,6 @@ echo "$(cat /proc/loadavg) $(grep -E '^CPU|^processor'
< /proc/cpuinfo | wc -l)"
echo '<<<uptime>>>'
cat /proc/uptime
-# Network interfaces (Link, Autoneg, Speed)
-# This requires ethtool
-if type ethtool > /dev/null
-then
- echo '<<<netif>>>'
- for eth in $(cat /proc/net/dev | sed -rn -e 's/[[:space:]]*//g' -e '/
*([^:]):.*/s//\1/p' | egrep -vx '(lo|sit.*)')
- do
- echo $eth $(ethtool $eth | egrep '(Speed|Duplex|Link
detected|Auto-negotiation):' | cut -d: -f2 | sed 's/ *//g')
- done
-fi
# New variant: Information about speed and state in one section
echo '<<<lnx_if:sep(58)>>>'
@@ -239,13 +229,6 @@ echo '<<<kernel>>>'
date +%s
cat /proc/vmstat /proc/stat
-# Statistik der Netzwerkgeraete (Pakete, Kollisionen, etc)
-echo '<<<netctr>>>'
-# Genauen Zeitstempel einfuegen, da Counter von Zeit abhaengen
-date +%s
-sed -e 1,2d -e 's/:/ /g' < /proc/net/dev
-
-
# Hardware sensors via IPMI (need ipmitool)
if type ipmitool > /dev/null
then