improving ipSystemStats v4/v6 stats, clean up some variables in defaults.inc.php

git-svn-id: http://www.observium.org/svn/observer/trunk@1455 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong 2010-07-21 15:14:02 +00:00
parent aedca19465
commit 6bb7fe026f
9 changed files with 257 additions and 26 deletions

View File

@ -20,7 +20,6 @@
$rrd_options .= " DEF:OutNoRoutes_4=$rrd_filename_4:InDiscards:AVERAGE";
$rrd_options .= " CDEF:OutNoRoutes_4_n=OutNoRoutes_4,-1,*";
$rrd_options .= " DEF:InForwDatagrams_6=$rrd_filename_6:InForwDatagrams:AVERAGE";
$rrd_options .= " DEF:InDelivers_6=$rrd_filename_6:InDelivers:AVERAGE";
$rrd_options .= " DEF:InReceives_6=$rrd_filename_6:InReceives:AVERAGE";
@ -35,7 +34,6 @@
$rrd_options .= " DEF:OutNoRoutes_6=$rrd_filename_6:InDiscards:AVERAGE";
$rrd_options .= " CDEF:OutNoRoutes_6_n=OutNoRoutes_6,-1,*";
$rrd_options .= " COMMENT:'Packets/sec Current Average Maximum\\n'";
$rrd_options .= " AREA:InReceives_4#CDEB8B:'InReceives v4'";
@ -78,14 +76,14 @@
$rrd_options .= " GPRINT:OutForwDatagrams_6:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:OutForwDatagrams_6:MAX:%6.2lf%s\\\\n";
# $rrd_options .= " LINE1.25:InDelivers_4#00cc00:'InDelivers v4'";
# $rrd_options .= " GPRINT:InDelivers_4:LAST:%6.2lf%s";
# $rrd_options .= " GPRINT:InDelivers_4:AVERAGE:%6.2lf%s";
# $rrd_options .= " GPRINT:InDelivers_4:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:InDelivers_4#00cc00:'InDelivers v4'";
$rrd_options .= " GPRINT:InDelivers_4:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InDelivers_4:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InDelivers_4:MAX:%6.2lf%s\\\\n";
# $rrd_options .= " LINE1.25:InDelivers_6#3F003F:' v6'";
# $rrd_options .= " GPRINT:InDelivers_6:LAST:%6.2lf%s";
# $rrd_options .= " GPRINT:InDelivers_6:AVERAGE:%6.2lf%s";
# $rrd_options .= " GPRINT:InDelivers_6:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:InDelivers_6#3F003F:' v6'";
$rrd_options .= " GPRINT:InDelivers_6:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InDelivers_6:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InDelivers_6:MAX:%6.2lf%s\\\\n";
?>

View File

@ -0,0 +1,53 @@
<?php
include("common.inc.php");
$device = device_by_id_cache($id);
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv4.rrd";
$rrd_options .= " DEF:InForwDatagrams=$rrd_filename:InForwDatagrams:AVERAGE";
$rrd_options .= " DEF:InDelivers=$rrd_filename:InDelivers:AVERAGE";
$rrd_options .= " DEF:InReceives=$rrd_filename:InReceives:AVERAGE";
$rrd_options .= " DEF:InDiscards=$rrd_filename:InDiscards:AVERAGE";
$rrd_options .= " DEF:OutForwDatagrams=$rrd_filename:OutForwDatagrams:AVERAGE";
$rrd_options .= " CDEF:OutForwDatagrams_n=OutForwDatagrams,-1,*";
$rrd_options .= " DEF:OutRequests=$rrd_filename:OutRequests:AVERAGE";
$rrd_options .= " CDEF:OutRequests_n=OutRequests,-1,*";
$rrd_options .= " DEF:OutDiscards=$rrd_filename:OutDiscards:AVERAGE";
$rrd_options .= " CDEF:OutDiscards_n=OutDiscards,-1,*";
$rrd_options .= " DEF:OutNoRoutes=$rrd_filename:InDiscards:AVERAGE";
$rrd_options .= " CDEF:OutNoRoutes_n=OutNoRoutes,-1,*";
$rrd_options .= " COMMENT:'Packets/sec Current Average Maximum\\n'";
$rrd_options .= " LINE1.25:InReceives#7D9B5B:'InReceives v4'";
$rrd_options .= " GPRINT:InReceives:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InReceives:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InReceives:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:InForwDatagrams#AF63AF:'InForward v4'";
$rrd_options .= " GPRINT:InForwDatagrams:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InForwDatagrams:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InForwDatagrams:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:InDelivers#CDEB8B:'InDelivers v4':STACK";
$rrd_options .= " GPRINT:InDelivers:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InDelivers:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InDelivers:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:OutRequests_n#C3D9FF:'OutRequests v4'";
$rrd_options .= " GPRINT:OutRequests:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:OutRequests:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:OutRequests:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:OutForwDatagrams#AF63AF:'OutForward v4'";
$rrd_options .= " GPRINT:OutForwDatagrams:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:OutForwDatagrams:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:OutForwDatagrams:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:InReceives#9DaB6B:";
$rrd_options .= " LINE1.25:OutRequests_n#93a6eF:";
?>

View File

@ -0,0 +1,53 @@
<?php
include("common.inc.php");
$device = device_by_id_cache($id);
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
$rrd_options .= " DEF:InForwDatagrams=$rrd_filename:InForwDatagrams:AVERAGE";
$rrd_options .= " DEF:InDelivers=$rrd_filename:InDelivers:AVERAGE";
$rrd_options .= " DEF:InReceives=$rrd_filename:InReceives:AVERAGE";
$rrd_options .= " DEF:InDiscards=$rrd_filename:InDiscards:AVERAGE";
$rrd_options .= " DEF:OutForwDatagrams=$rrd_filename:OutForwDatagrams:AVERAGE";
$rrd_options .= " CDEF:OutForwDatagrams_n=OutForwDatagrams,-1,*";
$rrd_options .= " DEF:OutRequests=$rrd_filename:OutRequests:AVERAGE";
$rrd_options .= " CDEF:OutRequests_n=OutRequests,-1,*";
$rrd_options .= " DEF:OutDiscards=$rrd_filename:OutDiscards:AVERAGE";
$rrd_options .= " CDEF:OutDiscards_n=OutDiscards,-1,*";
$rrd_options .= " DEF:OutNoRoutes=$rrd_filename:InDiscards:AVERAGE";
$rrd_options .= " CDEF:OutNoRoutes_n=OutNoRoutes,-1,*";
$rrd_options .= " COMMENT:'Packets/sec Current Average Maximum\\n'";
$rrd_options .= " LINE1.25:InReceives#7D9B5B:'InReceives v6'";
$rrd_options .= " GPRINT:InReceives:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InReceives:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InReceives:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:InForwDatagrams#AF63AF:'InForward v6'";
$rrd_options .= " GPRINT:InForwDatagrams:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InForwDatagrams:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InForwDatagrams:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:InDelivers#CDEB8B:'InDelivers v6':STACK";
$rrd_options .= " GPRINT:InDelivers:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:InDelivers:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:InDelivers:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:OutRequests_n#C3D9FF:'OutRequests v6'";
$rrd_options .= " GPRINT:OutRequests:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:OutRequests:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:OutRequests:MAX:%6.2lf%s\\\\n";
$rrd_options .= " AREA:OutForwDatagrams#AF63AF:'OutForward v6'";
$rrd_options .= " GPRINT:OutForwDatagrams:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:OutForwDatagrams:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:OutForwDatagrams:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:InReceives#9DaB6B:";
$rrd_options .= " LINE1.25:OutRequests_n#93a6eF:";
?>

View File

@ -0,0 +1,64 @@
<?php
include("common.inc.php");
$device = device_by_id_cache($id);
$rrd_filename = $config['rrd_dir'] . "/" . $device['hostname'] . "/ipSystemStats-ipv6.rrd";
$rrd_options .= " DEF:ipInDelivers=$rrd_filename:InDelivers:AVERAGE";
$rrd_options .= " DEF:ipReasmReqds=$rrd_filename:ReasmReqds:AVERAGE";
$rrd_options .= " DEF:ipReasmOKs=$rrd_filename:ReasmOKs:AVERAGE";
$rrd_options .= " DEF:ipReasmFails=$rrd_filename:ReasmFails:AVERAGE";
$rrd_options .= " DEF:ipFragFails=$rrd_filename:OutFragFails:AVERAGE";
$rrd_options .= " DEF:ipFragCreates=$rrd_filename:OutFragCreates:AVERAGE";
$rrd_options .= " DEF:MipInDelivers=$rrd_filename:InDelivers:MAX";
$rrd_options .= " DEF:MipReasmOKs=$rrd_filename:ReasmOKs:MAX";
$rrd_options .= " DEF:MipReasmReqds=$rrd_filename:ReasmReqds:MAX";
$rrd_options .= " DEF:MipReasmFails=$rrd_filename:ReasmFails:MAX";
$rrd_options .= " DEF:MipFragFails=$rrd_filename:OutFragFails:MAX";
$rrd_options .= " DEF:MipFragCreates=$rrd_filename:OutFragCreates:MAX";
$rrd_options .= " CDEF:ReasmReqds=ipReasmReqds,ipInDelivers,/,100,*";
$rrd_options .= " CDEF:ReasmOKs=ipReasmOKs,ipInDelivers,/,100,*";
$rrd_options .= " CDEF:ReasmFails=ipReasmFails,ipInDelivers,/,100,*";
$rrd_options .= " CDEF:FragFails=ipFragFails,ipInDelivers,/,100,*";
$rrd_options .= " CDEF:FragCreates=ipFragCreates,ipInDelivers,/,100,*";
$rrd_options .= " CDEF:FragFails_n=FragFails,-1,*";
$rrd_options .= " CDEF:FragCreates_n=FragCreates,-1,*";
$rrd_options .= " CDEF:MReasmReqds=MipReasmReqds,MipInDelivers,/,100,*";
$rrd_options .= " CDEF:MReasmOKs=MipReasmOKs,MipInDelivers,/,100,*";
$rrd_options .= " CDEF:MReasmFails=MipReasmFails,MipInDelivers,/,100,*";
$rrd_options .= " CDEF:MFragFails=MipFragFails,MipInDelivers,/,100,*";
$rrd_options .= " CDEF:MFragCreates=MipFragCreates,MipInDelivers,/,100,*";
$rrd_options .= " COMMENT:'% ipInDelivers Current Average Maximum\\n'";
$rrd_options .= " LINE1.25:FragFails_n#cc0000:'Frag Fail '";
$rrd_options .= " GPRINT:FragFails:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:FragFails:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:MFragFails:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:FragCreates#00cc:'Frag Create '";
$rrd_options .= " GPRINT:FragCreates:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:FragCreates:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:MFragCreates:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:ReasmOKs#006600:'Reasm OK '";
$rrd_options .= " GPRINT:ReasmOKs:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:ReasmOKs:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:MReasmOKs:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:ReasmFails#660000:'Reasm Fail '";
$rrd_options .= " GPRINT:ReasmFails:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:ReasmFails:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:MReasmFails:MAX:%6.2lf%s\\\\n";
$rrd_options .= " LINE1.25:ReasmReqds#000066:'Reasm Reqd '";
$rrd_options .= " GPRINT:ReasmReqds:LAST:%6.2lf%s";
$rrd_options .= " GPRINT:ReasmReqds:AVERAGE:%6.2lf%s";
$rrd_options .= " GPRINT:MReasmReqds:MAX:%6.2lf%s\\\\n";
?>

View File

@ -1,11 +1,23 @@
<?php
if(is_file($config['rrd_dir'] . "/" . $device['hostname'] ."/ipSystemStats-ipv6.rrd")) {
$graph_title = "IPv4/IPv6 Statistics";
$graph_type = "device_ipSystemStats";
$graph_title = "IPv6 IP Packet Statistics";
$graph_type = "device_ipSystemStats_v6";
include ("includes/print-device-graph.php");
$graph_title = "IPv6 IP Fragmentation Statistics";
$graph_type = "device_ipSystemStats_v6_frag";
include ("includes/print-device-graph.php");
}
if(is_file($config['rrd_dir'] . "/" . $device['hostname'] ."/ipSystemStats-ipv4.rrd")) {
$graph_title = "IPv4 IP Packet Statistics";
$graph_type = "device_ipSystemStats_v4";
include ("includes/print-device-graph.php");
}
if(is_file($config['rrd_dir'] . "/" . $device['hostname'] ."/netstats-ip.rrd")) {
$graph_title = "IP Statistics";
$graph_type = "device_ip";

View File

@ -115,18 +115,19 @@ $config['overview_show_sysDescr'] = true;
### Poller/Discovery Modules
$config['enable_port_Xbcmc'] = 1; # Enable ifXEntry broadcast/multicast
$config['port_descr_parser'] = "includes/port-descr-parser.inc.php"; # Parse port descriptions into fields
$config['enable_bgp'] = 1; # Enable BGP session collection and display
$config['enable_syslog'] = 0; # Enable Syslog
$config['enable_billing'] = 0; # Enable Billing
$config['enable_inventory'] = 1; # Enable Inventory
$config['enable_etherlike'] = 1; # Enable Etherlike
$config['enable_port_Xbcmc'] = 1; # Enable ifXEntry broadcast/multicast
$config['enable_pseudowires'] = 1; # Enable Pseudowires
$config['enable_ports_junoseatmvp'] = 0; # Enable JunOSe ATM VC Discovery/Poller
$config['enable_ports_etherlike'] = 0; # Enable Polling EtherLike-MIB (doubles interface processing time)
$config['enable_printers'] = 0; # Enable Printer support
### Ports extension modules
$config['port_descr_parser'] = "includes/port-descr-parser.inc.php"; # Parse port descriptions into fields
$config['enable_ports_Xbcmc'] = 1; # Enable ifXEntry broadcast/multicast
$config['enable_ports_etherlike'] = 0; # Enable Polling EtherLike-MIB (doubles interface processing time)
$config['enable_ports_junoseatmvp'] = 0; # Enable JunOSe ATM VC Discovery/Poller
$config['enable_ports_adsl'] = 1; # Enable ADSL-LINE-MIB
### External Integration

View File

@ -1,5 +1,52 @@
<?php
#IP-MIB::ipSystemStatsInReceives.ipv4 = Counter32: 1062322382
#IP-MIB::ipSystemStatsInReceives.ipv6 = Counter32: 5229983
#IP-MIB::ipSystemStatsHCInReceives.ipv4 = Counter64: 1062322382
#IP-MIB::ipSystemStatsHCInReceives.ipv6 = Counter64: 5229983
#IP-MIB::ipSystemStatsHCInOctets.ipv4 = Counter64: 0
#IP-MIB::ipSystemStatsHCInOctets.ipv6 = Counter64: 0
#IP-MIB::ipSystemStatsInHdrErrors.ipv4 = Counter32: 199
#IP-MIB::ipSystemStatsInHdrErrors.ipv6 = Counter32: 0
#IP-MIB::ipSystemStatsInAddrErrors.ipv4 = Counter32: 0
#IP-MIB::ipSystemStatsInAddrErrors.ipv6 = Counter32: 0
#IP-MIB::ipSystemStatsInUnknownProtos.ipv4 = Counter32: 1
#IP-MIB::ipSystemStatsInUnknownProtos.ipv6 = Counter32: 0
#IP-MIB::ipSystemStatsInForwDatagrams.ipv4 = Counter32: 4350883
#IP-MIB::ipSystemStatsInForwDatagrams.ipv6 = Counter32: 0
#IP-MIB::ipSystemStatsHCInForwDatagrams.ipv4 = Counter64: 4350883
#IP-MIB::ipSystemStatsHCInForwDatagrams.ipv6 = Counter64: 0
#IP-MIB::ipSystemStatsReasmReqds.ipv4 = Counter32: 0
#IP-MIB::ipSystemStatsReasmReqds.ipv6 = Counter32: 0
#IP-MIB::ipSystemStatsReasmOKs.ipv4 = Counter32: 573
#IP-MIB::ipSystemStatsReasmOKs.ipv6 = Counter32: 191
#IP-MIB::ipSystemStatsReasmFails.ipv4 = Counter32: 2
#IP-MIB::ipSystemStatsReasmFails.ipv6 = Counter32: 0
#IP-MIB::ipSystemStatsInDiscards.ipv4 = Counter32: 0
#IP-MIB::ipSystemStatsInDiscards.ipv6 = Counter32: 0
#IP-MIB::ipSystemStatsInDelivers.ipv4 = Counter32: 1053500708
#IP-MIB::ipSystemStatsInDelivers.ipv6 = Counter32: 5229756
#IP-MIB::ipSystemStatsHCInDelivers.ipv4 = Counter64: 1053500708
#IP-MIB::ipSystemStatsHCInDelivers.ipv6 = Counter64: 5229756
#IP-MIB::ipSystemStatsOutRequests.ipv4 = Counter32: 874021272
#IP-MIB::ipSystemStatsOutRequests.ipv6 = Counter32: 5157066
#IP-MIB::ipSystemStatsHCOutRequests.ipv4 = Counter64: 874021272
#IP-MIB::ipSystemStatsHCOutRequests.ipv6 = Counter64: 5157066
#IP-MIB::ipSystemStatsOutNoRoutes.ipv4 = Counter32: 1
#IP-MIB::ipSystemStatsOutNoRoutes.ipv6 = Counter32: 0
#IP-MIB::ipSystemStatsHCOutForwDatagrams.ipv4 = Counter64: 0
#IP-MIB::ipSystemStatsHCOutForwDatagrams.ipv6 = Counter64: 0
#IP-MIB::ipSystemStatsOutDiscards.ipv4 = Counter32: 205
#IP-MIB::ipSystemStatsOutDiscards.ipv6 = Counter32: 0
#IP-MIB::ipSystemStatsOutFragFails.ipv4 = Counter32: 0
#IP-MIB::ipSystemStatsOutFragFails.ipv6 = Counter32: 0
#IP-MIB::ipSystemStatsOutFragCreates.ipv4 = Counter32: 0
#IP-MIB::ipSystemStatsOutFragCreates.ipv6 = Counter32: 68
#IP-MIB::ipSystemStatsDiscontinuityTime.ipv4 = Timeticks: (0) 0:00:00.00
#IP-MIB::ipSystemStatsDiscontinuityTime.ipv6 = Timeticks: (0) 0:00:00.00
#IP-MIB::ipSystemStatsRefreshRate.ipv4 = Gauge32: 30000 milli-seconds
#IP-MIB::ipSystemStatsRefreshRate.ipv6 = Gauge32: 30000 milli-seconds
echo("Polling IP-MIB ipSystemStats ");
$ipSystemStats = snmpwalk_cache_oid("ipSystemStats", $device, $ipSystemStats, "IP-MIB");
@ -15,10 +62,11 @@
'ipSystemStatsReasmOKs','ipSystemStatsReasmFails','ipSystemStatsInDiscards','ipSystemStatsInDelivers','ipSystemStatsOutRequests','ipSystemStatsOutNoRoutes','ipSystemStatsOutDiscards',
'ipSystemStatsOutFragFails','ipSystemStatsOutFragCreates','ipSystemStatsOutForwDatagrams');
if(isset($stats['ipSystemStatsHCInReceives'])) { $stats['ipSystemStatsInReceives'] = $stats['ipSystemStatsHCInReceives']; }
if(isset($stats['ipSystemStatsHCInForwDatagrams'])) { $stats['ipSystemStatsInForwDatagrams'] = $stats['ipSystemStatsHCInForwDatagrams']; }
if(isset($stats['ipSystemStatsHCInDelivers'])) { $stats['ipSystemStatsInDelivers'] = $stats['ipSystemStatsHCInDelivers']; }
if(isset($stats['ipSystemStatsHCOutRequests'])) { $stats['ipSystemStatsOutRequests'] = $stats['ipSystemStatsHCOutRequests']; }
### Use HC counters instead if they're available.
if(isset($stats['ipSystemStatsHCInReceives'])) { $stats['ipSystemStatsInReceives'] = $stats['ipSystemStatsHCInReceives']; }
if(isset($stats['ipSystemStatsHCInForwDatagrams'])) { $stats['ipSystemStatsInForwDatagrams'] = $stats['ipSystemStatsHCInForwDatagrams']; }
if(isset($stats['ipSystemStatsHCInDelivers'])) { $stats['ipSystemStatsInDelivers'] = $stats['ipSystemStatsHCInDelivers']; }
if(isset($stats['ipSystemStatsHCOutRequests'])) { $stats['ipSystemStatsOutRequests'] = $stats['ipSystemStatsHCOutRequests']; }
if(isset($stats['ipSystemStatsHCOutForwDatagrams'])) { $stats['ipSystemStatsOutForwDatagrams'] = $stats['ipSystemStatsHCOutForwDatagrams']; }
unset($snmpstring, $rrdupdate, $snmpdata, $snmpdata_cmd, $rrd_create);
@ -34,14 +82,12 @@
$oid_ds = str_replace("ipSystemStats", "", $oid);
$oid_ds = truncate($oid_ds, 19, '');
$rrd_create .= " DS:$oid_ds:COUNTER:600:U:100000000000";
$snmpstring .= " $oid.0";
if(strstr($stats[$oid], "No") || strstr($stats[$oid], "d") || strstr($stats[$oid], "s")) { $stats[$oid] = "0"; }
$rrdupdate .= ":".$stats[$oid];
}
if(!file_exists($rrdfile)) { shell_exec($rrd_create); }
rrdtool_update($rrdfile, $rrdupdate);
unset($snmpstring, $rrdupdate, $snmpdata, $snmpdata_cmd, $rrd_create);
unset($rrdupdate, $rrd_create);
}
}

View File

@ -4,6 +4,8 @@ if($device[os] != "Snom") {
echo("Polling device network statistics...\n");
#### These are at the start of large trees that we don't want to walk the entirety of, so we snmpget_multi them
$oids['ip'] = array ('ipForwDatagrams','ipInDelivers','ipInReceives','ipOutRequests','ipInDiscards','ipOutDiscards','ipOutNoRoutes',
'ipReasmReqds','ipReasmOKs','ipReasmFails','ipFragOKs','ipFragFails','ipFragCreates', 'ipInUnknownProtos',
'ipInHdrErrors', 'ipInAddrErrors');
@ -17,6 +19,8 @@ if($device[os] != "Snom") {
$oids['tcp_collect'][] = 'tcpHCInSegs';
$oids['tcp_collect'][] = 'tcpHCOutSegs';
#### Below have more oids, and are in trees by themselves, so we can snmpwalk_cache_oid them
$oids['icmp'] = array('icmpInMsgs','icmpOutMsgs','icmpInErrors','icmpOutErrors','icmpInEchos','icmpOutEchos','icmpInEchoReps',
'icmpOutEchoReps','icmpInDestUnreachs','icmpOutDestUnreachs','icmpInParmProbs','icmpInTimeExcds',
'icmpInSrcQuenchs','icmpInRedirects','icmpInTimestamps','icmpInTimestampReps','icmpInAddrMasks',

View File

@ -206,7 +206,7 @@
$ret = rrdtool_update("$rrdfile", $if_rrd_update);
if($config['enable_port_Xbcmc'] && $config['os'][$device['os']]['ifXmcbc']) {
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);