Projet

Général

Profil

Révision c9157be3

IDc9157be3fe0bdcc3fb54855056e1cebe94e4dcd5
Parent 0b07e636
Enfant 0d775b28, 2078cab6, 863d326b

Ajouté par Lars Kruse il y a presque 8 ans

iptables-related plugins: use "-w" for consistent results

The parameter "-w" forces iptables to wait for a lock before
printing data.

The parameter requires iptables 1.6 (released 2015).

See https://github.com/munin-monitoring/munin/issues/586

Voir les différences:

plugins/accounting/accounting_
115 115 

  		




  116
  116
  
    
if [ "$1" == "autoconf" ]; then


  		




  117
  117
  
    
	if [ -r /proc/net/dev ]; then


  		




  118
  
  
    
		$IPTABLES -L INPUT -v -n -x >/dev/null 2>/dev/null


  		




  
  118
  
    
		$IPTABLES -L INPUT -v -n -x -w >/dev/null 2>/dev/null


  		




  119
  119
  
    
			if [ $? -gt 0 ]; then


  		




  120
  120
  
    
				echo "no (could not run iptables as user `whoami`)"


  		




  121
  121
  
    
				exit 1


  		




  ......




  132
  132
  
    
if [ "$1" = "suggest" ]; then


  		




  133
  133
  
    

  		




  134
  134
  
    
	if [ $PROTO = "ipv4" ]; then


  		




  135
  
  
    
	  $IPTABLES -L INPUT -v -x -n 2>/dev/null | sed -n 's/^.*\/\* ACCT\-\([a-zA-Z\-]*\) \*\/.*$/\ipv4_\1/p'


  		




  136
  
  
    
  	$IPTABLES -L OUTPUT -v -x -n 2>/dev/null | sed -n 's/^.*\/\* ACCT\-\([a-zA-Z\-]*\) \*\/.*$/\ipv4_\1/p'


  		




  
  135
  
    
	  $IPTABLES -L INPUT -v -x -n -w 2>/dev/null | sed -n 's/^.*\/\* ACCT\-\([a-zA-Z\-]*\) \*\/.*$/\ipv4_\1/p'


  		




  
  136
  
    
	  $IPTABLES -L OUTPUT -v -x -n -w 2>/dev/null | sed -n 's/^.*\/\* ACCT\-\([a-zA-Z\-]*\) \*\/.*$/\ipv4_\1/p'


  		




  137
  137
  
    
	elif [ $PROTO == "ipv6" ]; then


  		




  138
  
  
    
	  $IPTABLES -L INPUT -v -x -n 2>/dev/null | sed -n 's/^.*\/\* ACCT\-\([a-zA-Z\-]*\) \*\/.*$/\ipv6_\1/p'


  		




  139
  
  
    
	  $IPTABLES -L OUTPUT -v -x -n 2>/dev/null | sed -n 's/^.*\/\* ACCT\-\([a-zA-Z\-]*\) \*\/.*$/\ipv6_\1/p'


  		




  
  138
  
    
	  $IPTABLES -L INPUT -v -x -n -w 2>/dev/null | sed -n 's/^.*\/\* ACCT\-\([a-zA-Z\-]*\) \*\/.*$/\ipv6_\1/p'


  		




  
  139
  
    
	  $IPTABLES -L OUTPUT -v -x -n -w 2>/dev/null | sed -n 's/^.*\/\* ACCT\-\([a-zA-Z\-]*\) \*\/.*$/\ipv6_\1/p'


  		




  140
  140
  
    
	fi


  		




  141
  141
  
    

  		




  142
  142
  
    
	exit 0


  		




  ......




  192
  192
  
    
fi;


  		




  193
  193
  
    

  		




  194
  194
  
    
echo 'multigraph '${0##*/}'_in'


  		




  195
  
  
    
$IPTABLES -L INPUT -v -n -x | grep  "\/\* ACCT\-"$SUBCHAIN"\-tcp\-in \*\/" | tr -s '*' '-' | awk "{ print \"tcpIN.value \" \$2 }"


  		




  196
  
  
    
$IPTABLES -L INPUT -v -n -x | grep  "\/\* ACCT\-"$SUBCHAIN"\-udp\-in \*\/" | tr -s '*' '-' | awk "{ print \"udpIN.value \" \$2 }"


  		




  197
  
  
    
$IPTABLES -L INPUT -v -n -x | grep  "\/\* ACCT\-"$SUBCHAIN"\-icmp\-in \*\/" | tr -s '*' '-' | awk "{ print \"icmpIN.value \" \$2 }"


  		




  
  195
  
    
$IPTABLES -L INPUT -v -n -x -w | grep  "\/\* ACCT\-"$SUBCHAIN"\-tcp\-in \*\/" | tr -s '*' '-' | awk "{ print \"tcpIN.value \" \$2 }"


  		




  
  196
  
    
$IPTABLES -L INPUT -v -n -x -w | grep  "\/\* ACCT\-"$SUBCHAIN"\-udp\-in \*\/" | tr -s '*' '-' | awk "{ print \"udpIN.value \" \$2 }"


  		




  
  197
  
    
$IPTABLES -L INPUT -v -n -x -w | grep  "\/\* ACCT\-"$SUBCHAIN"\-icmp\-in \*\/" | tr -s '*' '-' | awk "{ print \"icmpIN.value \" \$2 }"


  		




  198
  198
  
    
echo


  		




  199
  199
  
    
echo 'multigraph '${0##*/}'_out'


  		




  200
  
  
    
$IPTABLES -L OUTPUT -v -n -x | grep  "\/\* ACCT\-"$SUBCHAIN"\-tcp\-out \*\/" | tr -s '*' '-' | awk "{ print \"tcpOUT.value \" \$2 }"


  		




  201
  
  
    
$IPTABLES -L OUTPUT -v -n -x | grep  "\/\* ACCT\-"$SUBCHAIN"\-udp\-out \*\/" | tr -s '*' '-' | awk "{ print \"udpOUT.value \" \$2 }"


  		




  202
  
  
    
$IPTABLES -L OUTPUT -v -n -x | grep  "\/\* ACCT\-"$SUBCHAIN"\-icmp\-out \*\/" | tr -s '*' '-' | awk "{ print \"icmpOUT.value \" \$2 }"


  		




  
  200
  
    
$IPTABLES -L OUTPUT -v -n -x -w | grep  "\/\* ACCT\-"$SUBCHAIN"\-tcp\-out \*\/" | tr -s '*' '-' | awk "{ print \"tcpOUT.value \" \$2 }"


  		




  
  201
  
    
$IPTABLES -L OUTPUT -v -n -x -w | grep  "\/\* ACCT\-"$SUBCHAIN"\-udp\-out \*\/" | tr -s '*' '-' | awk "{ print \"udpOUT.value \" \$2 }"


  		




  
  202
  
    
$IPTABLES -L OUTPUT -v -n -x -w | grep  "\/\* ACCT\-"$SUBCHAIN"\-icmp\-out \*\/" | tr -s '*' '-' | awk "{ print \"icmpOUT.value \" \$2 }"


  		




  203
  203
  
    

  		












Formats disponibles :  Unified diff