mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fenner be quiet

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2264 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-05-06 14:04:53 +00:00
parent 4a2004a53a
commit a5a2ecf990
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
discovery.php
View File

@@ -22,9 +22,12 @@ $runtime_stats = array();
### Observium Device Discovery ### Observium Device Discovery
echo("Observium v".$config['version']." Discovery\n\n"); $options = getopt("h:m:i:n:d::a::q");
$options = getopt("h:m:i:n:d::a::"); if (!isset($options['q']))
{
echo("Observium v".$config['version']." Discovery\n\n");
}
if (isset($options['h'])) if (isset($options['h']))
{ {
@@ -240,7 +243,7 @@ if ($discovered_devices)
$string = $argv[0] . " $doing " . date("F j, Y, G:i") . " - $discovered_devices devices discovered in $proctime secs"; $string = $argv[0] . " $doing " . date("F j, Y, G:i") . " - $discovered_devices devices discovered in $proctime secs";
if ($debug) echo("$string\n"); if ($debug) echo("$string\n");
if($config['version_check']) { if($config['version_check'] && !isset($options['q'])) {
include("includes/versioncheck.inc.php"); include("includes/versioncheck.inc.php");
} }

20
includes/polling/ports.inc.php
View File

@@ -73,6 +73,22 @@ if ($device['adsl_count'] > "0")
$port_stats = snmpwalk_cache_oid($device, ".1.3.6.1.2.1.10.94.1.1.7.1.7", $port_stats, "ADSL-LINE-MIB"); $port_stats = snmpwalk_cache_oid($device, ".1.3.6.1.2.1.10.94.1.1.7.1.7", $port_stats, "ADSL-LINE-MIB");
} }
## Alcatel Detailed Statistics ## FIXME make this disableable
if($device['os'] == "aos") {
$stat_oids = array('alcetherStatsCRCAlignErrors', 'alcetherStatsRxUndersizePkts','alcetherStatsTxUndersizePkts', 'alcetherStatsTxOversizePkts','alcetherStatsRxJabbers', 'alcetherStatsRxCollisions', 'alcetherStatsTxCollisions',
'alcetherStatsPkts64Octets','alcetherStatsPkts65to127Octets', 'alcetherStatsPkts128to255Octets','alcetherStatsPkts256to511Octets','alcetherStatsPkts512to1023Octets','alcetherStatsPkts1024to1518Octets',
'gigaEtherStatsPkts1519to4095Octets','gigaEtherStatsPkts4096to9215Octets','alcetherStatsPkts1519to2047Octets','alcetherStatsPkts2048to4095Octets','alcetherStatsPkts4096Octets','alcetherStatsRxGiantPkts',
'alcetherStatsRxDribbleNibblePkts','alcetherStatsRxLongEventPkts','alcetherStatsRxVlanTagPkts','alcetherStatsRxControlPkts','alcetherStatsRxLenChkErrPkts','alcetherStatsRxCodeErrPkts','alcetherStatsRxDvEventPkts',
'alcetherStatsRxPrevPktDropped','alcetherStatsTx64Octets','alcetherStatsTx65to127Octets','alcetherStatsTx128to255Octets','alcetherStatsTx256to511Octets','alcetherStatsTx512to1023Octets',
'alcetherStatsTx1024to1518Octets','alcetherStatsTx1519to2047Octets','alcetherStatsTx2048to4095Octets','alcetherStatsTx4096Octets','alcetherStatsTxRetryCount','alcetherStatsTxVlanTagPkts',
'alcetherStatsTxControlPkts','alcetherStatsTxLatePkts','alcetherStatsTxTotalBytesOnWire','alcetherStatsTxLenChkErrPkts','alcetherStatsTxExcDeferPkts');
foreach($stat_oids as $oid)
{
$port_stats = snmpwalk_cache_oid($device, "alcetherStatsEntry", $port_stats, "ALCATEL-IND1-PORT-MIB");
}
}
echo("\n"); echo("\n");
/// FIXME This probably needs re-enabled. We need to clear these things when they get unset, too. /// FIXME This probably needs re-enabled. We need to clear these things when they get unset, too.
@@ -288,6 +304,10 @@ while ($port = mysql_fetch_assoc($port_query))
/// Do PoE MIBs /// Do PoE MIBs
if ($config['enable_ports_poe']) { include("port-poe.inc.php"); } if ($config['enable_ports_poe']) { include("port-poe.inc.php"); }
/// Do Alcatel Detailed Stats
if($device['os'] == "aos") { include("port-alcatel.inc.php"); }
// Update MySQL // Update MySQL
if ($update) if ($update)
{ {