Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

muninlite: correctly parse ifname with - char

Browse source 
Jonathan McCrohan: Squashed Fabio Capriati and Jo-Philipp Wich's patches.

Closes #701

Signed-off-by: Fabio Capriati <faxcpr@tiscali.it>
Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
This commit is contained in:
Fabio Capriati 2014-12-29 10:11:44 +01:00 committed by Jonathan McCrohan
parent 27bd80910a
commit edcad492e1
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
admin/muninlite/patches/220-modify-ifname-parser.patch Normal file
View file

@ -0,0 +1,20 @@
--- a/munin-node.in
+++ b/munin-node.in
@@ -141,7 +141,7 @@
fi
}
fetch_if() {
- IINFO=$(grep "$1:" /proc/net/dev | cut -d: -f2 | sed -e 's/ / /g')
+ IINFO=$(sed -ne "/^ *${1//_/-}: / { s/^.\+: \+//; s/[[:space:]]\+/ /gp }" /proc/net/dev)
echo "down.value" $(echo $IINFO | cut -d\ -f1)
echo "up.value" $(echo $IINFO | cut -d\ -f9)
}
@@ -162,7 +162,7 @@
echo "trans.warning 1"
}
fetch_if_err() {
- IINFO=$(grep "$1:" /proc/net/dev | cut -d: -f2 | sed -e 's/ / /g')
+ IINFO=$(sed -ne "/^ *${1//_/-}: / { s/^.\+: \+//; s/[[:space:]]\+/ /gp }" /proc/net/dev)
echo "rcvd.value" $(echo $IINFO | cut -d\ -f3)
echo "trans.value" $(echo $IINFO | cut -d\ -f11)
}