Project

General

Profile

« Previous | Next » 

Revision a555cc58

Added by Seth Mos about 14 years ago

Fix my traffic graphs

View differences:

etc/inc/rrd.inc
253 253 
		/* db update script */
254 254 
		$rrdupdatesh = "#!/bin/sh\n";
255 255 
		$rrdupdatesh .= "\n";
256 
		$rrdupdatesh .= "export TERM=serial\n";
256 
		$rrdupdatesh .= "export TERM=dumb\n";
257 257 
		$rrdupdatesh .= "counter=1\n";
258 258 
		$rrdupdatesh .= "while [ \"\$counter\" -ne 0 ]\n";
259 259 
		$rrdupdatesh .= "do\n";
......
304 304 

  		




  305
  305
  
    
			$rrdupdatesh .= "\n";


  		




  306
  306
  
    
			$rrdupdatesh .= "# polling traffic for interface $ifname $realif IPv4/IPv6 counters \n";


  		




  307
  
  
    
			$rrdupdatesh .= "TMPFILE=`mktemp -q /tmp/STATS_{$realif}.XXXXXX` \n";


  		




  308
  
  
    
			$rrdupdatesh .= "$pfctl -vvsI -i {$realif} > \$TMPFILE \n";


  		




  309
  
  
    
			$rrdupdatesh .= "unset BYTES4P BYTES4B BYTES6P BYTES6B \n";


  		




  310
  
  
    
			$rrdupdatesh .= "BYTES4P=`cat \$TMPFILE | awk '/In4\/Pass|Out4\/Pass/ {printf \$6 \":\"}'`\n";


  		




  311
  
  
    
			$rrdupdatesh .= "BYTES4B=`cat \$TMPFILE | awk '/In4\/Block|Out4\/Block/ {printf \$6 \":\"}'`\n";


  		




  312
  
  
    
			$rrdupdatesh .= "BYTES6P=`cat \$TMPFILE | awk '/In6\/Pass|Out6\/Pass/ {printf \$6 \":\"}'`\n";


  		




  313
  
  
    
			$rrdupdatesh .= "BYTES6B=`cat \$TMPFILE | awk '/In6\/Block|Out6\/Block/ {printf \$6 \":\"}'|sed -e 's/.\$//'`\n";


  		




  314
  
  
    
			$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$traffic N:\$BYTES4P\$BYTES4B\$BYTES6P\$BYTES6B\n";


  		




  
  307
  
    
			$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$traffic N:";


  		




  
  308
  
    
			$rrdupdatesh .= "`$pfctl -vvsI -i {$realif} | awk '\\\n";


  		




  
  309
  
    
			$rrdupdatesh .= "/In4\/Pass/ { b4pi = \$6 };/Out4\/Pass/ { b4po = \$6 };/In4\/Block/ { b4bi = \$6 };/Out4\/Block/ { b4bo = \$6 };\\\n";


  		




  
  310
  
    
			$rrdupdatesh .= "/In6\/Pass/ { b6pi = \$6 };/Out6\/Pass/ { b6po = \$6 };/In6\/Block/ { b6bi = \$6 };/Out6\/Block/ { b6bo = \$6 };\\\n";


  		




  
  311
  
    
			$rrdupdatesh .= "END {print b4pi \":\" b4po \":\" b4bi \":\" b4bo \":\" b6pi \":\" b6po \":\" b6bi \":\" b6bo};'`\n";


  		




  315
  312
  
    

  		




  316
  313
  
    
			/* PACKETS, set up the rrd file */


  		




  317
  314
  
    
			if (!file_exists("$rrddbpath$ifname$packets")) {


  		




  ......




  339
  336
  
    

  		




  340
  337
  
    
			$rrdupdatesh .= "\n";


  		




  341
  338
  
    
			$rrdupdatesh .= "# polling packets for interface $ifname $realif \n";


  		




  342
  
  
    
			$rrdupdatesh .= "TMPFILE=`mktemp -q /tmp/STATS_{$realif}.XXXXXX` \n";


  		




  343
  
  
    
			$rrdupdatesh .= "$pfctl -vvsI -i {$realif} > \$TMPFILE \n";


  		




  344
  
  
    
			$rrdupdatesh .= "unset PACKETS4P PACKETS4B PACKETS6P PACKETS6B \n";


  		




  345
  
  
    
			$rrdupdatesh .= "PACKETS4P=`cat \$TMPFILE | awk '/In4\/Pass|Out4\/Pass/ {printf \$4 \":\"}'`\n";


  		




  346
  
  
    
			$rrdupdatesh .= "PACKETS4B=`cat \$TMPFILE | awk '/In4\/Block|Out4\/Block/ {printf \$4 \":\"}'`\n";


  		




  347
  
  
    
			$rrdupdatesh .= "PACKETS6P=`cat \$TMPFILE | awk '/In6\/Pass|Out6\/Pass/ {printf \$4 \":\"}'`\n";


  		




  348
  
  
    
			$rrdupdatesh .= "PACKETS6B=`cat \$TMPFILE | awk '/In6\/Block|Out6\/Block/ {printf \$4 \":\"}'|sed -e 's/.\$//'`\n";


  		




  349
  
  
    
			$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$traffic N:\$PACKETS4P\$PACKETS4B\$PACKETS6P\$PACKETS6B\n";


  		




  
  339
  
    
			$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$packets N:";


  		




  
  340
  
    
			$rrdupdatesh .= "`$pfctl -vvsI -i {$realif} | awk '\\\n";


  		




  
  341
  
    
			$rrdupdatesh .= "/In4\/Pass/ { b4pi = \$4 };/Out4\/Pass/ { b4po = \$4 };/In4\/Block/ { b4bi = \$4 };/Out4\/Block/ { b4bo = \$4 };\\\n";


  		




  
  342
  
    
			$rrdupdatesh .= "/In6\/Pass/ { b6pi = \$4 };/Out6\/Pass/ { b6po = \$4 };/In6\/Block/ { b6bi = \$4 };/Out6\/Block/ { b6bo = \$4 };\\\n";


  		




  
  343
  
    
			$rrdupdatesh .= "END {print b4pi \":\" b4po \":\" b4bi \":\" b4bo \":\" b6pi \":\" b6po \":\" b6bi \":\" b6bo};'`\n";


  		




  350
  344
  
    

  		




  351
  345
  
    
			/* WIRELESS, set up the rrd file */


  		




  352
  346
  
    
			if($config['interfaces'][$ifname]['wireless']['mode'] == "bss") {


  		












Also available in:  Unified diff