|
 |
280324b |
diff -Nur munin-1.2.5.orig/node/node.d.linux/fw_conntrack.in munin-1.2.5/node/node.d.linux/fw_conntrack.in
|
|
|
280324b |
--- munin-1.2.5.orig/node/node.d.linux/fw_conntrack.in 2006-10-17 06:27:35.000000000 -0600
|
|
|
280324b |
+++ munin-1.2.5/node/node.d.linux/fw_conntrack.in 2007-11-30 21:54:22.000000000 -0700
|
|
|
280324b |
@@ -84,7 +84,7 @@
|
|
|
280324b |
exit 0
|
|
|
280324b |
;;
|
|
|
280324b |
autoconf)
|
|
|
280324b |
- if [ -f /proc/net/ip_conntrack ] ; then
|
|
|
280324b |
+ if [ -f /proc/net/ip_conntrack -o -f /proc/net/nf_conntrack ] ; then
|
|
|
280324b |
echo yes
|
|
|
280324b |
exit 0
|
|
|
280324b |
else
|
|
|
280324b |
@@ -102,7 +102,15 @@
|
|
|
280324b |
# udp 17 53 src=80.111.68.163 dst=62.179.100.29 sport=34153 dport=53 src=62.179.100.29 dst=80.111.68.163 sport=53 dport=34153 [ASSURED] use=1
|
|
|
280324b |
#
|
|
|
280324b |
|
|
|
280324b |
-cat /proc/net/ip_conntrack | awk '
|
|
|
280324b |
+if [ -f /proc/net/ip_conntrack ]; then
|
|
|
280324b |
+ conntrack_file=/proc/net/ip_conntrack
|
|
|
280324b |
+elif [ -f /proc/net/nf_conntrack ]; then
|
|
|
280324b |
+ conntrack_file=/proc/net/nf_conntrack
|
|
|
280324b |
+else
|
|
|
280324b |
+ exit 1
|
|
|
280324b |
+fi
|
|
|
280324b |
+
|
|
|
280324b |
+cat "$conntrack_file" | awk '
|
|
|
280324b |
BEGIN { STATE["ESTABLISHED"]=STATE["FIN_WAIT"]=STATE["TIME_WAIT"]=0;
|
|
|
280324b |
ASSURED=NOREPLY=NATED=STATE["SYN_SENT"]=STATE["UDP"]=0; }
|
|
|
280324b |
/^tcp/ { STATE[$4]++; }
|
|
|
280324b |
diff -Nur munin-1.2.5.orig/node/node.d.linux/fw_forwarded_local.in munin-1.2.5/node/node.d.linux/fw_forwarded_local.in
|
|
|
280324b |
--- munin-1.2.5.orig/node/node.d.linux/fw_forwarded_local.in 2006-10-17 06:27:35.000000000 -0600
|
|
|
280324b |
+++ munin-1.2.5/node/node.d.linux/fw_forwarded_local.in 2007-11-30 21:57:02.000000000 -0700
|
|
|
280324b |
@@ -36,10 +36,13 @@
|
|
|
280324b |
if ( cat /proc/net/ip_conntrack 2>/dev/null >/dev/null ); then
|
|
|
280324b |
echo yes
|
|
|
280324b |
exit 0
|
|
|
280324b |
+ elif ( cat /proc/net/nf_conntrack 2>/dev/null >/dev/null ); then
|
|
|
280324b |
+ echo yes
|
|
|
280324b |
+ exit 0
|
|
|
280324b |
else
|
|
|
280324b |
if [ $? -eq 127 ]
|
|
|
280324b |
then
|
|
|
280324b |
- echo "no (ipconntrack not found)"
|
|
|
280324b |
+ echo "no (ip_conntrack/nf_conntrack not found)"
|
|
|
280324b |
exit 1
|
|
|
280324b |
else
|
|
|
280324b |
echo no
|
|
|
280324b |
@@ -50,7 +53,7 @@
|
|
|
280324b |
|
|
|
280324b |
if [ "$1" = "config" ]; then
|
|
|
280324b |
|
|
|
280324b |
- echo 'graph_title ipconntrack'
|
|
|
280324b |
+ echo 'graph_title conntrack'
|
|
|
280324b |
echo 'graph_args -l 0 --base 1000'
|
|
|
280324b |
echo 'graph_vlabel established connections'
|
|
|
280324b |
echo 'graph_category network'
|
|
|
280324b |
@@ -63,4 +66,13 @@
|
|
|
280324b |
exit 0
|
|
|
280324b |
fi
|
|
|
280324b |
|
|
|
280324b |
-cat /proc/net/ip_conntrack | grep ESTABLISHED | sed 's/.*src=\(.*\) .*dst=\(.*\) sport.*src=\(.*\) .*dst=\(.*\) spo.*/\1 \2 \3 \4/g' | awk 'BEGIN {{FORW=0} {LOCAL=0}} {if($1 != $4){ FORW += 1} else { LOCAL += 1}} END {{print "forward.value "FORW} {print "local.value "LOCAL}}'
|
|
|
280324b |
+if [ -f /proc/net/ip_conntrack ]; then
|
|
|
280324b |
+ conntrack_file=/proc/net/ip_conntrack
|
|
|
280324b |
+elif [ -f /proc/net/nf_conntrack ]; then
|
|
|
280324b |
+ conntrack_file=/proc/net/nf_conntrack
|
|
|
280324b |
+else
|
|
|
280324b |
+ exit 1
|
|
|
280324b |
+fi
|
|
|
280324b |
+
|
|
|
280324b |
+cat "$conntrack_file" | grep ESTABLISHED | sed 's/.*src=\(.*\) .*dst=\(.*\) sport.*src=\(.*\) .*dst=\(.*\) spo.*/\1 \2 \3 \4/g' | awk 'BEGIN {{FORW=0} {LOCAL=0}} {if($1 != $4){ FORW += 1} else { LOCAL += 1}} END {{print "forward.value "FORW} {print "local.value "LOCAL}}'
|
|
|
280324b |
+
|