diff options
| -rw-r--r-- | src/usr/local/www/status_rrd_graph_img.php | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/usr/local/www/status_rrd_graph_img.php b/src/usr/local/www/status_rrd_graph_img.php index 4c789a1..5a5dbd8 100644 --- a/src/usr/local/www/status_rrd_graph_img.php +++ b/src/usr/local/www/status_rrd_graph_img.php @@ -1,4 +1,5 @@ <?php +/* $Id$ */ /* status_rrd_graph_img.php */ @@ -250,7 +251,7 @@ $colorprocessor = array('00AA00', '990000', '0000FF', 'DD9B00', '000000'); /* Memory Usage active, inact, free, cache, wire */ $colormemory = array('00AA00', '990000', '0000FF', '666666', 'DD9B00'); -/* MBUF Usage current, cache, total, max */ +/* Usage current, cache, total, max */ $colormbuf = array('0080FF', '00E344', 'FF0000', '000000'); /* Traffic Shaper Queues q1, q2, q3, q4, q5, q6, q7, q8, q9 */ @@ -284,7 +285,7 @@ $colorntpd = array('0080FF', '00E344', 'FF0000', '000000'); /* Captive Portal Concurrent Concurrent Users */ $colorcaptiveportalusers = array('990000'); -$colordhcpd = array('990000', '0000FF'); +$colordhcpd = array('990000', '0000FF', '000000'); switch ($curstyle) { case "absolute": @@ -1245,20 +1246,27 @@ if ((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdataba $graphcmd .= "--height 200 --width 620 "; $graphcmd .= "DEF:\"$curif-leases=$rrddbpath$curdatabase:leases:AVERAGE:step=$step\" "; $graphcmd .= "DEF:\"$curif-staticleases=$rrddbpath$curdatabase:staticleases:AVERAGE:step=$step\" "; - $graphcmd .= "LINE1:\"$curif-leases#{$colordhcpd[0]}:Active Leases\" "; - $graphcmd .= "LINE1:\"$curif-staticleases#{$colordhcpd[1]}:Static Leases\" "; + $graphcmd .= "DEF:\"$curif-dhcprange=$rrddbpath$curdatabase:dhcprange:AVERAGE:step=$step\" "; + $graphcmd .= "AREA:\"$curif-leases#{$colordhcpd[0]}:Active Leases\" "; + $graphcmd .= "LINE2:\"$curif-staticleases#{$colordhcpd[1]}:Static Leases\" "; + $graphcmd .= "LINE1:\"$curif-dhcprange#{$colordhcpd[2]}:Dhcp Range\" "; $graphcmd .= "COMMENT:\"\\n\" "; - $graphcmd .= "COMMENT:\"\t\t\t current\t\t average\t maximum\\n\" "; - $graphcmd .= "COMMENT:\"Leases Active\t\" "; + $graphcmd .= "COMMENT:\"\t\t\t current\t\t average\t\tmaximum\\n\" "; + $graphcmd .= "COMMENT:\"Active Leases\t\" "; $graphcmd .= "GPRINT:\"$curif-leases:LAST:%8.0lf \" "; $graphcmd .= "GPRINT:\"$curif-leases:AVERAGE:%8.0lf \" "; $graphcmd .= "GPRINT:\"$curif-leases:MAX:%8.0lf \" "; $graphcmd .= "COMMENT:\"\\n\" "; - $graphcmd .= "COMMENT:\"Leases Static\t\" "; + $graphcmd .= "COMMENT:\"Static Leases\t\" "; $graphcmd .= "GPRINT:\"$curif-staticleases:LAST:%8.0lf \" "; $graphcmd .= "GPRINT:\"$curif-staticleases:AVERAGE:%8.0lf \" "; $graphcmd .= "GPRINT:\"$curif-staticleases:MAX:%8.0lf \" "; $graphcmd .= "COMMENT:\"\\n\" "; + $graphcmd .= "COMMENT:\"Dhcp Range\t\t\" "; + $graphcmd .= "GPRINT:\"$curif-dhcprange:LAST:%8.0lf \" "; + $graphcmd .= "GPRINT:\"$curif-dhcprange:AVERAGE:%8.0lf \" "; + $graphcmd .= "GPRINT:\"$curif-dhcprange:MAX:%8.0lf \" "; + $graphcmd .= "COMMENT:\"\\n\" "; $graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t" . strftime('%b %d %H\:%M\:%S %Y') . "\" "; } else { $data = false; |
