muninlite_fix-unused-up_interface.diff
· 2.4 KiB · Diff
Originalformat
--- /opt/sbin/munin-node.orig 2013-01-27 15:13:51.869007214 +0100
+++ /opt/sbin/munin-node 2013-01-27 16:11:20.536006950 +0100
@@ -133,7 +133,7 @@
if [ -n "$(which ethtool)" ]; then
if [ -x "$(which ethtool)" ]; then
if ethtool $1 | grep -q Speed; then
- MAX=$(($(ethtool $1 | grep Speed | sed -e 's/[[:space:]]\{1,\}/ /g' -e 's/^ //' -e 's/M.*//' | cut -d\ -f2) * 1000000))
+ MAX=$(($(ethtool $1 | grep Speed | sed -e 's/[[:space:]]\{1,\}/ /g' -e 's/^ //' -e 's/M.*//' | sed -e 's/Unknown\!/0/' | cut -d\ -f2) * 1000000))
echo "up.max $MAX"
echo "down.max $MAX"
fi
@@ -535,19 +535,31 @@
for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g
s/\-/_/g');
do
- INTERRES=$(echo $INTER | sed 's/\./VLAN/')
- RES="$RES if_$INTERRES"
- eval "fetch_if_${INTERRES}() { fetch_if $INTER $@; };"
- eval "config_if_${INTERRES}() { config_if $INTER $@; };"
+ if [ -n "$(which ethtool)" ]; then
+ if [ -x "$(which ethtool)" ]; then
+ if [ -n "$(ethtool $INTER | grep 'Link detected: yes')" ]; then
+ INTERRES=$(echo $INTER | sed 's/\./VLAN/')
+ RES="$RES if_$INTERRES"
+ eval "fetch_if_${INTERRES}() { fetch_if $INTER $@; };"
+ eval "config_if_${INTERRES}() { config_if $INTER $@; };"
+ fi
+ fi
+ fi
done
elif [ "$PLUG" = "if_err_" ]; then
for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g
s/\-/_/g');
do
- INTERRES=$(echo $INTER | sed 's/\./VLAN/')
- RES="$RES if_err_$INTERRES"
- eval "fetch_if_err_${INTERRES}() { fetch_if_err $INTER $@; };"
- eval "config_if_err_${INTERRES}() { config_if_err $INTER $@; };"
+ if [ -n "$(which ethtool)" ]; then
+ if [ -x "$(which ethtool)" ]; then
+ if [ -n "$(ethtool $INTER | grep 'Link detected: yes')" ]; then
+ INTERRES=$(echo $INTER | sed 's/\./VLAN/')
+ RES="$RES if_err_$INTERRES"
+ eval "fetch_if_err_${INTERRES}() { fetch_if_err $INTER $@; };"
+ eval "config_if_err_${INTERRES}() { config_if_err $INTER $@; };"
+ fi
+ fi
+ fi
done
elif [ "$PLUG" = "netstat" ]; then
if netstat -s >/dev/null 2>&1; then
| 1 | --- /opt/sbin/munin-node.orig 2013-01-27 15:13:51.869007214 +0100 |
| 2 | +++ /opt/sbin/munin-node 2013-01-27 16:11:20.536006950 +0100 |
| 3 | @@ -133,7 +133,7 @@ |
| 4 | if [ -n "$(which ethtool)" ]; then |
| 5 | if [ -x "$(which ethtool)" ]; then |
| 6 | if ethtool $1 | grep -q Speed; then |
| 7 | - MAX=$(($(ethtool $1 | grep Speed | sed -e 's/[[:space:]]\{1,\}/ /g' -e 's/^ //' -e 's/M.*//' | cut -d\ -f2) * 1000000)) |
| 8 | + MAX=$(($(ethtool $1 | grep Speed | sed -e 's/[[:space:]]\{1,\}/ /g' -e 's/^ //' -e 's/M.*//' | sed -e 's/Unknown\!/0/' | cut -d\ -f2) * 1000000)) |
| 9 | echo "up.max $MAX" |
| 10 | echo "down.max $MAX" |
| 11 | fi |
| 12 | @@ -535,19 +535,31 @@ |
| 13 | for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g |
| 14 | s/\-/_/g'); |
| 15 | do |
| 16 | - INTERRES=$(echo $INTER | sed 's/\./VLAN/') |
| 17 | - RES="$RES if_$INTERRES" |
| 18 | - eval "fetch_if_${INTERRES}() { fetch_if $INTER $@; };" |
| 19 | - eval "config_if_${INTERRES}() { config_if $INTER $@; };" |
| 20 | + if [ -n "$(which ethtool)" ]; then |
| 21 | + if [ -x "$(which ethtool)" ]; then |
| 22 | + if [ -n "$(ethtool $INTER | grep 'Link detected: yes')" ]; then |
| 23 | + INTERRES=$(echo $INTER | sed 's/\./VLAN/') |
| 24 | + RES="$RES if_$INTERRES" |
| 25 | + eval "fetch_if_${INTERRES}() { fetch_if $INTER $@; };" |
| 26 | + eval "config_if_${INTERRES}() { config_if $INTER $@; };" |
| 27 | + fi |
| 28 | + fi |
| 29 | + fi |
| 30 | done |
| 31 | elif [ "$PLUG" = "if_err_" ]; then |
| 32 | for INTER in $(grep '^ *\(ppp\|eth\|wlan\|ath\|ra\|ipsec\|tap\|br-\)\([^:]\)\{1,\}:' /proc/net/dev | cut -f1 -d: | sed 's/ //g |
| 33 | s/\-/_/g'); |
| 34 | do |
| 35 | - INTERRES=$(echo $INTER | sed 's/\./VLAN/') |
| 36 | - RES="$RES if_err_$INTERRES" |
| 37 | - eval "fetch_if_err_${INTERRES}() { fetch_if_err $INTER $@; };" |
| 38 | - eval "config_if_err_${INTERRES}() { config_if_err $INTER $@; };" |
| 39 | + if [ -n "$(which ethtool)" ]; then |
| 40 | + if [ -x "$(which ethtool)" ]; then |
| 41 | + if [ -n "$(ethtool $INTER | grep 'Link detected: yes')" ]; then |
| 42 | + INTERRES=$(echo $INTER | sed 's/\./VLAN/') |
| 43 | + RES="$RES if_err_$INTERRES" |
| 44 | + eval "fetch_if_err_${INTERRES}() { fetch_if_err $INTER $@; };" |
| 45 | + eval "config_if_err_${INTERRES}() { config_if_err $INTER $@; };" |
| 46 | + fi |
| 47 | + fi |
| 48 | + fi |
| 49 | done |
| 50 | elif [ "$PLUG" = "netstat" ]; then |
| 51 | if netstat -s >/dev/null 2>&1; then |