Project

General

Profile

« Previous | Next » 

Revision ae9cb658

Added by Jim Pingle almost 12 years ago

Add an RRD graph for MBUFs under system. Tweaks welcome.

View differences:

etc/inc/rrd.inc
216 216
	$spamd = "-spamd.rrd";
217 217
	$proc = "-processor.rrd";
218 218
	$mem = "-memory.rrd";
219
	$mbuf = "-mbuf.rrd";
219 220
	$cellular = "-cellular.rrd";
220 221
	$vpnusers = "-vpnusers.rrd";
221 222
	$captiveportalconcurrent = "-concurrent.rrd";
......
243 244
	$rrdlbpoolinterval = 60;
244 245
	$rrdprocinterval = 60;
245 246
	$rrdmeminterval = 60;
247
	$rrdmbufinterval = 60;
246 248
	$rrdcellularinterval = 60;
247 249
	$rrdvpninterval = 60;
248 250
	$rrdcaptiveportalinterval = 60;
......
257 259
	$lbpoolvalid = $rrdlbpoolinterval * 2;
258 260
	$procvalid = $rrdlbpoolinterval * 2;
259 261
	$memvalid = $rrdmeminterval * 2;
262
	$mbufvalid = $rrdmbufinterval * 2;
260 263
	$cellularvalid = $rrdcellularinterval * 2;
261 264
	$vpnvalid = $rrdvpninterval * 2;
262 265
	$captiveportalvalid = $rrdcaptiveportalinterval * 2;
......
688 691

  
689 692
		/* End Memory statistics */
690 693

  
694
		/* mbuf, create mbuf statistics database */
695
		if(! file_exists("$rrddbpath$ifname$mbuf")) {
696
			$rrdcreate = "$rrdtool create $rrddbpath$ifname$mbuf --step $rrdmbufinterval ";
697
			$rrdcreate .= "DS:current:GAUGE:$mbufvalid:0:10000000 ";
698
			$rrdcreate .= "DS:cache:GAUGE:$mbufvalid:0:10000000 ";
699
			$rrdcreate .= "DS:total:GAUGE:$mbufvalid:0:10000000 ";
700
			$rrdcreate .= "DS:max:GAUGE:$mbufvalid:0:10000000 ";
701
			$rrdcreate .= "RRA:MIN:0.5:1:1200 ";
702
			$rrdcreate .= "RRA:MIN:0.5:5:720 ";
703
			$rrdcreate .= "RRA:MIN:0.5:60:1860 ";
704
			$rrdcreate .= "RRA:MIN:0.5:1440:3652 ";
705
			$rrdcreate .= "RRA:AVERAGE:0.5:1:1200 ";
706
			$rrdcreate .= "RRA:AVERAGE:0.5:5:720 ";
707
			$rrdcreate .= "RRA:AVERAGE:0.5:60:1860 ";
708
			$rrdcreate .= "RRA:AVERAGE:0.5:1440:3652 ";
709
			$rrdcreate .= "RRA:MAX:0.5:1:1200 ";
710
			$rrdcreate .= "RRA:MAX:0.5:5:720 ";
711
			$rrdcreate .= "RRA:MAX:0.5:60:1860 ";
712
			$rrdcreate .= "RRA:MAX:0.5:1440:3652";
713

  
714
			create_new_rrd($rrdcreate);
715
			unset($rrdcreate);
716
		}
717

  
718
		/* enter UNKNOWN values in the RRD so it knows we rebooted. */
719
		if($g['booting']) {
720
			mwexec("$rrdtool update $rrddbpath$ifname$mbuf N:U:U:U:U:U");
721
		}
722

  
723
		/* the mbuf stats gathering function. */
724
		$rrdupdatesh .= "MBUF=`$netstat -m | ";
725
		$rrdupdatesh .= " $awk '/mbuf clusters in use/ { gsub(/\//, \":\", $1); print $1; }'`\n";
726
		$rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$mbuf N:\${MBUF}\n";
727

  
728
		/* End mbuf statistics */
729

  
691 730
		/* SPAMD, set up the spamd rrd file */
692 731
		if (isset($config['installedpackages']['spamdsettings']) &&
693 732
			 $config['installedpackages']['spamdsettings']['config'][0]['enablerrd']) {
usr/local/www/status_rrd_graph_img.php
210 210
$colortraffic95 = array("660000", "FF0000");
211 211
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
212 212
$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
213
$colormbuf = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
213 214
$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
214 215
$colorqueuesup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
215 216
$colorqueuesdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
......
905 906
	$graphcmd .= "COMMENT:\"\\n\" ";
906 907
	$graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\" ";
907 908
}
909
elseif((strstr($curdatabase, "-mbuf.rrd")) && (file_exists("$rrddbpath$curdatabase"))) {
910
	/* define graphcmd for mbuf usage stats */
911
	$graphcmd = "$rrdtool graph $rrdtmppath$curdatabase-$curgraph.png ";
912
	$graphcmd .= "--start $start --end $end --step $step ";
913
	$graphcmd .= "--vertical-label \"utilization, percent\" ";
914
	$graphcmd .= "--color SHADEA#eeeeee --color SHADEB#eeeeee ";
915
	$graphcmd .= "--title \"`hostname` - {$prettydb} - {$hperiod} - {$havg} average\" ";
916
	$graphcmd .= "--height 200 --width 620 ";
917
	$graphcmd .= "DEF:\"current=$rrddbpath$curdatabase:current:AVERAGE:step=$step\" ";
918
	$graphcmd .= "DEF:\"cache=$rrddbpath$curdatabase:cache:AVERAGE:step=$step\" ";
919
	$graphcmd .= "DEF:\"total=$rrddbpath$curdatabase:total:AVERAGE:step=$step\" ";
920
	$graphcmd .= "DEF:\"max=$rrddbpath$curdatabase:max:AVERAGE:step=$step\" ";
921
	$graphcmd .= "LINE2:\"current#{$colormbuf[0]}:current\" ";
922
	$graphcmd .= "LINE2:\"cache#{$colormbuf[1]}:cache\" ";
923
	$graphcmd .= "LINE2:\"total#{$colormbuf[2]}:total\" ";
924
	$graphcmd .= "LINE2:\"max#{$colormbuf[3]}:max\" ";
925
	$graphcmd .= "COMMENT:\"\\n\" ";
926
	$graphcmd .= "COMMENT:\"\t\t      minimum        average        maximum        current\\n\" ";
927
	$graphcmd .= "COMMENT:\"Current.      \" ";
928
	$graphcmd .= "GPRINT:\"current:MIN:%7.2lf %s    \" ";
929
	$graphcmd .= "GPRINT:\"current:AVERAGE:%7.2lf %s    \" ";
930
	$graphcmd .= "GPRINT:\"current:MAX:%7.2lf %s    \" ";
931
	$graphcmd .= "GPRINT:\"current:LAST:%7.2lf %S    \" ";
932
	$graphcmd .= "COMMENT:\"\\n\" ";
933
	$graphcmd .= "COMMENT:\"Cache.        \" ";
934
	$graphcmd .= "GPRINT:\"cache:MIN:%7.2lf %s    \" ";
935
	$graphcmd .= "GPRINT:\"cache:AVERAGE:%7.2lf %s    \" ";
936
	$graphcmd .= "GPRINT:\"cache:MAX:%7.2lf %s    \" ";
937
	$graphcmd .= "GPRINT:\"cache:LAST:%7.2lf %S    \" ";
938
	$graphcmd .= "COMMENT:\"\\n\" ";
939
	$graphcmd .= "COMMENT:\"Total.        \" ";
940
	$graphcmd .= "GPRINT:\"total:MIN:%7.2lf %s    \" ";
941
	$graphcmd .= "GPRINT:\"total:AVERAGE:%7.2lf %s    \" ";
942
	$graphcmd .= "GPRINT:\"total:MAX:%7.2lf %s    \" ";
943
	$graphcmd .= "GPRINT:\"total:LAST:%7.2lf %S    \" ";
944
	$graphcmd .= "COMMENT:\"\\n\" ";
945
	$graphcmd .= "COMMENT:\"Max.          \" ";
946
	$graphcmd .= "GPRINT:\"max:MIN:%7.2lf %s    \" ";
947
	$graphcmd .= "GPRINT:\"max:AVERAGE:%7.2lf %s    \" ";
948
	$graphcmd .= "GPRINT:\"max:MAX:%7.2lf %s    \" ";
949
	$graphcmd .= "GPRINT:\"max:LAST:%7.2lf %S    \" ";
950
	$graphcmd .= "COMMENT:\"\\n\" ";
951
	$graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t`date +\"%b %d %H\:%M\:%S %Y\"`\" ";
952
}
908 953
elseif((strstr($curdatabase, "-queues.rrd")) && (file_exists("$rrddbpath$curdatabase"))) {
909 954
	/* define graphcmd for queue stats */
910 955
	$graphcmd = "$rrdtool graph $rrdtmppath$curdatabase-$curgraph.png ";
usr/local/www/themes/_corporate/rrdcolors.inc.php
38 38
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
39 39
$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
40 40
$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41
$colormbuf = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41 42
$colorqueuesup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
42 43
$colorqueuesdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
43 44
$colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
usr/local/www/themes/code-red/rrdcolors.inc.php
38 38
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
39 39
$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
40 40
$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41
$colormbuf = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41 42
$colorqueuesup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
42 43
$colorqueuesdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
43 44
$colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
usr/local/www/themes/metallic/rrdcolors.inc.php
38 38
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
39 39
$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
40 40
$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41
$colormbuf = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41 42
$colorqueuesup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
42 43
$colorqueuesdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
43 44
$colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
usr/local/www/themes/nervecenter/rrdcolors.inc.php
38 38
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
39 39
$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
40 40
$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41
$colormbuf = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41 42
$colorqueuesup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
42 43
$colorqueuesdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
43 44
$colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
usr/local/www/themes/pfsense-dropdown/rrdcolors.inc.php
38 38
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
39 39
$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
40 40
$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41
$colormbuf = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41 42
$colorqueuesup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
42 43
$colorqueuesdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
43 44
$colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
usr/local/www/themes/pfsense/rrdcolors.inc.php
38 38
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
39 39
$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
40 40
$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41
$colormbuf = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41 42
$colorqueuesup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
42 43
$colorqueuesdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
43 44
$colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
usr/local/www/themes/pfsense_ng/rrdcolors.inc.php
38 38
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
39 39
$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
40 40
$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41
$colormbuf = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41 42
$colorqueuesup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
42 43
$colorqueuesdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
43 44
$colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
usr/local/www/themes/the_wall/rrdcolors.inc.php
38 38
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
39 39
$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
40 40
$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41
$colormbuf = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
41 42
$colorqueuesup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');
42 43
$colorqueuesdown = array('000000','7B7B7B','999999','BBBBBB','CCCCCC','D9D9D9','EEEEEE','FFFFFF','CCCCCC');
43 44
$colorqueuesdropup = array('000000','7B0000','990000','BB0000','CC0000','D90000','EE0000','FF0000','CC0000');

Also available in: Unified diff