Mirrors/Munin-Contrib
1
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2025-09-19 09:03:20 +00:00
Code Issues Releases Wiki Activity

Merge pull request #575 from HeisSpiter/master

Browse source 
Fix a typo in IPv6 handling which was actually leading to totally ignore...
This commit is contained in:
Steve Schnepp 2015-02-03 13:15:29 +01:00
commit 0115be09d0
1 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/network/traffic_ipt
View file

@ -76,26 +76,22 @@ EOF
# Adapted from http://munin-monitoring.org/wiki/PercentGraphHowto # Adapted from http://munin-monitoring.org/wiki/PercentGraphHowto
cat << 'EOF' cat << 'EOF'
multigraph traffic_ipt_percent multigraph traffic_ipt_percent
update no
graph_category network
graph_args --base 1000 -l 0 -u 100 -r
graph_scale no graph_scale no
graph_title Throughput of IP protocols by percentage graph_title Throughput of IP protocols by percentage
graph_vlabel Percentage graph_vlabel Percentage
graph_order IPv4=traffic_ipt.IPv4 IPv6=traffic_ipt.IPv6 total=traffic_ipt.total IPv4_percent=traffic_ipt.total IPv6_percent=traffic_ipt.total total_percent=traffic_ipt.total graph_order IPv4=traffic_ipt.IPv4 IPv6=traffic_ipt.IPv6 total=traffic_ipt.total IPv4_percent=traffic_ipt.total IPv6_percent=traffic_ipt.total
graph_category network
graph_args --upper-limit 100 -l 0 -r
IPv4.label no
IPv6.label no
total.label no
total_percent.label no
IPv4.graph no IPv4.graph no
IPv6.graph no IPv6.graph no
total.graph no total.graph no
total_percent.graph no total.cdef IPv4,IPv6,0.00001,+,+
total_percent.cdef total,0.0000001,+ IPv4_percent.cdef IPv4,total,/,100,*
IPv4_percent.label IPv4 IPv4_percent.label IPv4
IPv4_percent.cdef IPv4,total_percent,/,100,*
IPv4_percent.draw AREASTACK IPv4_percent.draw AREASTACK
IPv6_percent.cdef IPv6,total,/,100,*
IPv6_percent.label IPv6 IPv6_percent.label IPv6
IPv6_percent.cdef IPv6,total_percent,/,100,*
IPv6_percent.draw AREASTACK IPv6_percent.draw AREASTACK
EOF EOF
exit 0 exit 0
@ -139,9 +135,9 @@ fi
if [ $ipv6 -ge $oldv6 ]; if [ $ipv6 -ge $oldv6 ];
then then
diffv4=$(($ipv6 - $oldv6)) diffv6=$(($ipv6 - $oldv6))
else else
diffv4=$ipv6 diffv6=$ipv6
fi fi
echo "IPv4=$ipv4" > $MUNIN_STATEFILE echo "IPv4=$ipv4" > $MUNIN_STATEFILE