diff --git a/database-update.sql b/database-update.sql index 9ab61b6a3d..d020b48521 100644 --- a/database-update.sql +++ b/database-update.sql @@ -10,3 +10,4 @@ INSERT INTO `graph_types` (`graph_type`, `graph_subtype`, `graph_section`, `grap DROP TABLE `frequency`; ALTER TABLE `mempools` CHANGE `mempool_index` `mempool_index` VARCHAR( 16 ) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL; ALTER TABLE `vrfs` CHANGE `mplsVpnVrfRouteDistinguisher` `mplsVpnVrfRouteDistinguisher` varchar(26) default NOT NULL; +## Change port rrds diff --git a/discovery.php b/discovery.php index 0001685036..8295939b54 100755 --- a/discovery.php +++ b/discovery.php @@ -67,6 +67,10 @@ if (file_exists('.svn')) include("fix-events.php"); ## Fix events table (needs to copy some data around, so needs script) } + if($db_rev+0 < 1656) { //FIXME + include('fix-port-rrd.php'); + } + if ($dbu_rev+0 > $db_rev) { echo "SVN revision changed.\n"; @@ -91,6 +95,8 @@ if (file_exists('.svn')) } } + + if(isset($options['d'])) { echo("DEBUG!\n"); $debug = 1; } else { $debug = 0; } diff --git a/fix-port-rrd.php b/fix-port-rrd.php new file mode 100755 index 0000000000..8527e21164 --- /dev/null +++ b/fix-port-rrd.php @@ -0,0 +1,205 @@ + 1) + echo round(($i / $count) * 100, 2) . "%\n"; + } + + function getDirectoryTree( $outerDir, &$files = array()){ + + $dirs = array_diff( scandir( $outerDir ), Array( ".", ".." ) ); + foreach( $dirs as $d ){ + if( is_dir($outerDir."/".$d) ){ + getDirectoryTree($outerDir.'/'. $d, $files); + }else{ + if(preg_match('/^[\d]+.rrd$/', $d)) + array_push($files, preg_replace('/\/+/', '/', $outerDir.'/'. $d)); + + } + } + return $files; + } + + + function fixRdd($file){ + global $config; + global $rrdcached; + $fileC = shell_exec( "{$config['rrdtool']} dump $file $rrdcached" ); + +#--------------------------------------------------------------------------------------------------------- + +$first = << + INDISCARDS + DERIVE + 600 + 0.0000000000e+00 + 1.2500000000e+10 + + UNKN + 0.0000000000e+00 + 0 + + + OUTDISCARDS + DERIVE + 600 + 0.0000000000e+00 + 1.2500000000e+10 + + UNKN + 0.0000000000e+00 + 0 + + + INUNKNOWNPROTOS + DERIVE + 600 + 0.0000000000e+00 + 1.2500000000e+10 + + UNKN + 0.0000000000e+00 + 0 + + + INBROADCASTPKTS + DERIVE + 600 + 0.0000000000e+00 + 1.2500000000e+10 + + UNKN + 0.0000000000e+00 + 0 + + + OUTBROADCASTPKTS + DERIVE + 600 + 0.0000000000e+00 + 1.2500000000e+10 + + UNKN + 0.0000000000e+00 + 0 + + + INMULTICASTPKTS + DERIVE + 600 + 0.0000000000e+00 + 1.2500000000e+10 + + UNKN + 0.0000000000e+00 + 0 + + + OUTMULTICASTPKTS + DERIVE + 600 + 0.0000000000e+00 + 1.2500000000e+10 + + UNKN + 0.0000000000e+00 + 0 + + + +FIRST; + + + +$second = << + 0.0000000000e+00 + NaN + NaN + 0 + + + 0.0000000000e+00 + NaN + NaN + 0 + + + 0.0000000000e+00 + NaN + NaN + 0 + + + 0.0000000000e+00 + NaN + NaN + 0 + + + 0.0000000000e+00 + NaN + NaN + 0 + + + 0.0000000000e+00 + NaN + NaN + 0 + + + 0.0000000000e+00 + NaN + NaN + 0 + + +SECOND; + +$third = << NaN NaN NaN NaN NaN NaN NaN +THIRD; + + + + +#--------------------------------------------------------------------------------------------------------- + if(!preg_match('/DISCARDS/', $fileC)){ + $fileC = str_replace('', $first, $fileC); + $fileC = str_replace('', $second, $fileC); + $fileC = str_replace('', $third, $fileC); + $tmpfname = tempnam("/tmp", "OBS"); + file_put_contents($tmpfname, $fileC); + unlink($file); + $newfile = preg_replace("/(\d+)\.rrd/", "port-\\1.rrd", $file); + unlink($newfile); + shell_exec($config['rrdtool'] . " restore $tmpfname $newfile"); + unlink($tmpfname); + + } + + + } + +?> + diff --git a/html/includes/graphs/device/bits.inc.php b/html/includes/graphs/device/bits.inc.php index b47b73801f..9a5b638d82 100644 --- a/html/includes/graphs/device/bits.inc.php +++ b/html/includes/graphs/device/bits.inc.php @@ -22,8 +22,8 @@ while($int = mysql_fetch_assoc($query)) { } } - if(is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename($int['ifIndex'] . ".rrd")) && $ignore != 1) { - $rrd_filenames[] = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename($int['ifIndex'] . ".rrd"); + if(is_file($config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd")) && $ignore != 1) { + $rrd_filenames[] = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd"); } unset($ignore); } diff --git a/html/includes/graphs/multiport/bits.inc.php b/html/includes/graphs/multiport/bits.inc.php index 99e859f073..7eae122e6e 100644 --- a/html/includes/graphs/multiport/bits.inc.php +++ b/html/includes/graphs/multiport/bits.inc.php @@ -5,8 +5,8 @@ $i = 1; foreach(explode(",", $id) as $ifid) { $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id"); $int = mysql_fetch_row($query); - if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . safename($int[0] . ".rrd"))) { - $rrd_filenames[] = $config['rrd_dir'] . "/" . $int[1] . "/" . safename($int[0] . ".rrd"); + if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . safename($int[0] . ".rrd"))) { + $rrd_filenames[] = $config['rrd_dir'] . "/" . $int[1] . "/port-" . safename($int[0] . ".rrd"); $i++; } } diff --git a/html/includes/graphs/multiport/bits_duo.inc.php b/html/includes/graphs/multiport/bits_duo.inc.php index 8d92cf5da2..63e17e88a3 100644 --- a/html/includes/graphs/multiport/bits_duo.inc.php +++ b/html/includes/graphs/multiport/bits_duo.inc.php @@ -13,8 +13,8 @@ if($_GET['legend']) { $legend = $_GET['legend']; } $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id"); $int = mysql_fetch_row($query); if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd")) { - $rrd_options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:INOCTETS:AVERAGE"; - $rrd_options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:OUTOCTETS:AVERAGE"; + $rrd_options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/port-" . $int[1] . "/" . $int[0] . ".rrd:INOCTETS:AVERAGE"; + $rrd_options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/port-" . $int[1] . "/" . $int[0] . ".rrd:OUTOCTETS:AVERAGE"; $in_thing .= $seperator . "inoctets" . $i . ",UN,0," . "inoctets" . $i . ",IF"; $out_thing .= $seperator . "outoctets" . $i . ",UN,0," . "outoctets" . $i . ",IF"; $pluses .= $plus; @@ -28,8 +28,8 @@ if($_GET['legend']) { $legend = $_GET['legend']; } $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id"); $int = mysql_fetch_row($query); if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd")) { - $rrd_options .= " DEF:inoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:INOCTETS:AVERAGE"; - $rrd_options .= " DEF:outoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:OUTOCTETS:AVERAGE"; + $rrd_options .= " DEF:inoctetsb" . $i . "=" . $config['rrd_dir'] . "/port-" . $int[1] . "/" . $int[0] . ".rrd:INOCTETS:AVERAGE"; + $rrd_options .= " DEF:outoctetsb" . $i . "=" . $config['rrd_dir'] . "/port-" . $int[1] . "/" . $int[0] . ".rrd:OUTOCTETS:AVERAGE"; $in_thingb .= $seperator . "inoctetsb" . $i . ",UN,0," . "inoctetsb" . $i . ",IF"; $out_thingb .= $seperator . "outoctetsb" . $i . ",UN,0," . "outoctetsb" . $i . ",IF"; $plusesb .= $plus; diff --git a/html/includes/graphs/multiport/bits_separate.inc.php b/html/includes/graphs/multiport/bits_separate.inc.php index 49025e7290..059eb7f16b 100644 --- a/html/includes/graphs/multiport/bits_separate.inc.php +++ b/html/includes/graphs/multiport/bits_separate.inc.php @@ -13,7 +13,7 @@ function graph_multi_bits ($args) { foreach(explode(",", $args['ports']) as $ifid) { $query = mysql_query("SELECT * FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id"); $int = mysql_fetch_array($query); - $this_rrd = $config['rrd_dir'] . "/" . $int['hostname'] . "/" . safename($int['ifIndex'] . ".rrd"); + $this_rrd = $config['rrd_dir'] . "/" . $int['hostname'] . "/port-" . safename($int['ifIndex'] . ".rrd"); $units='bps'; $unit='B'; $colours='greens'; $multiplier = "8"; $coloursb = 'blues'; if(is_file($this_rrd)) { $name = $int['ifDescr']; diff --git a/html/includes/graphs/multiport/bits_trio.inc.php b/html/includes/graphs/multiport/bits_trio.inc.php index e26b6c68d3..cf364c5d9b 100644 --- a/html/includes/graphs/multiport/bits_trio.inc.php +++ b/html/includes/graphs/multiport/bits_trio.inc.php @@ -9,10 +9,10 @@ if($_GET['legend']) { $legend = $_GET['legend']; } foreach(explode(",", $_GET['ports']) as $ifid) { $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id"); $int = mysql_fetch_row($query); - if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd")) { + if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd")) { if(strstr($inverse, "a")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; } - $rrd_options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE"; - $rrd_options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE"; + $rrd_options .= " DEF:inoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE"; + $rrd_options .= " DEF:outoctets" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE"; $in_thing .= $seperator . "inoctets" . $i . ",UN,0," . "inoctets" . $i . ",IF"; $out_thing .= $seperator . "outoctets" . $i . ",UN,0," . "outoctets" . $i . ",IF"; $pluses .= $plus; @@ -25,10 +25,10 @@ if($_GET['legend']) { $legend = $_GET['legend']; } foreach(explode(",", $_GET['ports_b']) as $ifid) { $query = mysql_query("SELECT `ifIndex`, `hostname` FROM `ports` AS I, devices as D WHERE I.interface_id = '" . $ifid . "' AND I.device_id = D.device_id"); $int = mysql_fetch_row($query); - if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd")) { + if(is_file($config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd")) { if(strstr($inverse, "b")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; } - $rrd_options .= " DEF:inoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE"; - $rrd_options .= " DEF:outoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE"; + $rrd_options .= " DEF:inoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE"; + $rrd_options .= " DEF:outoctetsb" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE"; $in_thingb .= $seperator . "inoctetsb" . $i . ",UN,0," . "inoctetsb" . $i . ",IF"; $out_thingb .= $seperator . "outoctetsb" . $i . ",UN,0," . "outoctetsb" . $i . ",IF"; $plusesb .= $plus; @@ -43,8 +43,8 @@ if($_GET['legend']) { $legend = $_GET['legend']; } $int = mysql_fetch_row($query); if(is_file($config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd")) { if(strstr($inverse, "c")) { $in = "OUT"; $out = "IN"; } else { $in = "IN"; $out = "OUT"; } - $rrd_options .= " DEF:inoctetsc" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE"; - $rrd_options .= " DEF:outoctetsc" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE"; + $rrd_options .= " DEF:inoctetsc" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$in."OCTETS:AVERAGE"; + $rrd_options .= " DEF:outoctetsc" . $i . "=" . $config['rrd_dir'] . "/" . $int[1] . "/port-" . $int[0] . ".rrd:".$out."OCTETS:AVERAGE"; $in_thingc .= $seperator . "inoctetsc" . $i . ",UN,0," . "inoctetsc" . $i . ",IF"; $out_thingc .= $seperator . "outoctetsc" . $i . ",UN,0," . "outoctetsc" . $i . ",IF"; $plusesc .= $plus; diff --git a/html/includes/graphs/port/auth.inc.php b/html/includes/graphs/port/auth.inc.php index a62c579f69..336faf3181 100644 --- a/html/includes/graphs/port/auth.inc.php +++ b/html/includes/graphs/port/auth.inc.php @@ -6,6 +6,9 @@ if(is_numeric($id) && port_permitted($id)) { $title = generate_device_link($device); $title .= " :: Port ".generate_port_link($port); $auth = TRUE; + + $rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-" . safename($port['ifIndex'] . ".rrd"); + } ?> diff --git a/html/includes/graphs/port/bits.inc.php b/html/includes/graphs/port/bits.inc.php index fc10efceb8..17aaff5ac1 100644 --- a/html/includes/graphs/port/bits.inc.php +++ b/html/includes/graphs/port/bits.inc.php @@ -1,7 +1,5 @@ diff --git a/html/includes/graphs/port/etherlike.inc.php b/html/includes/graphs/port/etherlike.inc.php index 7b7334fbce..86173e2689 100644 --- a/html/includes/graphs/port/etherlike.inc.php +++ b/html/includes/graphs/port/etherlike.inc.php @@ -8,7 +8,7 @@ $oids = array('dot3StatsAlignmentErrors', 'dot3StatsFCSErrors', 'dot3StatsSingle 'dot3StatsSymbolErrors'); $i=0; -$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("etherlike-" . $port['ifIndex'] . ".rrd"); +$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("port-" . $port['ifIndex'] . "-dot3.rrd"); if(is_file($rrd_filename)) { foreach($oids as $oid){ $oid = str_replace("dot3Stats", "", $oid); diff --git a/html/includes/graphs/port/nupkts.inc.php b/html/includes/graphs/port/nupkts.inc.php index 9fd99badd0..675f02bb9f 100644 --- a/html/includes/graphs/port/nupkts.inc.php +++ b/html/includes/graphs/port/nupkts.inc.php @@ -1,8 +1,7 @@ "); if($graph_type == "etherlike") { - $graph_file = $config['rrd_dir'] . "/" . $device['hostname'] . "/etherlike-". safename($interface['ifIndex']) . ".rrd"; + $graph_file = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-". safename($interface['ifIndex']) . "-dot3.rrd"; } else { - $graph_file = $config['rrd_dir'] . "/" . $device['hostname'] . "/". safename($interface['ifIndex']) . ".rrd"; + $graph_file = $config['rrd_dir'] . "/" . $device['hostname'] . "/port-". safename($interface['ifIndex']) . ".rrd"; } if($graph_type && is_file($graph_file)) { diff --git a/html/pages/device/port/graphs.inc.php b/html/pages/device/port/graphs.inc.php index fdcb4932dc..42eca226cb 100644 --- a/html/pages/device/port/graphs.inc.php +++ b/html/pages/device/port/graphs.inc.php @@ -1,6 +1,6 @@ Interface Traffic"); diff --git a/includes/polling/port-etherlike.inc.php b/includes/polling/port-etherlike.inc.php index 723123be31..f7aea62567 100755 --- a/includes/polling/port-etherlike.inc.php +++ b/includes/polling/port-etherlike.inc.php @@ -5,18 +5,23 @@ $this_port = &$port_stats[$device[device_id]][$port[ifIndex]]; - $rrdfile = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("etherlike-".$port['ifIndex'].".rrd"); + $old_rrdfile = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("etherlike-".$port['ifIndex'].".rrd"); + $rrdfile = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("port-".$port['ifIndex']."-dot3.rrd"); $rrd_create = $config['rrdtool'] . " create $rrdfile "; $rrd_create .= "RRA:AVERAGE:0.5:1:600 RRA:AVERAGE:0.5:6:700 RRA:AVERAGE:0.5:24:775 RRA:AVERAGE:0.5:288:797 RRA:MAX:0.5:1:600 \ RRA:MAX:0.5:6:700 RRA:MAX:0.5:24:775 RRA:MAX:0.5:288:797"; if(!file_exists($rrdfile)) { - foreach($etherlike_oids as $oid){ - $oid = truncate(str_replace("dot3Stats", "", $oid), 19, ''); - $rrd_create .= " DS:$oid:COUNTER:600:U:100000000000"; + if(file_exists($old_rrdfile)) { + shell_exec('mv '.$old_rrdfile.' '.$rrd_file); + } else { + foreach($etherlike_oids as $oid){ + $oid = truncate(str_replace("dot3Stats", "", $oid), 19, ''); + $rrd_create .= " DS:$oid:COUNTER:600:U:100000000000"; + } + shell_exec($rrd_create); } - shell_exec($rrd_create); } $rrdupdate = "N"; diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php index 91f547ee46..d702a9d37a 100755 --- a/includes/polling/ports.inc.php +++ b/includes/polling/ports.inc.php @@ -1,4 +1,4 @@ -[B "1000000000") { @@ -176,7 +186,7 @@ } /// Update RRDs - $rrdfile = $host_rrd . "/" . safename($port['ifIndex'] . ".rrd"); + $rrdfile = $host_rrd . "/port-" . safename($port['ifIndex'] . ".rrd"); if(!is_file($rrdfile)) { $woo = shell_exec($config['rrdtool'] . " create $rrdfile -s 300 \ DS:INOCTETS:DERIVE:600:0:12500000000 \ @@ -187,6 +197,13 @@ DS:OUTUCASTPKTS:DERIVE:600:0:12500000000 \ DS:INNUCASTPKTS:DERIVE:600:0:12500000000 \ DS:OUTNUCASTPKTS:DERIVE:600:0:12500000000 \ + DS:INDISCARDS:DERIVE:600:0:12500000000 \ + DS:OUTDISCARDS:DERIVE:600:0:12500000000 \ + DS:INUNKNOWNPROTOS:DERIVE:600:0:12500000000 \ + DS:INBROADCASTPKTS:DERIVE:600:0:12500000000 \ + DS:OUTBROADCASTPKTS:DERIVE:600:0:12500000000 \ + DS:INMULTICASTPKTS:DERIVE:600:0:12500000000 \ + DS:OUTMULTICASTPKTS:DERIVE:600:0:12500000000 \ RRA:AVERAGE:0.5:1:600 \ RRA:AVERAGE:0.5:6:700 \ RRA:AVERAGE:0.5:24:775 \ @@ -197,36 +214,21 @@ RRA:MAX:0.5:288:797"); } - $ifx_rrd = $host_rrd . "/ifx-" . safename($port['ifIndex'] . ".rrd"); - $ifx_rrd_cmd = $config['rrdtool'] . " create $ifx_rrd -s 300 \ - DS:InBroadcastPkts:DERIVE:600:0:12500000000 \ - DS:OutBroadcastPkts:DERIVE:600:0:12500000000 \ - DS:InMulticastPkts:DERIVE:600:0:12500000000 \ - DS:OutMulticastPkts:DERIVE:600:0:12500000000 \ - RRA:AVERAGE:0.5:1:600 \ - RRA:AVERAGE:0.5:6:700 \ - RRA:AVERAGE:0.5:24:775 \ - RRA:AVERAGE:0.5:288:797 \ - RRA:MAX:0.5:1:600 \ - RRA:MAX:0.5:6:700 \ - RRA:MAX:0.5:24:775 \ - RRA:MAX:0.5:288:797"; - - foreach ($stat_oids as $oid) { /// Copy values from array to global variables and force numeric. $$oid = $this_port[$oid]; if(!is_numeric($$oid)) { $$oid = "0"; } } - $if_rrd_update = "$polled:$ifInOctets:$ifOutOctets:$ifInErrors:$ifOutErrors:$ifInUcastPkts:$ifOutUcastPkts:$ifInNUcastPkts:$ifOutNUcastPkts"; + $if_rrd_update = "$polled:$ifInOctets:$ifOutOctets:$ifInErrors:$ifOutErrors:$ifInUcastPkts:$ifOutUcastPkts:$ifInNUcastPkts:$ifOutNUcastPkts:$ifInDiscards:$ifOutDiscards:$ifInUnknownProtos"; + $if_rrd_update .= ":$ifInBroadcastPkts:$ifOutBroadcastPkts:$ifInMulticastPkts:$ifOutMulticastPkts"; $ret = rrdtool_update("$rrdfile", $if_rrd_update); - if($config['enable_ports_Xbcmc'] && $config['os'][$device['os']]['ifXmcbc']) { - if(!is_file($ifx_rrd)) { shell_exec($ifx_rrd_cmd); } - $ifx_rrd_update = "$polled:$ifHCInBroadcastPkts:$ifHCOutBroadcastPkts:$ifHCInMulticastPkts:$ifHCOutMulticastPkts"; - $ret = rrdtool_update($ifx_rrd, $ifx_rrd_update); - } +# if($config['enable_ports_Xbcmc'] && $config['os'][$device['os']]['ifXmcbc']) { +# if(!is_file($ifx_rrd)) { shell_exec($ifx_rrd_cmd); } +# $ifx_rrd_update = "$polled:$ifHCInBroadcastPkts:$ifHCOutBroadcastPkts:$ifHCInMulticastPkts:$ifHCOutMulticastPkts"; +# $ret = rrdtool_update($ifx_rrd, $ifx_rrd_update); +# } /// End Update IF-MIB