mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
Merge remote branch 'upstream/master'
Conflicts: usr/local/www/status_rrd_graph_img.php usr/local/www/themes/pfsense_ng/rrdcolors.inc.php
This commit is contained in:
Seth Mos
commit
15f2cdc317
@ -2513,10 +2513,37 @@ EOD;
|
||||
$ipfrules .= <<<EOD
|
||||
anchor "tftp-proxy/*"
|
||||
|
||||
EOD;
|
||||
|
||||
update_filter_reload_status("Creating uPNP rules...");
|
||||
if(isset($config['installedpackages']['miniupnpd']['config'][0]['enable'])) {
|
||||
|
||||
$ipfrules .= <<<EOD
|
||||
# uPnPd
|
||||
anchor "miniupnpd"
|
||||
|
||||
EOD;
|
||||
|
||||
$upnp_interfaces = explode(",", $config['installedpackages']['miniupnpd']['config']['iface_array']);
|
||||
foreach($upnp_interfaces as $upnp_if) {
|
||||
if(is_array($FilterIflist[$upnp_if])) {
|
||||
$oc = $FilterIflist[$upnp_if];
|
||||
if($oc['ip']) {
|
||||
$sa = $oc['sa'];
|
||||
$sn = $oc['sn'];
|
||||
$if = $oc['if'];
|
||||
}
|
||||
if($sa) {
|
||||
$ipfrules .= <<<EOD
|
||||
|
||||
pass in quick on \${$oc['descr']} proto tcp from {$sa}/{$sn} to 239.255.255.250/32 port 1900 flags any keep state label "pass multicast traffic to miniupnpd"
|
||||
|
||||
EOD;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return $ipfrules;
|
||||
}
|
||||
|
||||
@ -196,6 +196,7 @@ if(file_exists($rrdcolors)) {
|
||||
$colortrafficdown = array("990000", "CC0000", "b36666", "bd9090");
|
||||
$colorpacketsup = array("666666", "CCCCCC", "b36666", "bd9090");
|
||||
$colorpacketsdown = array("990000", "CC0000", "b36666", "bd9090");
|
||||
$colortraffic95 = array("660000", "FF0000");
|
||||
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
|
||||
$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
|
||||
$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
|
||||
@ -345,9 +346,14 @@ if((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdatabas
|
||||
$graphcmd .= "CDEF:\"$curif-bytes_t_block=$curif-bytes_in_t_block,$curif-bytes_out_t_block,+\" ";
|
||||
$graphcmd .= "CDEF:\"$curif-bytes_t=$curif-bytes_in_t_pass,$curif-bytes_out_t_block,+\" ";
|
||||
|
||||
<<<<<<< HEAD
|
||||
$graphcmd .= "CDEF:\"$curif-bytes_t_pass6=$curif-bytes_in6_t_pass,$curif-bytes_out6_t_pass,+\" ";
|
||||
$graphcmd .= "CDEF:\"$curif-bytes_t_block6=$curif-bytes_in6_t_block,$curif-bytes_out6_t_block,+\" ";
|
||||
$graphcmd .= "CDEF:\"$curif-bytes_t6=$curif-bytes_in6_t_pass,$curif-bytes_out6_t_block,+\" ";
|
||||
=======
|
||||
$graphcmd .= "VDEF:\"$curif-in_bits_95=$curif-in_bits,95,PERCENT\" ";
|
||||
$graphcmd .= "VDEF:\"$curif-out_bits_95=$curif-out_bits,95,PERCENT\" ";
|
||||
>>>>>>> upstream/master
|
||||
|
||||
$graphcmd .= "AREA:\"$curif-in_bits_block#{$colortrafficdown[1]}:$curif-in-block\" ";
|
||||
$graphcmd .= "AREA:\"$curif-in_bits_pass#{$colortrafficdown[0]}:$curif-in-pass:STACK\" ";
|
||||
@ -357,21 +363,34 @@ if((strstr($curdatabase, "-traffic.rrd")) && (file_exists("$rrddbpath$curdatabas
|
||||
|
||||
$graphcmd .= "{$AREA}:\"$curif-out_bits_block_neg#{$colortrafficup[1]}:$curif-out-block\" ";
|
||||
$graphcmd .= "{$AREA}:\"$curif-out_bits_pass_neg#{$colortrafficup[0]}:$curif-out-pass:STACK\" ";
|
||||
<<<<<<< HEAD
|
||||
$graphcmd .= "{$AREA}:\"$curif-out6_bits_block_neg#{$colortrafficup[3]}:$curif-out6-block:STACK\" ";
|
||||
$graphcmd .= "{$AREA}:\"$curif-out6_bits_pass_neg#{$colortrafficup[2]}:$curif-out6-pass:STACK\" ";
|
||||
$graphcmd .= "COMMENT:\"\\n\" ";
|
||||
$graphcmd .= "COMMENT:\"\t\t maximum average current period\\n\" ";
|
||||
$graphcmd .= "COMMENT:\"IPv4 in-pass\t\" ";
|
||||
=======
|
||||
$graphcmd .= "HRULE:\"$curif-in_bits_95#{$colortraffic95[1]}:$curif-in (95%)\" ";
|
||||
$graphcmd .= "HRULE:\"$curif-out_bits_95#{$colortraffic95[0]}:$curif-out (95%)\" ";
|
||||
|
||||
$graphcmd .= "COMMENT:\"\\n\" ";
|
||||
$graphcmd .= "COMMENT:\"\t\t maximum average current period 95th percentile\\n\" ";
|
||||
|
||||
$graphcmd .= "COMMENT:\"in-pass\t\" ";
|
||||
>>>>>>> upstream/master
|
||||
$graphcmd .= "GPRINT:\"$curif-in_bits_pass:MAX:%7.2lf %sb/s\" ";
|
||||
$graphcmd .= "GPRINT:\"$curif-in_bits_pass:AVERAGE:%7.2lf %Sb/s\" ";
|
||||
$graphcmd .= "GPRINT:\"$curif-in_bits_pass:LAST:%7.2lf %Sb/s\" ";
|
||||
$graphcmd .= "GPRINT:\"$curif-bytes_in_t_pass:AVERAGE:%7.2lf %sB i\" ";
|
||||
$graphcmd .= "GPRINT:\"$curif-in_bits_95:%7.2lf %sb/s\" ";
|
||||
|
||||
$graphcmd .= "COMMENT:\"\\n\" ";
|
||||
$graphcmd .= "COMMENT:\"IPv4 out-pass\t\" ";
|
||||
$graphcmd .= "GPRINT:\"$curif-out_bits_pass:MAX:%7.2lf %sb/s\" ";
|
||||
$graphcmd .= "GPRINT:\"$curif-out_bits_pass:AVERAGE:%7.2lf %Sb/s\" ";
|
||||
$graphcmd .= "GPRINT:\"$curif-out_bits_pass:LAST:%7.2lf %Sb/s\" ";
|
||||
$graphcmd .= "GPRINT:\"$curif-bytes_out_t_pass:AVERAGE:%7.2lf %sB o\" ";
|
||||
$graphcmd .= "GPRINT:\"$curif-out_bits_95:%7.2lf %sb/s\" ";
|
||||
$graphcmd .= "COMMENT:\"\\n\" ";
|
||||
$graphcmd .= "COMMENT:\"IPv4 in-block\t\" ";
|
||||
$graphcmd .= "GPRINT:\"$curif-in_bits_block:MAX:%7.2lf %sb/s\" ";
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
|
||||
$colortrafficup = array("666666", "CCCCCC");
|
||||
$colortrafficdown = array("990000", "CC0000");
|
||||
$colortraffic95 = array("660000", "FF0000");
|
||||
$colorpacketsup = array("666666", "CCCCCC");
|
||||
$colorpacketsdown = array("990000", "CC0000");
|
||||
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
|
||||
$colortrafficup = array("666666", "CCCCCC");
|
||||
$colortrafficdown = array("990000", "CC0000");
|
||||
$colortraffic95 = array("660000", "FF0000");
|
||||
$colorpacketsup = array("666666", "CCCCCC");
|
||||
$colorpacketsdown = array("990000", "CC0000");
|
||||
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
|
||||
$colortrafficup = array("666666", "CCCCCC");
|
||||
$colortrafficdown = array("990000", "CC0000");
|
||||
$colortraffic95 = array("660000", "FF0000");
|
||||
$colorpacketsup = array("666666", "CCCCCC");
|
||||
$colorpacketsdown = array("990000", "CC0000");
|
||||
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
|
||||
$colortrafficup = array("666666", "CCCCCC");
|
||||
$colortrafficdown = array("990000", "CC0000");
|
||||
$colortraffic95 = array("660000", "FF0000");
|
||||
$colorpacketsup = array("666666", "CCCCCC");
|
||||
$colorpacketsdown = array("990000", "CC0000");
|
||||
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
|
||||
$colortrafficup = array("666666", "CCCCCC");
|
||||
$colortrafficdown = array("990000", "CC0000");
|
||||
$colortraffic95 = array("660000", "FF0000");
|
||||
$colorpacketsup = array("666666", "CCCCCC");
|
||||
$colorpacketsdown = array("990000", "CC0000");
|
||||
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
|
||||
|
||||
@ -30,10 +30,11 @@
|
||||
|
||||
/* This file is included by the RRD graphing page and sets the colors */
|
||||
|
||||
$colortrafficup = array("666666", "CCCCCC", "b36666", "bd9090");
|
||||
$colortrafficdown = array("990000", "CC0000", "b36666", "bd9090");
|
||||
$colorpacketsup = array("666666", "CCCCCC", "b36666", "bd9090");
|
||||
$colorpacketsdown = array("990000", "CC0000", "b36666", "bd9090");
|
||||
$colortrafficup = array("666666", "CCCCCC", "b36666", "bd9090");
|
||||
$colortrafficdown = array("990000", "CC0000", "b36666", "bd9090");
|
||||
$colorpacketsup = array("666666", "CCCCCC", "b36666", "bd9090");
|
||||
$colorpacketsdown = array("990000", "CC0000", "b36666", "bd9090");
|
||||
$colortraffic95 = array("660000", "FF0000");
|
||||
$colorstates = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
|
||||
$colorprocessor = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
|
||||
$colormemory = array('990000','a83c3c','b36666','bd9090','cccccc','000000');
|
||||
|
||||
Loading…
Reference in New Issue
Block a user