diff --git a/html/includes/graphs/device/siklu_rfinterfaceOctets.inc.php b/html/includes/graphs/device/siklu_rfinterfaceOctets.inc.php index 4fc10b6c7..966c175f6 100644 --- a/html/includes/graphs/device/siklu_rfinterfaceOctets.inc.php +++ b/html/includes/graphs/device/siklu_rfinterfaceOctets.inc.php @@ -8,6 +8,8 @@ if (file_exists($rrdfilename)) { $rrd_options .= " COMMENT:'bps Now Ave Max \\n'"; $rrd_options .= " DEF:rfInOctets=".$rrdfilename.":rfInOctets:AVERAGE "; $rrd_options .= " DEF:rfOutOctets=".$rrdfilename.":rfOutOctets:AVERAGE "; + //$rrd_options .= " CDEF:inoctets=rfInOctets,8,*"; + //$rrd_options .= " CDEF:outoctets=rfOutOctets,8,*"; $rrd_options .= " LINE1:rfInOctets#00FF00:'In ' "; $rrd_options .= " GPRINT:rfInOctets:LAST:%0.2lf%s "; $rrd_options .= " GPRINT:rfInOctets:MIN:%0.2lf%s "; diff --git a/html/includes/graphs/device/siklu_rfinterfaceOtherOctets.inc.php b/html/includes/graphs/device/siklu_rfinterfaceOtherOctets.inc.php index 5a2f1c9e6..c6902312d 100644 --- a/html/includes/graphs/device/siklu_rfinterfaceOtherOctets.inc.php +++ b/html/includes/graphs/device/siklu_rfinterfaceOtherOctets.inc.php @@ -18,11 +18,11 @@ if (file_exists($rrdfilename)) { $rrd_options .= " GPRINT:rfInErroredOctets:LAST:%0.2lf%s "; $rrd_options .= " GPRINT:rfInErroredOctets:MIN:%0.2lf%s "; $rrd_options .= " GPRINT:rfInErroredOctets:MAX:%0.2lf%s\\\l "; - $rrd_options .= " LINE1:rfInIdleOctets#0022FF:'Lost Octets ' "; + $rrd_options .= " LINE1:rfInIdleOctets#0022FF:'In Idle Octets ' "; $rrd_options .= " GPRINT:rfInIdleOctets:LAST:%0.2lf%s "; $rrd_options .= " GPRINT:rfInIdleOctets:MIN:%0.2lf%s "; $rrd_options .= " GPRINT:rfInIdleOctets:MAX:%0.2lf%s\\\l "; - $rrd_options .= " LINE1:rfOutIdleOctets#DD9CFB:'Lost Octets ' "; + $rrd_options .= " LINE1:rfOutIdleOctets#DD9CFB:'Out Idle Octets ' "; $rrd_options .= " GPRINT:rfOutIdleOctets:LAST:%0.2lf%s "; $rrd_options .= " GPRINT:rfOutIdleOctets:MIN:%0.2lf%s "; $rrd_options .= " GPRINT:rfOutIdleOctets:MAX:%0.2lf%s\\\l "; diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php index 18a290170..4b0999169 100644 --- a/includes/polling/functions.inc.php +++ b/includes/polling/functions.inc.php @@ -245,7 +245,7 @@ function poll_device($device, $options) } } -function poll_mib_def($device, $mib_name_table, $mib_subdir, $mib_oids, $mib_graphs, &$graphs, $rrd_options) +function poll_mib_def($device, $mib_name_table, $mib_subdir, $mib_oids, $mib_graphs, &$graphs) { global $config; @@ -275,7 +275,7 @@ function poll_mib_def($device, $mib_name_table, $mib_subdir, $mib_oids, $mib_gra if (strlen($oiddsname) > 19) { $oiddsname = truncate($oiddsname, 19, ''); } if (empty($oiddsopts)) { - $rrd_options = "600:U:100000000000"; + $oiddsopts = "600:U:100000000000"; } $rrdcreate .= ' DS:'.$oiddsname.':'.$oiddstype.':'.$oiddsopts;