summaryrefslogtreecommitdiffstats
path: root/src/usr/local
diff options
context:
space:
mode:
authorheper <heper@users.noreply.github.com>2015-11-09 12:59:52 +0100
committerheper <heper@users.noreply.github.com>2015-11-09 12:59:52 +0100
commit7703c8aa3a319405faaea1034de669679673f203 (patch)
tree5186fa30a8e8e902b6fe4b33545391d8241c1e81 /src/usr/local
parent4ba8e4bcb34354c685a5a2fcea9000495d6440e5 (diff)
downloadpfsense-7703c8aa3a319405faaea1034de669679673f203.zip
pfsense-7703c8aa3a319405faaea1034de669679673f203.tar.gz
add static leases
Diffstat (limited to 'src/usr/local')
-rw-r--r--src/usr/local/www/status_rrd_graph_img.php16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/usr/local/www/status_rrd_graph_img.php b/src/usr/local/www/status_rrd_graph_img.php
index 907f46d..b08bf10 100644
--- a/src/usr/local/www/status_rrd_graph_img.php
+++ b/src/usr/local/www/status_rrd_graph_img.php
@@ -251,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 */
@@ -285,7 +285,7 @@ $colorntpd = array('0080FF', '00E344', 'FF0000', '000000');
/* Captive Portal Concurrent Concurrent Users */
$colorcaptiveportalusers = array('990000');
-$colordhcpd = array('990000');
+$colordhcpd = array('990000', '0000FF');
switch ($curstyle) {
case "absolute":
@@ -1243,12 +1243,11 @@ if ((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdataba
$graphcmd .= "--vertical-label \"Dhcp Leases\" ";
$graphcmd .= "--color SHADEA#eeeeee --color SHADEB#eeeeee ";
$graphcmd .= "--title \"" . php_uname('n') . " - {$prettydb} - {$hperiod} - {$havg} average\" ";
- $graphcmd .= "--base=1000 ";
- $graphcmd .= "--lower-limit=0 ";
- $graphcmd .= "--slope-mode ";
$graphcmd .= "--height 200 --width 620 ";
$graphcmd .= "DEF:\"$curif-leases=$rrddbpath$curdatabase:leases:AVERAGE:step=$step\" ";
- $graphcmd .= "AREA:\"$curif-leases#{$colordhcpd[0]}:Active Leases\" ";
+ $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 .= "COMMENT:\"\\n\" ";
$graphcmd .= "COMMENT:\"\t\t\t current\t\t average\t maximum\\n\" ";
$graphcmd .= "COMMENT:\"Leases Active\t\" ";
@@ -1256,6 +1255,11 @@ if ((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdataba
$graphcmd .= "GPRINT:\"$curif-leases:AVERAGE:%8.0lf \" ";
$graphcmd .= "GPRINT:\"$curif-leases:MAX:%8.0lf \" ";
$graphcmd .= "COMMENT:\"\\n\" ";
+ $graphcmd .= "COMMENT:\"Leases Static\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:\"\t\t\t\t\t\t\t\t\t\t\t\t\t" . strftime('%b %d %H\:%M\:%S %Y') . "\" ";
} else {
$data = false;
OpenPOWER on IntegriCloud