From b87ef3765e73f3521b25921b83865317631c46b8 Mon Sep 17 00:00:00 2001 From: Dean Hamstead Date: Tue, 6 Dec 2011 15:44:13 +1100 Subject: [PATCH] bury all dead whitespace, better off to just do it in one command. i wonder why ss cant work this out? --- src/lib/Torrus/ACL/Edit.pm | 10 +-- src/lib/Torrus/Collector/CDef.pm | 6 +- src/lib/Torrus/Collector/CDef_Params.pm | 6 +- src/lib/Torrus/Collector/ExtDBI.pm | 6 +- src/lib/Torrus/Collector/RRDStorage.pm | 42 +++++----- src/lib/Torrus/Collector/SNMP.pm | 2 +- src/lib/Torrus/Collector/SNMP_Params.pm | 2 +- src/lib/Torrus/DevDiscover/ATMEL.pm | 18 ++-- src/lib/Torrus/DevDiscover/Alteon.pm | 18 ++-- src/lib/Torrus/DevDiscover/Apple_AE.pm | 2 +- src/lib/Torrus/DevDiscover/Arista.pm | 4 +- src/lib/Torrus/DevDiscover/AscendMax.pm | 2 +- src/lib/Torrus/DevDiscover/AxxessIT.pm | 68 +++++++-------- src/lib/Torrus/DevDiscover/BetterNetworks.pm | 20 ++--- src/lib/Torrus/DevDiscover/CCOM.pm | 10 +-- src/lib/Torrus/DevDiscover/CasaCMTS.pm | 62 +++++++------- src/lib/Torrus/DevDiscover/CiscoCatOS.pm | 8 +- src/lib/Torrus/DevDiscover/CiscoFirewall.pm | 6 +- src/lib/Torrus/DevDiscover/CiscoIOS_Docsis.pm | 42 +++++----- .../Torrus/DevDiscover/CiscoIOS_MacAccounting.pm | 20 ++--- src/lib/Torrus/DevDiscover/CiscoSCE.pm | 68 +++++++-------- src/lib/Torrus/DevDiscover/CiscoVDSL.pm | 2 +- src/lib/Torrus/DevDiscover/CompaqCIM.pm | 2 +- src/lib/Torrus/DevDiscover/DevDetails.pm | 2 +- src/lib/Torrus/DevDiscover/EmpireSystemedge.pm | 8 +- src/lib/Torrus/DevDiscover/Foundry.pm | 96 +++++++++++----------- src/lib/Torrus/DevDiscover/Jacarta.pm | 42 +++++----- src/lib/Torrus/DevDiscover/MicrosoftWindows.pm | 12 +-- src/lib/Torrus/DevDiscover/MotorolaBSR.pm | 42 +++++----- src/lib/Torrus/DevDiscover/NetScreen.pm | 10 +-- src/lib/Torrus/DevDiscover/NexComm.pm | 8 +- src/lib/Torrus/DevDiscover/OracleDatabase.pm | 14 ++-- src/lib/Torrus/DevDiscover/Paradyne.pm | 8 +- src/lib/Torrus/DevDiscover/Patton.pm | 8 +- src/lib/Torrus/DevDiscover/PowerNet.pm | 2 +- src/lib/Torrus/DevDiscover/RFC1628_UPS_MIB.pm | 4 +- src/lib/Torrus/DevDiscover/RFC1697_RDBMS.pm | 6 +- src/lib/Torrus/DevDiscover/RFC2011_IP_MIB.pm | 6 +- src/lib/Torrus/DevDiscover/RFC2670_DOCS_IF.pm | 32 ++++---- .../Torrus/DevDiscover/RFC2790_HOST_RESOURCES.pm | 10 +-- src/lib/Torrus/DevDiscover/Symmetricom.pm | 6 +- src/lib/Torrus/DevDiscover/Thomson_xDSL.pm | 8 +- src/lib/Torrus/DevDiscover/UcdSnmp.pm | 4 +- src/lib/Torrus/DevDiscover/Xylan.pm | 2 +- src/lib/Torrus/ReportGenerator/MonthlySrvUsage.pm | 22 ++--- src/lib/Torrus/SQL/ReportFields.pm | 20 ++--- 46 files changed, 399 insertions(+), 399 deletions(-) diff --git a/src/lib/Torrus/ACL/Edit.pm b/src/lib/Torrus/ACL/Edit.pm index ab1eca8..54a2932 100644 --- a/src/lib/Torrus/ACL/Edit.pm +++ b/src/lib/Torrus/ACL/Edit.pm @@ -582,9 +582,9 @@ sub exportACL my $self = shift; my $exportfile = shift; my $exporttemplate = shift; - - my $ok = - eval( 'require Torrus::ACL::Export;' . + + my $ok = + eval( 'require Torrus::ACL::Export;' . 'Torrus::ACL::Export::exportACL($self, $exportfile,'. '$exporttemplate)' ); if( $@ ) @@ -604,9 +604,9 @@ sub importACL my $importfile = shift; my $ok = - eval('require Torrus::ACL::Import;' . + eval('require Torrus::ACL::Import;' . 'Torrus::ACL::Import::importACL($self, $importfile)'); - + if( $@ ) { Error($@); diff --git a/src/lib/Torrus/Collector/CDef.pm b/src/lib/Torrus/Collector/CDef.pm index f60e370..ccd3bf0 100644 --- a/src/lib/Torrus/Collector/CDef.pm +++ b/src/lib/Torrus/Collector/CDef.pm @@ -78,11 +78,11 @@ sub runCollector # By default, try to get the data from one period behind my $defaultAccessTime = $now - ( $now % $collector->period() ) + $collector->offset(); - + for my $token ( @{$cref->{'crefTokens'}} ) { &Torrus::DB::checkInterrupted(); - + my $accessTime = $defaultAccessTime - ( $collector->period() * $collector->param( $token, 'cdef-collector-delay' ) ); @@ -90,7 +90,7 @@ sub runCollector # The RRDtool is non-reentrant, and we need to be careful # when running multiple threads Torrus::Collector::RRDStorage::semaphoreDown(); - + my ($value, $timestamp) = $da->read_RPN( $config_tree, $token, $collector->param( $token, 'rpn-expr' ), diff --git a/src/lib/Torrus/Collector/CDef_Params.pm b/src/lib/Torrus/Collector/CDef_Params.pm index b544bd1..ad17d6d 100644 --- a/src/lib/Torrus/Collector/CDef_Params.pm +++ b/src/lib/Torrus/Collector/CDef_Params.pm @@ -49,17 +49,17 @@ my %admInfoParamCategories = ( 'cdef-collector-delay' => 'CDef_Collector', 'cdef-collector-tolerance' => 'CDef_Collector', - ); + ); sub initAdmInfo { my $map = shift; my $categories = shift; - + $map->{'ds-type'}{'collector'}{'collector-type'}{'cdef'} = \%params; - + while( my ($pname, $category) = each %admInfoParamCategories ) { $categories->{$pname} = $category; diff --git a/src/lib/Torrus/Collector/ExtDBI.pm b/src/lib/Torrus/Collector/ExtDBI.pm index e96f710..6720f10 100644 --- a/src/lib/Torrus/Collector/ExtDBI.pm +++ b/src/lib/Torrus/Collector/ExtDBI.pm @@ -64,7 +64,7 @@ sub backendInit sub backendOpenSession { $dbh = Torrus::SQL::SrvExport->dbh( $subtype ); - + if( defined( $dbh ) ) { $sth = $dbh->prepare( Torrus::SQL::SrvExport->sqlInsertStatement() ); @@ -83,7 +83,7 @@ sub backendStoreData my $serviceid = shift; my $value = shift; my $interval = shift; - + if( defined( $dbh ) and defined( $sth ) ) { my $datestr = time2str('%Y-%m-%d', $timestamp); @@ -123,7 +123,7 @@ sub backendCloseSession } - + 1; diff --git a/src/lib/Torrus/Collector/RRDStorage.pm b/src/lib/Torrus/Collector/RRDStorage.pm index e6e0eba..623793f 100644 --- a/src/lib/Torrus/Collector/RRDStorage.pm +++ b/src/lib/Torrus/Collector/RRDStorage.pm @@ -148,7 +148,7 @@ sub storeData { $collector->setStatValue( 'RRDQueue', $thrUpdateQueue->pending() ); } - + if( $threadsInUse and $thrUpdateQueue->pending() > $thrQueueLimit ) { Error('Cannot enqueue RRD files for updating: ' . @@ -159,12 +159,12 @@ sub storeData while( my ($filename, $tokens) = each %{$sref->{'byfile'}} ) { &Torrus::DB::checkInterrupted(); - + if( not -e $filename ) { createRRD( $collector, $sref, $filename, $tokens ); } - + if( -e $filename ) { updateRRD( $collector, $sref, $filename, $tokens ); @@ -178,7 +178,7 @@ sub storeData sub semaphoreDown -{ +{ if( $threadsInUse ) { $rrdtoolSemaphore->down(); @@ -310,11 +310,11 @@ sub createRRD sprintf( '--step=%d', $step ) ); &Torrus::DB::checkInterrupted(); - + Debug("Creating RRD $filename: " . join(" ", @OPT, @DS, @RRA)); semaphoreDown(); - + RRDs::create($filename, @OPT, @DS, @@ -325,7 +325,7 @@ sub createRRD semaphoreUp(); Error("ERROR creating $filename: $err") if $err; - + delete $sref->{'rrdinfo_ds'}{$filename}; return; } @@ -344,7 +344,7 @@ sub updateRRD $sref->{'rrdinfo_ds'}{$filename} = $ref; semaphoreDown(); - + my $rrdinfo = RRDs::info( $filename ); semaphoreUp(); @@ -356,7 +356,7 @@ sub updateRRD $ref->{$1} = 1; } } - + &Torrus::DB::checkInterrupted(); } @@ -398,12 +398,12 @@ sub updateRRD Error($filename . 'is not a regular file'); return; } - + my( $sec, $min, $hour, $mday, $mon, $year) = localtime( time() ); my $destfile = sprintf('%s_%04d%02d%02d%02d%02d', $filename, $year + 1900, $mon+1, $mday, $hour, $min); - + my $destdir = $conflictRRDPath; if( defined( $destdir ) and -d $destdir ) { @@ -416,12 +416,12 @@ sub updateRRD ' to ' . $destfile); rename( $filename, $destfile ) or Error("Cannot rename $filename to $destfile: $!"); - + delete $sref->{'rrdinfo_ds'}{$filename}; - + createRRD( $collector, $sref, $filename, $tokens ); } - + if( scalar( keys %ds_updating ) == 0 ) { Error("No datasources to update in $filename"); @@ -442,7 +442,7 @@ sub updateRRD my $step = $collector->period(); my $has_values = 0; - + for my $ds ( keys %ds_updating ) { my $token = $ds_updating{$ds}; @@ -478,7 +478,7 @@ sub updateRRD { return; } - + # Get the average timestamp my $sum = 0; map {$sum += $_} @timestamps; @@ -508,7 +508,7 @@ sub updateRRD } Debug('Enqueueing update job for ' . $filename); - + my $cmdlist = &threads::shared::share([]); push( @{$cmdlist}, $filename, @cmd ); $thrUpdateQueue->enqueue( $cmdlist ); @@ -536,16 +536,16 @@ sub rrdUpdateThread { &Torrus::DB::setSafeSignalHandlers(); &Torrus::Log::setTID( threads->tid() ); - + my $cmdlist; &threads::shared::share( \$cmdlist ); - + while(1) { &Torrus::DB::checkInterrupted(); - + $cmdlist = $thrUpdateQueue->dequeue(); - + if( isDebug ) { Debug("Updating RRD: " . join(' ', @{$cmdlist})); diff --git a/src/lib/Torrus/Collector/SNMP.pm b/src/lib/Torrus/Collector/SNMP.pm index 2dec83d..5fb501e 100644 --- a/src/lib/Torrus/Collector/SNMP.pm +++ b/src/lib/Torrus/Collector/SNMP.pm @@ -864,7 +864,7 @@ sub deleteTarget if( scalar(keys %{$cref->{'targets'}{$hosthash}{$oid}}) == 0 ) { delete $cref->{'targets'}{$hosthash}{$oid}; - + if( scalar(keys %{$cref->{'targets'}{$hosthash}}) == 0 ) { delete $cref->{'targets'}{$hosthash}; diff --git a/src/lib/Torrus/Collector/SNMP_Params.pm b/src/lib/Torrus/Collector/SNMP_Params.pm index c4216fe..22f7550 100644 --- a/src/lib/Torrus/Collector/SNMP_Params.pm +++ b/src/lib/Torrus/Collector/SNMP_Params.pm @@ -171,7 +171,7 @@ sub initAdmInfo { $categories->{$pname} = $category; } - + return; } diff --git a/src/lib/Torrus/DevDiscover/ATMEL.pm b/src/lib/Torrus/DevDiscover/ATMEL.pm index af0dd72..80bdbeb 100644 --- a/src/lib/Torrus/DevDiscover/ATMEL.pm +++ b/src/lib/Torrus/DevDiscover/ATMEL.pm @@ -54,7 +54,7 @@ sub checkdevtype { return 0; } - + return 1; } @@ -71,18 +71,18 @@ sub discover 'bridgeRemoteBridgeBSSID', ); - my $deviceInfo = substr($info->{'sysDeviceInfo'},2); + my $deviceInfo = substr($info->{'sysDeviceInfo'},2); my $bridgeName = $info->{'operAccessPointName'}; - + #Get rid of all the nulls returned. $bridgeName =~ s/\000//g; - + $data->{'param'}{'comment'} = $bridgeName; my $bridgeMode = $info->{'bridgeOperationalMode'}; my $remoteMac = substr($info->{'bridgeRemoteBridgeBSSID'},2); - + $remoteMac =~ s/(\w\w)/$1-/g; $remoteMac = substr($remoteMac,0,-1); @@ -91,12 +91,12 @@ sub discover my ($version,$macaddr,$reserved,$regdomain,$producttype,$oemname,$oemid, $productname,$hardwarerev) = unpack("LH12SLLA32LA32L", pack("H*", $deviceInfo)); - + $macaddr =~ s/(\w\w)/$1-/g; $macaddr = substr($macaddr,0,-1); - + $data->{'param'}{'comment'} = $bridgeName; - + if ($productname =~ m/airPoint/) { #we have an access point @@ -131,7 +131,7 @@ sub discover } #disable SNMP uptime check $data->{'param'}{'snmp-check-sysuptime'} = 'no'; - + return 1; } diff --git a/src/lib/Torrus/DevDiscover/Alteon.pm b/src/lib/Torrus/DevDiscover/Alteon.pm index c67b4d5..3af1ca8 100644 --- a/src/lib/Torrus/DevDiscover/Alteon.pm +++ b/src/lib/Torrus/DevDiscover/Alteon.pm @@ -68,7 +68,7 @@ sub checkdevtype { return 0; } - + $devdetails->setCap('interfaceIndexingPersistent'); return 1; @@ -97,7 +97,7 @@ sub discover # PROG: Discover slbStatVServerIndex (Virtual Server index) my $virtTable = $session->get_table ( -baseoid => $dd->oiddef('slbStatVServerIndex') ); - $devdetails->storeSnmpVars( $virtTable ); + $devdetails->storeSnmpVars( $virtTable ); for my $virtIndex ( $devdetails->getSnmpIndices( $dd->oiddef('slbStatVServerIndex') ) ) { @@ -110,7 +110,7 @@ sub discover $session->get_table ( -baseoid => $dd->oiddef('slbStatPortMaintPortIndex') ); $devdetails->storeSnmpVars( $maintTable ); - + for my $mIndex ( $devdetails->getSnmpIndices ( $dd->oiddef('slbStatPortMaintPortIndex') ) ) @@ -118,7 +118,7 @@ sub discover Debug("Alteon::maintTable Index: $mIndex"); $data->{'MAINT'}{$mIndex} = 1; } - + return 1; } @@ -145,22 +145,22 @@ sub buildConfig { $cb->addSubtree( $virtNode, 'VirtualHost_' . $virtIndex, { 'alteon-vserver-index' => $virtIndex }, - [ 'Alteon::alteon-vserver'] ); - } + [ 'Alteon::alteon-vserver'] ); + } # PROG: SLB Port Maintenance Statistics Table my $maintNode = $cb->addSubtree( $devNode, 'Port_Maintenance_Stats', { 'comment' => 'SLB port maintenance statistics' }, [ 'Alteon::alteon-maint-subtree'] ); - + for my $mIndex ( sort {$a <=> $b } keys %{$data->{'MAINT'}} ) { $cb->addSubtree( $maintNode, 'Port_' . $mIndex, { 'alteon-maint-index' => $mIndex }, - [ 'Alteon::alteon-maint'] ); + [ 'Alteon::alteon-maint'] ); } - + return; } diff --git a/src/lib/Torrus/DevDiscover/Apple_AE.pm b/src/lib/Torrus/DevDiscover/Apple_AE.pm index d8c82a6..49fc427 100644 --- a/src/lib/Torrus/DevDiscover/Apple_AE.pm +++ b/src/lib/Torrus/DevDiscover/Apple_AE.pm @@ -131,7 +131,7 @@ sub discover Debug("Apple_AE:: Client $wMAC / $wClient"); } - } + } } return 1; diff --git a/src/lib/Torrus/DevDiscover/Arista.pm b/src/lib/Torrus/DevDiscover/Arista.pm index 221dc92..c2c0d85 100644 --- a/src/lib/Torrus/DevDiscover/Arista.pm +++ b/src/lib/Torrus/DevDiscover/Arista.pm @@ -99,7 +99,7 @@ sub checkdevtype &Torrus::DevDiscover::RFC2863_IF_MIB::addInterfaceFilter ($devdetails, $interfaceFilter); - + if( defined( $interfaceFilterOverlay ) ) { &Torrus::DevDiscover::RFC2863_IF_MIB::addInterfaceFilter @@ -123,7 +123,7 @@ sub discover # PROG: Add comment for sysDescr my $desc = $dd->retrieveSnmpOIDs('sysDescr'); $data->{'param'}{'comment'} = $desc->{'sysDescr'}; - + return 1; } diff --git a/src/lib/Torrus/DevDiscover/AscendMax.pm b/src/lib/Torrus/DevDiscover/AscendMax.pm index 2a4bd45..9ed9af0 100644 --- a/src/lib/Torrus/DevDiscover/AscendMax.pm +++ b/src/lib/Torrus/DevDiscover/AscendMax.pm @@ -196,7 +196,7 @@ sub buildConfig $cb->addLeaf( $callStatsNode, $subtreeName, $param, ['AscendMax::ascend-line-stats']); } - + return; } diff --git a/src/lib/Torrus/DevDiscover/AxxessIT.pm b/src/lib/Torrus/DevDiscover/AxxessIT.pm index 3c74c20..24f2ed9 100644 --- a/src/lib/Torrus/DevDiscover/AxxessIT.pm +++ b/src/lib/Torrus/DevDiscover/AxxessIT.pm @@ -28,7 +28,7 @@ # Cisco ONS 15302 - + package Torrus::DevDiscover::AxxessIT; @@ -51,7 +51,7 @@ our %oiddef = ( # AXXEDGE-MIB 'axxEdgeTypes' => '1.3.6.1.4.1.7546.1.4.1.1', - + 'axxEdgeWanPortMapTable' => '1.3.6.1.4.1.7546.1.4.1.2.5.1.2', 'axxEdgeWanPortMapSlotNumber' => '1.3.6.1.4.1.7546.1.4.1.2.5.1.2.1.1', 'axxEdgeWanPortMapPortNumber' => '1.3.6.1.4.1.7546.1.4.1.2.5.1.2.1.2', @@ -59,10 +59,10 @@ our %oiddef = 'axxEdgeWanXPortMapTable' => '1.3.6.1.4.1.7546.1.4.1.2.5.1.11', 'axxEdgeWanXPortMapSlotNumber' => '1.3.6.1.4.1.7546.1.4.1.2.5.1.11.1.1', 'axxEdgeWanXPortMapPortNumber' => '1.3.6.1.4.1.7546.1.4.1.2.5.1.11.1.2', - + 'axxEdgeWanPortDescription' => '1.3.6.1.4.1.7546.1.4.1.2.5.1.3.1.4', 'axxEdgeWanXPortDescription' => '1.3.6.1.4.1.7546.1.4.1.2.5.1.12.1.4', - + 'axxEdgeEthPortMapTable' => '1.3.6.1.4.1.7546.1.4.1.2.6.1.2', 'axxEdgeEthPortMapSlotNumber' => '1.3.6.1.4.1.7546.1.4.1.2.6.1.2.1.1', 'axxEdgeEthPortMapPortNumber' => '1.3.6.1.4.1.7546.1.4.1.2.6.1.2.1.2', @@ -70,10 +70,10 @@ our %oiddef = 'axxEdgeEthLanXPortMapTable' => '1.3.6.1.4.1.7546.1.4.1.2.6.1.4', 'axxEdgeEthLanXPortMapSlotNumber' => '1.3.6.1.4.1.7546.1.4.1.2.6.1.4.1.1', 'axxEdgeEthLanXPortMapPortNumber' => '1.3.6.1.4.1.7546.1.4.1.2.6.1.4.1.2', - + 'axxEdgeEthPortDescription' => '1.3.6.1.4.1.7546.1.4.1.2.6.1.3.1.4', 'axxEdgeEthLanXPortDescription' => '1.3.6.1.4.1.7546.1.4.1.2.6.1.5.1.4', - + 'axxEdgeDcnManagementPortMode' => '1.3.6.1.4.1.7546.1.4.1.2.3.2.1.0', 'axxEdgeDcnManagementPortIfIndex' => '1.3.6.1.4.1.7546.1.4.1.2.3.2.2.0', @@ -124,7 +124,7 @@ sub discover my $session = $dd->session(); $data->{'param'}{'ifindex-map'} = '$IFIDX_IFINDEX'; - + $data->{'nameref'}{'ifNick'} = 'axxInterfaceNick'; $data->{'nameref'}{'ifSubtreeName'} = 'axxInterfaceNick'; $data->{'nameref'}{'ifComment'} = 'axxInterfaceComment'; @@ -150,7 +150,7 @@ sub discover 'ifNick' => 'WanX_%d_%d', 'ifHuman' => 'WANX %d/%d', 'ifComment' => 'WANX slot %d, port %d' }, - + 'Eth' => { 'MapTable' => 'axxEdgeEthPortMapTable', 'MapSlotNumber' => 'axxEdgeEthPortMapSlotNumber', @@ -159,7 +159,7 @@ sub discover 'ifNick' => 'Eth_%d_%d', 'ifHuman' => 'Ethernet %d/%d', 'ifComment' => 'Ethernet interface: slot %d, port %d' }, - + 'EthLanX' => { 'MapTable' => 'axxEdgeEthLanXPortMapTable', 'MapSlotNumber' => 'axxEdgeEthLanXPortMapSlotNumber', @@ -176,12 +176,12 @@ sub discover $session->get_table( -baseoid => $dd->oiddef($map{$type}{'MapTable'}) ); $devdetails->storeSnmpVars( $mapTable ); - + my $descTable = $session->get_table( -baseoid => $dd->oiddef($map{$type}{'Description'}) ); $devdetails->storeSnmpVars( $descTable ); - + for my $ifIndex ( $devdetails-> getSnmpIndices($dd->oiddef($map{$type}{'MapSlotNumber'})) ) @@ -195,30 +195,30 @@ sub discover my $port = $devdetails->snmpVar ($dd->oiddef($map{$type}{'MapPortNumber'}) .'.'. $ifIndex); - + my $desc = $devdetails->snmpVar ($dd->oiddef($map{$type}{'Description'}) .'.'. $slot .'.'. $port); - + $interface->{'param'}{'interface-index'} = $ifIndex; $interface->{'axxInterfaceNick'} = sprintf( $map{$type}{'ifNick'}, $slot, $port ); - + $interface->{'axxInterfaceHumanName'} = sprintf( $map{$type}{'ifHuman'}, $slot, $port ); $interface->{'axxInterfaceComment'} = sprintf( $map{$type}{'ifComment'}, $slot, $port ); - + if( defined($desc) and $desc ne '' ) { $interface->{'axxInterfaceComment'} .= ' (' . $desc . ')'; } } } - + # Management interface { my $result = $dd->retrieveSnmpOIDs @@ -234,9 +234,9 @@ sub discover else { my $ifIndex = $result->{'axxEdgeDcnManagementPortIfIndex'}; - + my $interface = $data->{'interfaces'}{$ifIndex}; - + $interface->{'param'}{'interface-index'} = $ifIndex; $interface->{'axxInterfaceNick'} = 'Management'; @@ -248,7 +248,7 @@ sub discover } } } - + if( $devdetails->hasCap('axx155E') ) { my $ethTable = @@ -270,29 +270,29 @@ sub discover my $portName = $devdetails->snmpVar ($dd->oiddef('axx155EEthPortName') .'.'. $port); - + my $portType = $devdetails->snmpVar ($dd->oiddef('axx155EEthPortType') .'.'. $port); $interface->{'param'}{'interface-index'} = $ifIndex; - + my $type = $portType == 1 ? 'Eth':'Wan'; - + $interface->{'axxInterfaceNick'} = sprintf( '%s_%d', $type, $port ); - + $interface->{'axxInterfaceHumanName'} = sprintf( '%s %d', $type, $port ); - + $interface->{'axxInterfaceComment'} = ''; - + if( defined($portName) and $portName ne '' ) { $interface->{'axxInterfaceComment'} = $portName; } } - + # Management interface { my $result = $dd->retrieveSnmpOIDs @@ -308,21 +308,21 @@ sub discover else { my $ifIndex = $result->{'axx155EDcnManagementPortIfIndex'}; - + my $interface = $data->{'interfaces'}{$ifIndex}; - + $interface->{'param'}{'interface-index'} = $ifIndex; - + $interface->{'axxInterfaceNick'} = 'Management'; - + $interface->{'axxInterfaceHumanName'} = 'Management'; - + $interface->{'axxInterfaceComment'} = 'Management port'; } } } } - + for my $ifIndex ( keys %{$data->{'interfaces'}} ) { if( not defined( $data->{'interfaces'}{$ifIndex}-> @@ -330,8 +330,8 @@ sub discover { delete $data->{'interfaces'}{$ifIndex}; } - } - + } + return 1; } diff --git a/src/lib/Torrus/DevDiscover/BetterNetworks.pm b/src/lib/Torrus/DevDiscover/BetterNetworks.pm index f763f33..23e452d 100644 --- a/src/lib/Torrus/DevDiscover/BetterNetworks.pm +++ b/src/lib/Torrus/DevDiscover/BetterNetworks.pm @@ -112,7 +112,7 @@ sub discover Error('Error retrieving Better Networks Ethernet Box device details'); return 0; } - + # sensor support my $sensorTable = $session->get_table( -baseoid => $dd->oiddef('BNEsensorTable') ); @@ -122,7 +122,7 @@ sub discover # store the sensor names to guarantee uniqueness my %sensorNames; - + for my $INDEX ( $devdetails->getSnmpIndices($dd->oiddef('BNEsensorName') ) ) { @@ -131,7 +131,7 @@ sub discover { next; } - + my $type = $devdetails->snmpVar( $dd->oiddef('BNEsensorType') . '.' . $INDEX ); my $name = $devdetails->snmpVar( $dd->oiddef('BNEsensorName') @@ -151,7 +151,7 @@ sub discover { $name .= sprintf(' %d', $sensorNames{$name}); } - + my $leafName = $name; $leafName =~ s/\W/_/g; @@ -160,7 +160,7 @@ sub discover 'node-display-name' => $name, 'precedence' => sprintf('%d', 1000 - $INDEX) }; - + if( defined( $sensorTypes{$type} ) ) { $param->{'comment'} = @@ -185,24 +185,24 @@ sub discover } $data->{'BNEsensor'}{$INDEX}{'param'} = $param; - $data->{'BNEsensor'}{$INDEX}{'leafName'} = $leafName; + $data->{'BNEsensor'}{$INDEX}{'leafName'} = $leafName; } if( scalar(keys %{$data->{'BNEsensor'}}) > 0 ) { $devdetails->setCap('BNEsensor'); - my $devComment = + my $devComment = 'BetterNetworks EthernetBox, ' . $unitInfo->{'BNEversion'}; if( $unitInfo->{'BNElocation'} =~ /\w/ ) { - $devComment .= ', Location: ' . + $devComment .= ', Location: ' . $unitInfo->{'BNElocation'}; } $data->{'param'}{'comment'} = $devComment; } } - + return 1; } @@ -221,7 +221,7 @@ sub buildConfig { my $param = $data->{'BNEsensor'}{$INDEX}{'param'}; my $leafName = $data->{'BNEsensor'}{$INDEX}{'leafName'}; - + $cb->addLeaf( $devNode, $leafName, $param, ['BetterNetworks::betternetworks-sensor'] ); } diff --git a/src/lib/Torrus/DevDiscover/CCOM.pm b/src/lib/Torrus/DevDiscover/CCOM.pm index f48dd7c..3c9cf23 100644 --- a/src/lib/Torrus/DevDiscover/CCOM.pm +++ b/src/lib/Torrus/DevDiscover/CCOM.pm @@ -51,10 +51,10 @@ sub checkdevtype { return 0; } - + $devdetails->setCap('interfaceIndexingPersistent'); $devdetails->setCap('disable_ifXTable'); - + return 1; } @@ -69,11 +69,11 @@ sub discover # for some devices, ifDescr is poisoned with non-ASSCII characters. # clean that up to get some meaningful names - + for my $ifIndex ( keys %{$data->{'interfaces'}} ) { my $interface = $data->{'interfaces'}{$ifIndex}; - + next if $interface->{'excluded'}; my $descr = $interface->{'ifDescr'}; @@ -88,7 +88,7 @@ sub discover $descr =~ s/\W/_/g; $interface->{'CCOM-ifDescrT'} = $descr; } - + $data->{'nameref'}{'ifSubtreeName'} = 'CCOM-ifDescrT'; $data->{'nameref'}{'ifReferenceName'} = 'CCOM-ifDescr'; $data->{'nameref'}{'ifNick'} = 'ifIndex'; diff --git a/src/lib/Torrus/DevDiscover/CasaCMTS.pm b/src/lib/Torrus/DevDiscover/CasaCMTS.pm index fbd5d9a..ea79355 100644 --- a/src/lib/Torrus/DevDiscover/CasaCMTS.pm +++ b/src/lib/Torrus/DevDiscover/CasaCMTS.pm @@ -49,7 +49,7 @@ sub checkdevtype { my $dd = shift; my $devdetails = shift; - + if( not $dd->oidBaseMatch ( 'casaProducts', $devdetails->snmpVar( $dd->oiddef('sysObjectID') ) ) or @@ -68,10 +68,10 @@ sub discover my $devdetails = shift; my $data = $devdetails->data(); - + push( @{$data->{'docsConfig'}{'docsCableMaclayer'}{'templates'}}, 'CasaCMTS::casa-docsis-mac-subtree' ); - + for my $ifIndex ( @{$data->{'docsCableMaclayer'}} ) { my $interface = $data->{'interfaces'}{$ifIndex}; @@ -87,17 +87,17 @@ sub discover push( @{$interface->{'docsTemplates'}}, 'CasaCMTS::casa-docsis-upstream-util' ); } - + for my $ifIndex ( @{$data->{'docsCableDownstream'}} ) { my $interface = $data->{'interfaces'}{$ifIndex}; - + push( @{$interface->{'docsTemplates'}}, 'CasaCMTS::casa-docsis-downstream-util' ); } - + $data->{'nameref'}{'ifNodeid'} = 'ifNameT'; - + return 1; } @@ -116,21 +116,21 @@ sub buildConfig # Build All_Modems summary graph my $param = { 'ds-type' => 'rrd-multigraph', - 'ds-names' => 'total,active,registered', + 'ds-names' => 'total,active,registered', 'graph-lower-limit' => '0', - 'precedence' => '1000', + 'precedence' => '1000', 'vertical-label' => 'Modems', - + 'graph-legend-total' => 'Total', 'line-style-total' => '##totalresource', 'line-color-total' => '##totalresource', 'line-order-total' => '1', - + 'graph-legend-active' => 'Active', 'line-style-active' => '##resourcepartusage', 'line-color-active' => '##resourcepartusage', 'line-order-active' => '2', - + 'graph-legend-registered' => 'Registered', 'line-style-registered' => '##resourceusage', 'line-color-registered' => '##resourceusage', @@ -141,18 +141,18 @@ sub buildConfig # for the sake of better Emacs formatting $param->{'comment'} = 'Registered, Active and Total modems on CMTS'; - + $param->{'nodeid'} = $data->{'docsConfig'}{'docsCableMaclayer'}{'nodeidCategory'} . '//%nodeid-device%//modems'; - + my $first = 1; for my $ifIndex ( @{$data->{'docsCableMaclayer'}} ) { my $interface = $data->{'interfaces'}{$ifIndex}; - + my $intf = $interface->{$data->{'nameref'}{'ifSubtreeName'}}; - + if( $first ) { $param->{'ds-expr-total'} = @@ -188,14 +188,14 @@ sub buildConfig Error('Could not find the MAC layer subtree'); exit 1; } - + # Apply selector actions for my $ifIndex ( @{$data->{'docsCableMaclayer'}} ) { my $interface = $data->{'interfaces'}{$ifIndex}; - + my $intf = $interface->{$data->{'nameref'}{'ifSubtreeName'}}; - + my $monitor = $interface->{'selectorActions'}{'DocsisMacModemsMonitor'}; if( defined( $monitor ) ) @@ -213,15 +213,15 @@ sub buildConfig $cb->getChildSubtree( $devNode, $data->{'docsConfig'}{'docsCableUpstream'}{ 'subtreeName'} ); - + # Override the overview shortcus defined in rfc2670.docsis-if.xml - + my $shortcuts = 'snr,fec,freq,modems'; - - my $param = { + + my $param = { 'overview-shortcuts' => $shortcuts, - + 'overview-subleave-name-modems' => 'Modems', 'overview-direct-link-modems' => 'yes', 'overview-direct-link-view-modems' => 'expanded-dir-html', @@ -230,22 +230,22 @@ sub buildConfig 'Show modem quantities in one page', 'overview-page-title-modems' => 'Modem quantities', }; - + $cb->addParams( $upstrNode, $param ); } - + if( scalar( @{$data->{'docsCableDownstream'}} ) > 0 ) { my $downstrNode = $cb->getChildSubtree( $devNode, $data->{'docsConfig'}{'docsCableDownstream'}{ 'subtreeName'} ); - + # Override the overview shortcus defined in rfc2670.docsis-if.xml - + my $shortcuts = 'util,modems'; - - my $param = { + + my $param = { 'overview-shortcuts' => $shortcuts, 'overview-subleave-name-modems' => 'Modems', 'overview-direct-link-modems' => 'yes', @@ -255,7 +255,7 @@ sub buildConfig 'Show modem quantities in one page', 'overview-page-title-modems' => 'Modem quantities', }; - + $cb->addParams( $downstrNode, $param ); } diff --git a/src/lib/Torrus/DevDiscover/CiscoCatOS.pm b/src/lib/Torrus/DevDiscover/CiscoCatOS.pm index 42bd5c6..bef3325 100644 --- a/src/lib/Torrus/DevDiscover/CiscoCatOS.pm +++ b/src/lib/Torrus/DevDiscover/CiscoCatOS.pm @@ -116,7 +116,7 @@ sub discover $data->{'param'}{'ifindex-table'} = '$ifName'; $data->{'nameref'}{'ifComment'} = 'portName'; - + # Retrieve port descriptions from CISCO-STACK-MIB my $portIfIndexOID = $dd->oiddef('CISCO-STACK-MIB::portIfIndex'); @@ -140,7 +140,7 @@ sub discover $interface->{'portName'} = $portName->{$portNameOID .'.'. $portIndex}; } - } + } } # In large installations, only named ports may be of interest @@ -155,7 +155,7 @@ sub discover { $interface->{'excluded'} = 1; $nExcluded++; - } + } } Debug('Excluded ' . $nExcluded . ' catalyst ports with empty names'); } @@ -171,7 +171,7 @@ sub discover $data->{'param'}{'comment'} .= 'Hw Serial#: ' . $chassisSerial->{'CISCO-STACK-MIB::chassisSerialNumberString'}; } - + return 1; } diff --git a/src/lib/Torrus/DevDiscover/CiscoFirewall.pm b/src/lib/Torrus/DevDiscover/CiscoFirewall.pm index b35df6e..8b73e80 100644 --- a/src/lib/Torrus/DevDiscover/CiscoFirewall.pm +++ b/src/lib/Torrus/DevDiscover/CiscoFirewall.pm @@ -90,7 +90,7 @@ sub checkdevtype &Torrus::DevDiscover::RFC2863_IF_MIB::addInterfaceFilter ($devdetails, $interfaceFilter); - + if( defined( $interfaceFilterOverlay ) ) { &Torrus::DevDiscover::RFC2863_IF_MIB::addInterfaceFilter @@ -130,7 +130,7 @@ sub discover { $devdetails->setCap('CiscoFirewall::connections'); } - + # I have not seen a system that supports this. if( $dd->checkSnmpOID('cfwBasicEventsTableLastRow') ) { @@ -155,7 +155,7 @@ sub buildConfig }; my @templates = ('CiscoFirewall::cisco-firewall-subtree'); - + if( $devdetails->hasCap('CiscoFirewall::connections') ) { push( @templates, 'CiscoFirewall::connections'); diff --git a/src/lib/Torrus/DevDiscover/CiscoIOS_Docsis.pm b/src/lib/Torrus/DevDiscover/CiscoIOS_Docsis.pm index 7d42cde..cd1e999 100644 --- a/src/lib/Torrus/DevDiscover/CiscoIOS_Docsis.pm +++ b/src/lib/Torrus/DevDiscover/CiscoIOS_Docsis.pm @@ -73,7 +73,7 @@ sub discover my $devdetails = shift; my $data = $devdetails->data(); - + if( $dd->checkSnmpTable( 'cdxIfUpChannelMaxUGSLastFiveMins' ) ) { $devdetails->setCap('cdxIfUpChannelMaxUGSLastFiveMins'); @@ -97,7 +97,7 @@ sub discover push( @{$interface->{'docsTemplates'}}, 'CiscoIOS_Docsis::cisco-docsis-upstream-util' ); } - + return 1; } @@ -125,33 +125,33 @@ sub buildConfig 'precedence' => '1000', 'comment' => 'Registered, Active and Total modems on CMTS', - + 'vertical-label' => 'Modems', - + 'graph-legend-total' => 'Total', 'line-style-total' => '##totalresource', 'line-color-total' => '##totalresource', 'line-order-total' => '1', - + 'graph-legend-active' => 'Active', 'line-style-active' => '##resourcepartusage', 'line-color-active' => '##resourcepartusage', 'line-order-active' => '2', - + 'graph-legend-registered' => 'Registered', 'line-style-registered' => '##resourceusage', 'line-color-registered' => '##resourceusage', 'line-order-registered' => '3', 'descriptive-nickname' => '%system-id%: All modems' }; - + my $first = 1; for my $ifIndex ( @{$data->{'docsCableMaclayer'}} ) { my $interface = $data->{'interfaces'}{$ifIndex}; - + my $intf = $interface->{$data->{'nameref'}{'ifSubtreeName'}}; - + if( $first ) { $param->{'ds-expr-total'} = @@ -187,14 +187,14 @@ sub buildConfig Error('Could not find the MAC layer subtree'); exit 1; } - + # Apply selector actions for my $ifIndex ( @{$data->{'docsCableMaclayer'}} ) { my $interface = $data->{'interfaces'}{$ifIndex}; - + my $intf = $interface->{$data->{'nameref'}{'ifSubtreeName'}}; - + my $monitor = $interface->{'selectorActions'}{'DocsisMacModemsMonitor'}; if( defined( $monitor ) ) @@ -212,13 +212,13 @@ sub buildConfig $cb->getChildSubtree( $devNode, $data->{'docsConfig'}{'docsCableUpstream'}{ 'subtreeName'} ); - + for my $ifIndex ( @{$data->{'docsCableUpstream'}} ) { my $interface = $data->{'interfaces'}{$ifIndex}; - + my $intf = $interface->{$data->{'nameref'}{'ifSubtreeName'}}; - + my $monitor = $interface->{'selectorActions'}{'DocsisUpUtilMonitor'}; if( defined( $monitor ) ) @@ -239,17 +239,17 @@ sub buildConfig } # Override the overview shortcus defined in rfc2670.docsis-if.xml - + my $shortcuts = 'snr,fec,freq,modems,util'; if( $devdetails->hasCap('cdxIfUpChannelMaxUGSLastFiveMins') ) { $shortcuts .= ',ugs'; } - - my $param = { + + my $param = { 'overview-shortcuts' => $shortcuts, - + 'overview-subleave-name-modems' => 'Modems', 'overview-direct-link-modems' => 'yes', 'overview-direct-link-view-modems' => 'expanded-dir-html', @@ -257,14 +257,14 @@ sub buildConfig 'overview-shortcut-title-modems'=> 'Show modem quantities in one page', 'overview-page-title-modems' => 'Modem quantities', - + 'overview-subleave-name-util' => 'Util_Summary', 'overview-direct-link-util' => 'yes', 'overview-direct-link-view-util' => 'expanded-dir-html', 'overview-shortcut-text-util' => 'All utilization', 'overview-shortcut-title-util' => 'All upstream utilization', 'overview-page-title-util' => 'Upstream utilization', - + 'overview-subleave-name-ugs' => 'Active_UGS', 'overview-direct-link-ugs' => 'yes', 'overview-direct-link-view-ugs' => 'expanded-dir-html', diff --git a/src/lib/Torrus/DevDiscover/CiscoIOS_MacAccounting.pm b/src/lib/Torrus/DevDiscover/CiscoIOS_MacAccounting.pm index 37b838a..c624628 100644 --- a/src/lib/Torrus/DevDiscover/CiscoIOS_MacAccounting.pm +++ b/src/lib/Torrus/DevDiscover/CiscoIOS_MacAccounting.pm @@ -302,7 +302,7 @@ sub buildConfig { $asNum = 0; } - + my $param = { 'peer-macaddr' => $peer->{'phyAddr'}, 'peer-macoid' => $peer->{'macAddrOID'}, @@ -337,7 +337,7 @@ sub buildConfig push( @name_candidates, $peer->{$attr} ); } } - + for my $peerName ( @name_candidates ) { if( not $extStorageApplied and @@ -350,42 +350,42 @@ sub buildConfig if( defined( $extStorage->{$dir} ) ) { my $serviceid = $extStorage->{$dir}; - + my $params = { 'storage-type' => 'rrd,ext', 'ext-service-units' => 'bytes', 'ext-service-id' => $serviceid }; - + my $trees = $data->{'cipMacExtStoragetrees'}{$serviceid}; - + if( defined($trees) and $trees ne '' ) { $params->{'ext-service-trees'} = $trees; } - + $cb->addLeaf ( $peerNode, 'Bytes_' . $dir, $params ); } } $extStorageApplied = 1; } - + if( not $tsetMemberApplied and defined( $data->{'cipTokensetMember'}{$peerName} ) ) { my $tsetList = join( ',', sort keys %{$data->{'cipTokensetMember'}{$peerName}} ); - + $cb->addLeaf ( $peerNode, 'InOut_bps', { 'tokenset-member' => $tsetList } ); - } + } } } } - + return; } diff --git a/src/lib/Torrus/DevDiscover/CiscoSCE.pm b/src/lib/Torrus/DevDiscover/CiscoSCE.pm index 1ebe466..d393e5c 100644 --- a/src/lib/Torrus/DevDiscover/CiscoSCE.pm +++ b/src/lib/Torrus/DevDiscover/CiscoSCE.pm @@ -71,7 +71,7 @@ our %oiddef = # CISCO-SCAS-BB-MIB (PCUBE-ENGAGE-MIB) 'globalScopeServiceCounterName' => '1.3.6.1.4.1.5655.4.2.5.1.1.3.1', - + ); our %sceChassisNames = @@ -104,7 +104,7 @@ sub checkdevtype { return 0; } - + my $result = $dd->retrieveSnmpOIDs('pchassisNumSlots'); if( $result->{'pchassisNumSlots'} > 1 ) { @@ -113,7 +113,7 @@ sub checkdevtype 'devices'); return 0; } - + $devdetails->setCap('interfaceIndexingPersistent'); return 1; @@ -136,15 +136,15 @@ sub discover 'subscribersNumVlanMappings', 'subscribersNumAnonymous' ); $data->{'sceInfo'} = $sceInfo; - + $data->{'param'}{'comment'} = $sceChassisNames{$sceInfo->{'pchassisSysType'}} . " chassis, " . $sceModuleDesc{$sceInfo->{'pmoduleType'}} . ", Hw Serial#: " . $sceInfo->{'pmoduleSerialNumber'}; - + # TP: Traffic Processor if( $devdetails->paramDisabled('CiscoSCE::disable-tp') ) - { + { $devdetails->setCap('sceTP'); $data->{'sceTrafficProcessors'} = @@ -168,26 +168,26 @@ sub discover $devdetails->setCap('sceSubscribers'); } } - - + + # QOS: TX Queues Names if( $devdetails->paramDisabled('CiscoSCE::disable-qos') ) - { + { $devdetails->setCap('sceQos'); # Get the names of TX queues my $txQueueNum = $session->get_table ( -baseoid => $dd->oiddef('pportNumTxQueues') ); $devdetails->storeSnmpVars( $txQueueNum ); - + my $ifIndexTable = $session->get_table ( -baseoid => $dd->oiddef('pportIfIndex') ); my $txQueueDesc = $session->get_table ( -baseoid => $dd->oiddef('txQueuesDescription') ); - + $devdetails->storeSnmpVars( $txQueueDesc ); - + for my $pIndex ( $devdetails->getSnmpIndices( $dd->oiddef('pportNumTxQueues') ) ) { @@ -197,20 +197,20 @@ sub discover '.' . $pIndex} > 1 ) { # We need the ifIndex to retrieve the interface name - + my $ifIndex = $ifIndexTable->{$dd->oiddef('pportIfIndex') . '.' . $pIndex}; $data->{'scePortIfIndex'}{$pIndex} = $ifIndex; - + for my $qIndex ( $devdetails->getSnmpIndices ( $dd->oiddef('txQueuesDescription') . '.' . $pIndex ) ) { my $oid = $dd->oiddef('txQueuesDescription') . '.' . $pIndex . '.' . $qIndex; - + $data->{'sceQueues'}{$pIndex}{$qIndex} = $txQueueDesc->{$oid}; } @@ -227,9 +227,9 @@ sub discover my $counterNames = $session->get_table ( -baseoid => $dd->oiddef('globalScopeServiceCounterName') ); - + $devdetails->storeSnmpVars( $counterNames ); - + for my $gcIndex ( $devdetails->getSnmpIndices ( $dd->oiddef('globalScopeServiceCounterName') ) ) @@ -237,7 +237,7 @@ sub discover my $oid = $dd->oiddef('globalScopeServiceCounterName') . '.' . $gcIndex; my $cName = $counterNames->{$oid}; - + if( defined($cName) and $cName ne '' ) { $data->{'sceGlobalCounters'}{$gcIndex} = $cName; @@ -248,18 +248,18 @@ sub discover # RDR: Raw Data Record if( $devdetails->paramDisabled('CiscoSCE::disable-rdr') ) - { + { if( $sceInfo->{'rdrFormatterEnable'} > 0 ) { # Set Capability for the RDR section of XML $devdetails->setCap('sceRDR'); - + # Get the names of the RDR Category my $categoryNames = $session->get_table ( -baseoid => $dd->oiddef('rdrFormatterCategoryName') ); - + $devdetails->storeSnmpVars( $categoryNames ); - + for my $categoryIndex ( $devdetails->getSnmpIndices ( $dd->oiddef('rdrFormatterCategoryName') ) ) @@ -270,7 +270,7 @@ sub discover } } } - + return 1; } @@ -296,7 +296,7 @@ sub buildConfig # Traffic processors subtree if( $devdetails->hasCap('sceTP') ) - { + { my $tpNode = $cb->addSubtree( $devNode, 'SCE_TrafficProcessors', { 'comment' => 'TP usage statistics' }, [ 'CiscoSCE::cisco-sce-tp-subtree']); @@ -312,13 +312,13 @@ sub buildConfig # QoS queues if( $devdetails->hasCap('sceQos') ) - { + { # Queues subtree my $qNode = $cb->addSubtree( $devNode, 'SCE_Queues', { 'comment' => 'TX queues usage statistics' }, [ 'CiscoSCE::cisco-sce-queues-subtree']); - + for my $pIndex ( sort {$a <=> $b} keys %{$data->{'scePortIfIndex'}} ) { @@ -331,13 +331,13 @@ sub buildConfig $interface->{$data->{'nameref'}{'ifSubtreeName'}}, { 'sce-port-index' => $pIndex, 'precedence' => 1000 - $pIndex }); - - for my $qIndex ( sort {$a <=> $b} keys + + for my $qIndex ( sort {$a <=> $b} keys %{$data->{'sceQueues'}{$pIndex}} ) { my $qName = $data->{'sceQueues'}{$pIndex}{$qIndex}; my $subtreeName = 'Q' . $qIndex; - + $cb->addLeaf( $portNode, $subtreeName, { 'sce-queue-index' => $qIndex, 'comment' => $qName, @@ -360,14 +360,14 @@ sub buildConfig . $linkIndex }, [ 'CiscoSCE::cisco-sce-gc-subtree']); - + for my $gcIndex ( sort {$a <=> $b} keys %{$data->{'sceGlobalCounters'}} ) { my $srvName = $data->{'sceGlobalCounters'}{$gcIndex}; my $subtreeName = $srvName; $subtreeName =~ s/\W/_/g; - + $cb->addSubtree( $gcNode, $subtreeName, { 'sce-link-index' => $linkIndex, 'sce-gc-index' => $gcIndex, @@ -391,7 +391,7 @@ sub buildConfig $cb->addSubtree( $devNode, 'SCE_RDR_Categories', { 'comment' => 'Raw Data Records per Category' }, [ 'CiscoSCE::cisco-sce-rdr-category-subtree' ]); - + for my $cIndex ( sort {$a <=> $b} keys %{$data->{'sceRDR'}} ) { my $categoryName; @@ -403,14 +403,14 @@ sub buildConfig { $categoryName = 'Category_' . $cIndex; } - + $cb->addSubtree( $rdrNode, 'Category_' . $cIndex, { 'precedence' => 1000 - $cIndex, 'sce-rdr-index' => $cIndex, 'sce-rdr-comment' => $categoryName }, ['CiscoSCE::cisco-sce-rdr-category'] ); } - } # END hasCap sceRDR + } # END hasCap sceRDR return; } diff --git a/src/lib/Torrus/DevDiscover/CiscoVDSL.pm b/src/lib/Torrus/DevDiscover/CiscoVDSL.pm index 2d4fda7..fa9dcf7 100644 --- a/src/lib/Torrus/DevDiscover/CiscoVDSL.pm +++ b/src/lib/Torrus/DevDiscover/CiscoVDSL.pm @@ -119,7 +119,7 @@ sub buildConfig $interface->{$data->{'nameref'}{'ifNick'}}; $ifParam->{'node-display-name'} = $interface->{$data->{'nameref'}{'ifReferenceName'}}; - + if( defined($data->{'nameref'}{'ifComment'}) and defined($interface->{$data->{'nameref'}{'ifComment'}}) ) { diff --git a/src/lib/Torrus/DevDiscover/CompaqCIM.pm b/src/lib/Torrus/DevDiscover/CompaqCIM.pm index 30d54a8..23da631 100644 --- a/src/lib/Torrus/DevDiscover/CompaqCIM.pm +++ b/src/lib/Torrus/DevDiscover/CompaqCIM.pm @@ -93,7 +93,7 @@ sub discover for my $oid ( @checkOids ) { if( $dd->checkSnmpOID($oid) ) - { + { $devdetails->setCap( $oid ); } } diff --git a/src/lib/Torrus/DevDiscover/DevDetails.pm b/src/lib/Torrus/DevDiscover/DevDetails.pm index aaa0af9..bd585d8 100644 --- a/src/lib/Torrus/DevDiscover/DevDetails.pm +++ b/src/lib/Torrus/DevDiscover/DevDetails.pm @@ -162,7 +162,7 @@ sub hasOID ## # get the value of stored SNMP variable -# WARNING: this method is deprecated. +# WARNING: this method is deprecated. sub snmpVar { diff --git a/src/lib/Torrus/DevDiscover/EmpireSystemedge.pm b/src/lib/Torrus/DevDiscover/EmpireSystemedge.pm index 3a971f1..7c4eb5a 100644 --- a/src/lib/Torrus/DevDiscover/EmpireSystemedge.pm +++ b/src/lib/Torrus/DevDiscover/EmpireSystemedge.pm @@ -203,19 +203,19 @@ sub checkdevtype } # Empire OS Type (Needed here for interface filtering) - + my $empireOsType = $result->{'empireSystemType'}; if( defined($empireOsType) and $empireOsType > 0 ) { $devdetails->setCap('EmpireSystemedge::' . $osTranslate{$empireOsType}{ident} ); - + $devdetails->{'os_ident'} = $osTranslate{$empireOsType}{ident}; - + $devdetails->setCap('EmpireSystemedge::' . $osTranslate{$empireOsType}{name} ); - + $devdetails->{'os_name'} = $osTranslate{$empireOsType}{name}; $devdetails->{'os_name_template'} = diff --git a/src/lib/Torrus/DevDiscover/Foundry.pm b/src/lib/Torrus/DevDiscover/Foundry.pm index eb54826..fc1d1ef 100644 --- a/src/lib/Torrus/DevDiscover/Foundry.pm +++ b/src/lib/Torrus/DevDiscover/Foundry.pm @@ -40,7 +40,7 @@ our %oiddef = ( # FOUNDRY-SN-ROOT-MIB 'fdry' => '1.3.6.1.4.1.1991', - + # FOUNDRY-SN-AGENT-MIB 'fdrySnChasSerNum' => '1.3.6.1.4.1.1991.1.1.1.1.2.0', 'fdrySnChasGen' => '1.3.6.1.4.1.1991.1.1.1.1.13', @@ -98,7 +98,7 @@ if( not defined( $interfaceFilter ) ) 'lb' => { 'ifType' => 24, # softwareLoopback }, - + 'v' => { 'ifType' => 135, # l2vlan }, @@ -123,11 +123,11 @@ my %productTypeAttr = 3 => { 'desc' => 'NetIron IMR 640', }, - + 4 => { 'desc' => 'NetIron RX 800', }, - + 5 => { 'desc' => 'NetIron XMR 16000', }, @@ -135,7 +135,7 @@ my %productTypeAttr = 6 => { 'desc' => 'NetIron RX 400', }, - + 7 => { 'desc' => 'NetIron XMR 8000', }, @@ -147,7 +147,7 @@ my %productTypeAttr = 9 => { 'desc' => 'NetIron XMR 4000', }, - + 13 => { 'desc' => 'NetIron MLX-32', }, @@ -167,7 +167,7 @@ my %productTypeAttr = 0 => { 'desc' => 'device', }, - ); + ); sub checkdevtype @@ -193,7 +193,7 @@ sub checkdevtype $devdetails->setCap('interfaceIndexingPersistent'); } - + return $retval; } @@ -208,18 +208,18 @@ sub discover my $data = $devdetails->data(); # NOTE: Comments and Serial number of device - + my $chassis = $dd->retrieveSnmpOIDs( 'fdrySnChasSerNum', 'fdrySnChasIdNumber', 'fdrySnChasArchitectureType', 'fdrySnChasProductType' ); - + Debug('fdrySnChasSerNum=' . $chassis->{'fdrySnChasSerNum'}); Debug('fdrySnChasIdNumber=' . $chassis->{'fdrySnChasIdNumber'}); Debug('fdrySnChasArchitectureType=' . $chassis->{'fdrySnChasArchitectureType'}); Debug('fdrySnChasProductType=' . $chassis->{'fdrySnChasProductType'}); - + my $productType = 0; if( defined( $chassis ) and @@ -229,7 +229,7 @@ sub discover } my $deviceComment = 'Brocade ' . $productTypeAttr{$productType}{'desc'}; - + if( defined( $chassis ) ) { if( defined( $chassis->{'fdrySnChasSerNum'} ) ) @@ -237,7 +237,7 @@ sub discover $deviceComment .= ', Chassis S/N: ' . $chassis->{'fdrySnChasSerNum'}; } - + if( defined( $chassis->{'fdrySnChasIdNumber'} ) and $chassis->{'fdrySnChasIdNumber'} ne '' ) { @@ -248,7 +248,7 @@ sub discover $data->{'param'}{'comment'} = $deviceComment; - + my $chasTemp = $dd->retrieveSnmpOIDs( 'fdrySnChasActualTemperature', 'fdrySnChasWarningTemperature', 'fdrySnChasShutdownTemperature'); @@ -261,12 +261,12 @@ sub discover $data->{'fdryChasTemp'}{'warning'} = $chasTemp->{'fdrySnChasWarningTemperature'}; $data->{'fdryChasTemp'}{'shutdown'} = - $chasTemp->{'fdrySnChasShutdownTemperature'}; + $chasTemp->{'fdrySnChasShutdownTemperature'}; } - + if( $dd->checkSnmpTable('fdrySnAgentBrdTbl') ) { - $devdetails->setCap('fdryBoardStats'); + $devdetails->setCap('fdryBoardStats'); $data->{'fdryBoard'} = {}; # get only the modules with @@ -281,7 +281,7 @@ sub discover } } } - + # get module descriptions { my $table = $dd->walkSnmpTable('fdrySnAgentBrdMainBrdDescription'); @@ -348,29 +348,29 @@ sub discover $data->{'fdryBoard'}{$brdIndex}{'cpu-new'} = 1; } } - } - + } + # check if temperature stats are available # exclude the sensors which show zero { my $table = $dd->walkSnmpTable('fdrySnAgentTempSensorDescr'); my $tempValues = $dd->walkSnmpTable('fdrySnAgentTempValue'); - + while( my( $INDEX, $descr ) = each %{$table} ) { my ($brdIndex, $sensor) = split(/\./, $INDEX); - + if( $data->{'fdryBoard'}{$brdIndex}{'moduleRunning'} and $tempValues->{$INDEX} > 0 ) { $data->{'fdryBoard'}{$brdIndex}{'temperature'}{$sensor} = $descr; - $devdetails->setCap('fdryBoardTemperature'); + $devdetails->setCap('fdryBoardTemperature'); } } - } + } } - + return 1; } @@ -391,13 +391,13 @@ sub buildConfig 'fdry-chastemp-warning' => $data->{'fdryChasTemp'}{'warning'}/2, 'fdry-chastemp-shutdown' => $data->{'fdryChasTemp'}{'shutdown'}/2, }; - + my $templates = [ 'Foundry::fdry-chass-temperature' ]; $cb->addLeaf( $devNode, 'Chassis_Temperature', $param, $templates ); } - + # Board Stats if( $devdetails->hasCap('fdryBoardStats') ) { @@ -408,15 +408,15 @@ sub buildConfig 'node-display-name' => 'Linecard Statistics', 'comment' => 'CPU, Memory, and Temperature information', }; - + $brdNode = $cb->addSubtree( $devNode, 'Linecard_Statistics', $param ); } - + $cb->addTemplateApplication( $brdNode, 'Foundry::fdry-board-overview' ); - - + + for my $brdIndex ( sort {$a <=> $b} keys %{$data->{'fdryBoard'}} ) { my $brdDescr = $data->{'fdryBoard'}{$brdIndex}{'description'}; @@ -426,32 +426,32 @@ sub buildConfig 'fdry-board-descr' => $brdDescr, 'nodeid' => 'module//%nodeid-device%//' . $brdIndex, }; - + my $linecardNode = $cb->addSubtree( $brdNode, 'Linecard_' . $brdIndex, $brdParam, [ 'Foundry::fdry-board-subtree' ]); - + if( $data->{'fdryBoard'}{$brdIndex}{'memory'} ) { $cb->addSubtree( $linecardNode, 'Memory_Statistics', {}, [ 'Foundry::fdry-board-memstats' ]); } - - my $cpuOid; + + my $cpuOid; if( $data->{'fdryBoard'}{$brdIndex}{'cpu-new'} ) { $cpuOid = '$fdrySnAgentCpuUtil100thPercent'; } - elsif( $data->{'fdryBoard'}{$brdIndex}{'cpu'} ) + elsif( $data->{'fdryBoard'}{$brdIndex}{'cpu'} ) { $cpuOid = '$fdrySnAgentCpuUtilValue'; } if( defined( $cpuOid ) ) { - + $cb->addSubtree ( $linecardNode, 'CPU_Statistics', { @@ -460,7 +460,7 @@ sub buildConfig }, [ 'Foundry::fdry-board-cpustats' ]); } - + if( defined( $data->{'fdryBoard'}{$brdIndex}{'temperature'} ) ) { my $tempNode = @@ -468,7 +468,7 @@ sub buildConfig {}, ['Foundry::fdry-board-tempstats']); # Build a multi-graph for all sensors - + my @colors = ('##one', '##two', '##three', '##four', '##five', '##six', '##seven', '##eight', '##nine', '##ten'); @@ -481,32 +481,32 @@ sub buildConfig }; my @sensors; - + for my $sensor ( sort {$a <=> $b} keys %{$data->{'fdryBoard'}{$brdIndex}{'temperature'}} ) { my $leafName = 'sensor_' . $sensor; - + my $descr = $data->{'fdryBoard'}{$brdIndex}{ 'temperature'}{$sensor}; my $short = 'Temperature sensor ' . $sensor; - + my $param = { 'comment' => $descr, 'precedence' => 1000 - $sensor, 'sensor-index' => $sensor, 'sensor-short' => $short, - 'sensor-description' => $descr, + 'sensor-description' => $descr, }; - + $cb->addLeaf ( $tempNode, $leafName, $param, ['Foundry::fdry-board-temp-sensor-halfcelsius'] ); - + push(@sensors, $leafName); - + $mgParam->{'ds-expr-' . $leafName} = '{' . $leafName . '}'; $mgParam->{'graph-legend-' . $leafName} = $short; @@ -517,9 +517,9 @@ sub buildConfig { Error('Too many sensors on one Foundry board'); $color = '##black'; - } + } $mgParam->{'line-color-' . $leafName} = $color; - + $mgParam->{'line-order-' . $leafName} = $sensor; } diff --git a/src/lib/Torrus/DevDiscover/Jacarta.pm b/src/lib/Torrus/DevDiscover/Jacarta.pm index ef14b32..a7d4351 100644 --- a/src/lib/Torrus/DevDiscover/Jacarta.pm +++ b/src/lib/Torrus/DevDiscover/Jacarta.pm @@ -60,8 +60,8 @@ our %sensor_types = 5 => { 'template' => 'Jacarta::imeter-amps-sensor', 'max' => 'NetBotz::dew-max', - }, - + }, + ); @@ -77,7 +77,7 @@ sub checkdevtype { return 0; } - + $devdetails->setCap('interfaceIndexingPersistent'); return 1; @@ -93,7 +93,7 @@ sub discover my $session = $dd->session(); $data->{'Jacarta'} = {}; - + my $sensorTable = $session->get_table( -baseoid => $oiddef{'sensorEntry'} ); @@ -101,12 +101,12 @@ sub discover { return 1; } - + $devdetails->storeSnmpVars( $sensorTable ); - + # store the sensor names to guarantee uniqueness my %sensorNames; - + for my $INDEX ($devdetails->getSnmpIndices( $oiddef{'sensorIndex'} )) { @@ -116,13 +116,13 @@ sub discover my $sensorName = $devdetails->snmpVar( $oiddef{'sensorDescription'} . '.' . $INDEX); - + if( not defined( $sensor_types{$sensorType} ) ) { Error('Sensor ' . $INDEX . ' of unknown type: ' . $sensorType); next; } - + if( $sensorNames{$sensorName} ) { Warn('Duplicate sensor names: ' . $sensorName); @@ -132,15 +132,15 @@ sub discover { $sensorNames{$sensorName} = 1; } - + if( $sensorNames{$sensorName} > 1 ) { $sensorName .= sprintf(' %d', $INDEX); } - + my $leafName = $sensorName; $leafName =~ s/\W/_/g; - + my $param = { 'imeter-sensor-index' => $INDEX, 'node-display-name' => $sensorName, @@ -148,27 +148,27 @@ sub discover 'precedence' => sprintf('%d', 1000 - $INDEX) }; - + if( defined( $sensor_types{$sensorType}{'max'} ) ) { my $max = $devdetails->param($sensor_types{$sensorType}{'max'}); - + if( defined($max) and $max > 0 ) { $param->{'upper-limit'} = $max; } } - + $data->{'Jacarta'}{$INDEX} = { 'param' => $param, 'leafName' => $leafName, 'template' => $sensor_types{$sensorType}{'template'}}; - + Debug('Found Sensor ' . $INDEX . ' of type ' . $sensorType . ', named ' . $sensorName ); } - + return 1; } @@ -178,21 +178,21 @@ sub buildConfig my $devdetails = shift; my $cb = shift; my $devNode = shift; - + my $data = $devdetails->data(); - + my $param = { 'node-display-name' => 'Sensors', 'comment' => 'All sensors connected via this iMeter Master', }; - + my $sensorTree = $cb->addSubtree( $devNode, 'Sensors', $param ); for my $INDEX ( sort {$a<=>$b} keys %{$data->{'Jacarta'}} ) { my $ref = $data->{'Jacarta'}{$INDEX}; - + $cb->addLeaf( $sensorTree, $ref->{'leafName'}, $ref->{'param'}, [$ref->{'template'}] ); } diff --git a/src/lib/Torrus/DevDiscover/MicrosoftWindows.pm b/src/lib/Torrus/DevDiscover/MicrosoftWindows.pm index 71929e4..2d9ec82 100644 --- a/src/lib/Torrus/DevDiscover/MicrosoftWindows.pm +++ b/src/lib/Torrus/DevDiscover/MicrosoftWindows.pm @@ -73,20 +73,20 @@ if( not defined( $interfaceFilter ) ) 'MS TCP Loopback interface' => { 'ifType' => 24 # softwareLoopback }, - + 'Tunnel' => { 'ifType' => 131 # tunnel }, - + 'PPP' => { 'ifType' => 23 # ppp }, - + 'WAN Miniport Ethernet' => { 'ifType' => 6, # ethernetCsmacd 'ifDescr' => '^WAN\s+Miniport' }, - + 'QoS Packet Scheduler' => { 'ifType' => 6, # ethernetCsmacd 'ifDescr' => 'QoS\s+Packet\s+Scheduler' @@ -117,7 +117,7 @@ sub checkdevtype } $devdetails->setCap('interfaceIndexingManaged'); - + return 1; } @@ -141,7 +141,7 @@ sub discover $data->{'nameref'}{'ifNick'} = 'MAC'; $data->{'nameref'}{'ifNodeid'} = 'MAC'; - + # FTP and HTTP servers, if present if( $dd->checkSnmpTable( 'ms_ftpStatistics' ) ) { diff --git a/src/lib/Torrus/DevDiscover/MotorolaBSR.pm b/src/lib/Torrus/DevDiscover/MotorolaBSR.pm index 29a0c63..de7ea4a 100644 --- a/src/lib/Torrus/DevDiscover/MotorolaBSR.pm +++ b/src/lib/Torrus/DevDiscover/MotorolaBSR.pm @@ -44,7 +44,7 @@ our %oiddef = ( 'rdnProducts' => '1.3.6.1.4.1.4981.4.1', # RDN-CMTS-MIB - 'rdnCmtsUpstreamChannelTable' => '1.3.6.1.4.1.4981.2.1.2' + 'rdnCmtsUpstreamChannelTable' => '1.3.6.1.4.1.4981.2.1.2' ); sub checkdevtype @@ -59,7 +59,7 @@ sub checkdevtype { return 0; } - + $devdetails->setCap('interfaceIndexingPersistent'); return 1; @@ -75,7 +75,7 @@ sub discover $data->{'param'}{'ifindex-map'} = '$IFIDX_IFINDEX'; Torrus::DevDiscover::RFC2863_IF_MIB::storeIfIndexParams( $devdetails ); - + if( $dd->checkSnmpTable( 'rdnCmtsUpstreamChannelTable' ) ) { $devdetails->setCap('rdnCmtsUpstreamChannelTable'); @@ -83,12 +83,12 @@ sub discover for my $ifIndex ( @{$data->{'docsCableUpstream'}} ) { my $interface = $data->{'interfaces'}{$ifIndex}; - + push( @{$interface->{'docsTemplates'}}, 'MotorolaBSR::motorola-bsr-docsis-upstream-util' ); } } - + return 1; } @@ -106,13 +106,13 @@ sub buildConfig $cb->getChildSubtree( $devNode, $data->{'docsConfig'}{'docsCableUpstream'}{ 'subtreeName'} ); - + my $shortcuts = 'snr,fec,freq,modems'; - - my $param = { + + my $param = { 'overview-shortcuts' => $shortcuts, - + 'overview-subleave-name-modems' => 'Modems', 'overview-direct-link-modems' => 'yes', 'overview-direct-link-view-modems' => 'expanded-dir-html', @@ -123,51 +123,51 @@ sub buildConfig }; $cb->addParams( $upstrNode, $param ); - + # Build All_Modems summary graph - + $param = { 'ds-type' => 'rrd-multigraph', 'ds-names' => 'registered,unregistered,offline', 'graph-lower-limit' => '0', 'precedence' => '1000', - + 'vertical-label' => 'Modems', 'descriptive-nickname' => '%system-id%: All modems', - + 'ds-expr-registered' => '{Modems_Registered}', 'graph-legend-registered' => 'Registered', 'line-style-registered' => 'AREA', 'line-color-registered' => '##blue', 'line-order-registered' => '1', - + 'ds-expr-unregistered' => '{Modems_Unregistered}', 'graph-legend-unregistered' => 'Unregistered', 'line-style-unregistered' => 'STACK', 'line-color-unregistered' => '##crimson', 'line-order-unregistered' => '2', - + 'ds-expr-offline' => '{Modems_Offline}', 'graph-legend-offline' => 'Offline', 'line-style-offline' => 'STACK', 'line-color-offline' => '##silver', - 'line-order-offline' => '3', + 'line-order-offline' => '3', }; - + $param->{'comment'} = 'Registered, Unregistered and Offline modems on CMTS'; - + $param->{'nodeid'} = $data->{'docsConfig'}{'docsCableUpstream'}{'nodeidCategory'} . '//%nodeid-device%//modems'; - + my $first = 1; for my $ifIndex ( @{$data->{'docsCableUpstream'}} ) { my $interface = $data->{'interfaces'}{$ifIndex}; - + my $intf = $interface->{$data->{'nameref'}{'ifSubtreeName'}}; - + if( $first ) { $param->{'ds-expr-registered'} = diff --git a/src/lib/Torrus/DevDiscover/NetScreen.pm b/src/lib/Torrus/DevDiscover/NetScreen.pm index bf3f147..54c9dc6 100644 --- a/src/lib/Torrus/DevDiscover/NetScreen.pm +++ b/src/lib/Torrus/DevDiscover/NetScreen.pm @@ -57,7 +57,7 @@ sub checkdevtype my $data = $devdetails->data(); $devdetails->setCap('interfaceIndexingManaged'); - + return 1; } @@ -110,12 +110,12 @@ sub discover $param->{'hrule-legend-max'} = 'Maximum Sessions'; # upper limit of graph is 5% higher than max sessions $param->{'graph-upper-limit'} = - sprintf('%e', + sprintf('%e', ( $max * 5 / 100 ) + $max ); - + $data->{'netScreenSessions'} = { 'param' => $param, - }; + }; } return 1; @@ -134,7 +134,7 @@ sub buildConfig my $ref = $data->{'netScreenSessions'}; - $cb->addSubtree( $devNode, "NetScreen_Sessions", $ref->{'param'}, + $cb->addSubtree( $devNode, "NetScreen_Sessions", $ref->{'param'}, [ 'NetScreen::netscreen-sessions-stats' ] ); } diff --git a/src/lib/Torrus/DevDiscover/NexComm.pm b/src/lib/Torrus/DevDiscover/NexComm.pm index e0c28c0..3707d70 100644 --- a/src/lib/Torrus/DevDiscover/NexComm.pm +++ b/src/lib/Torrus/DevDiscover/NexComm.pm @@ -51,9 +51,9 @@ sub checkdevtype { return 0; } - + $devdetails->setCap('interfaceIndexingPersistent'); - + return 1; } @@ -65,9 +65,9 @@ sub discover my $data = $devdetails->data(); my $session = $dd->session(); - + $data->{'param'}{'snmp-oids-per-pdu'} = 10; - + return 1; } diff --git a/src/lib/Torrus/DevDiscover/OracleDatabase.pm b/src/lib/Torrus/DevDiscover/OracleDatabase.pm index 74e63d7..0610f6e 100644 --- a/src/lib/Torrus/DevDiscover/OracleDatabase.pm +++ b/src/lib/Torrus/DevDiscover/OracleDatabase.pm @@ -90,7 +90,7 @@ sub discover { $data->{'param'}{'snmp-oids-per-pdu'} = '10'; } - + my $dbType = $data->{'ora'}; # my $oraTableSpaceCols = ( @@ -167,8 +167,8 @@ sub discover my $oid = $dd->oiddef('oraDbConfigDbBlockSize') . '.' . $dbIndex; my $result = $session->get_request( -varbindlist => [ $oid ] ); - - + + if( $session->error_status() == 0 and $result->{$oid} > 0 ) { my $blocksize = $result->{$oid}; @@ -191,7 +191,7 @@ sub discover my $tsName = $devdetails->snmpVar( $dd->oiddef('oraDbTablespaceName') . '.' . $dbIndex . '.' . $tsIndex ); - + $ref->{$tsName} = $tsIndex; } } @@ -214,7 +214,7 @@ sub discover $ref->{$dfName} = $dfIndex; } } - + if( $devdetails->hasCap('oraDbLibraryCache') ) { my $ref = {}; @@ -230,12 +230,12 @@ sub discover $devdetails-> snmpVar( $dd->oiddef('oraDbLibraryCacheNameSpace') . '.' . $dbIndex . '.' . $lcIndex ); - + $ref->{$lcName} = $lcIndex; } } } - + return 1; } diff --git a/src/lib/Torrus/DevDiscover/Paradyne.pm b/src/lib/Torrus/DevDiscover/Paradyne.pm index 58ec90c..7eead8a 100644 --- a/src/lib/Torrus/DevDiscover/Paradyne.pm +++ b/src/lib/Torrus/DevDiscover/Paradyne.pm @@ -92,7 +92,7 @@ sub checkdevtype $devdetails->param('snmp-community')); return 0; } - + $devdetails->setCap('interfaceIndexingManaged'); $devdetails->setCap('interfaceIndexingPersistent'); @@ -118,15 +118,15 @@ sub discover { $data->{'param'}{'snmp-oids-per-pdu'} = '10'; } - - my $slot = $devdetails->param('Paradyne::slot-name'); + + my $slot = $devdetails->param('Paradyne::slot-name'); for my $ifIndex ( keys %{$data->{'interfaces'}} ) { my $interface = $data->{'interfaces'}{$ifIndex}; $interface->{'ParadyneIfNick'} = $slot . '_' . $interface->{'ifNameT'}; } - + my $xdslOID = $dd->oiddef('xdslDevIfStatsElapsedTimeLinkUp'); my $xdslTable = $session->get_table( -baseoid => $xdslOID ); diff --git a/src/lib/Torrus/DevDiscover/Patton.pm b/src/lib/Torrus/DevDiscover/Patton.pm index 0d5311f..7ce9e79 100644 --- a/src/lib/Torrus/DevDiscover/Patton.pm +++ b/src/lib/Torrus/DevDiscover/Patton.pm @@ -51,9 +51,9 @@ sub checkdevtype { return 0; } - + $devdetails->setCap('interfaceIndexingPersistent'); - + return 1; } @@ -65,9 +65,9 @@ sub discover my $data = $devdetails->data(); my $session = $dd->session(); - + $data->{'param'}{'snmp-oids-per-pdu'} = 10; - + return 1; } diff --git a/src/lib/Torrus/DevDiscover/PowerNet.pm b/src/lib/Torrus/DevDiscover/PowerNet.pm index 76da847..623dd02 100644 --- a/src/lib/Torrus/DevDiscover/PowerNet.pm +++ b/src/lib/Torrus/DevDiscover/PowerNet.pm @@ -21,7 +21,7 @@ # PowerNet is a Trademark of American Power Conversion Corp. # There is *alot* in this MIB, with features covered across the entire -# APC range, i have only implemented the tiny fraction that i need. +# APC range, i have only implemented the tiny fraction that i need. package Torrus::DevDiscover::PowerNet; diff --git a/src/lib/Torrus/DevDiscover/RFC1628_UPS_MIB.pm b/src/lib/Torrus/DevDiscover/RFC1628_UPS_MIB.pm index 3ede3ee..3e5b7b2 100644 --- a/src/lib/Torrus/DevDiscover/RFC1628_UPS_MIB.pm +++ b/src/lib/Torrus/DevDiscover/RFC1628_UPS_MIB.pm @@ -88,7 +88,7 @@ sub discover 'upsBypassNumLines'); $data->{'param'}{'comment'} = $upsInfo->{'upsIdentManufacturer'} . " " . - $upsInfo->{'upsIdentModel'} . " " . + $upsInfo->{'upsIdentModel'} . " " . $upsInfo->{'upsIdentUPSSoftwareVersion'}; # PROG: Discover number of lines (in,out,bypass)... @@ -130,7 +130,7 @@ sub buildConfig $cb->addSubtree( $devNode, 'Battery', { 'precedence' => 999 }, [ 'RFC1628_UPS_MIB::battery-subtree' ] ); - + if( $devdetails->hasCap('UPS-input') ) { my $nodeInput = $cb->addSubtree( $devNode, 'Input', diff --git a/src/lib/Torrus/DevDiscover/RFC1697_RDBMS.pm b/src/lib/Torrus/DevDiscover/RFC1697_RDBMS.pm index b00ce42..7aa654c 100644 --- a/src/lib/Torrus/DevDiscover/RFC1697_RDBMS.pm +++ b/src/lib/Torrus/DevDiscover/RFC1697_RDBMS.pm @@ -124,9 +124,9 @@ sub discover for my $INDEX ( $devdetails->getSnmpIndices( $dd->oiddef('rdbmsDbIndex') ) ) { - + push( @{$ref->{'indices'}}, $INDEX ); - + my $vendor = $devdetails->snmpVar( $dd->oiddef('rdbmsDbVendorName') . '.' . $INDEX ); @@ -159,7 +159,7 @@ sub discover my $nick = "Vendor_" . $vendor . "_DB_" . $dbName; $nick =~ s/^\///; $nick =~ s/\W/_/g; - $nick =~ s/_+/_/g; + $nick =~ s/_+/_/g; my $descr = "Vendor: $vendor DB: $dbName"; $descr .= " Contact: $dbContact" if $dbContact; diff --git a/src/lib/Torrus/DevDiscover/RFC2011_IP_MIB.pm b/src/lib/Torrus/DevDiscover/RFC2011_IP_MIB.pm index 666a1d1..380e0ea 100644 --- a/src/lib/Torrus/DevDiscover/RFC2011_IP_MIB.pm +++ b/src/lib/Torrus/DevDiscover/RFC2011_IP_MIB.pm @@ -50,12 +50,12 @@ sub discover my $table = $session->get_table( -baseoid => $dd->oiddef('ipNetToMediaPhysAddress')); - + if( not defined($table) or scalar(keys %{$table}) == 0 ) { return 0; } - + $devdetails->storeSnmpVars( $table ); for my $INDEX @@ -80,7 +80,7 @@ sub discover $data->{'ipNetToMedia'}{$ipAddr} = $phyAddr; $data->{'mediaToIpNet'}{$phyAddr} = $ipAddr; } - + return 1; } diff --git a/src/lib/Torrus/DevDiscover/RFC2670_DOCS_IF.pm b/src/lib/Torrus/DevDiscover/RFC2670_DOCS_IF.pm index db1b122..8e38904 100644 --- a/src/lib/Torrus/DevDiscover/RFC2670_DOCS_IF.pm +++ b/src/lib/Torrus/DevDiscover/RFC2670_DOCS_IF.pm @@ -96,7 +96,7 @@ sub discover { $devdetails->storeSnmpVars( $snrTable ); } - + $data->{'docsCableMaclayer'} = []; $data->{'docsCableDownstream'} = []; $data->{'docsCableUpstream'} = []; @@ -113,7 +113,7 @@ sub discover { $interface->{'docsParams'}{'interface-index'} = $ifIndex; } - + if( $ifType == 127 ) { push( @{$data->{'docsCableMaclayer'}}, $ifIndex ); @@ -135,11 +135,11 @@ sub discover push( @{$data->{'docsCableUpstream'}}, $ifIndex ); push( @{$interface->{'docsTemplates'}}, 'RFC2670_DOCS_IF::docsis-upstream-stats' ); - + } } } - + if( $devdetails->paramEnabled('RFC2670_DOCS_IF::upstreams-only') ) { $data->{'docsCableMaclayer'} = []; @@ -153,7 +153,7 @@ sub discover 'templates' => [], 'param' => { 'node-display-name' => 'DOCSIS MAC Layer', - }, + }, }, 'docsCableDownstream' => { 'subtreeName' => 'Docsis_Downstream', @@ -161,7 +161,7 @@ sub discover 'templates' => [], 'param' => { 'node-display-name' => 'DOCSIS Downstream', - }, + }, }, 'docsCableUpstream' => { 'subtreeName' => 'Docsis_Upstream', @@ -169,16 +169,16 @@ sub discover 'templates' => ['RFC2670_DOCS_IF::docsis-upstream-subtree'], 'param' => { 'node-display-name' => 'DOCSIS Upstream', - }, + }, }, }; if( $devdetails->hasCap('docsDownstreamUtil') ) { push( @{$data->{'docsConfig'}{'docsCableDownstream'}{'templates'}}, - 'RFC2670_DOCS_IF::docsis-downstream-subtree' ); + 'RFC2670_DOCS_IF::docsis-downstream-subtree' ); } - + return 1; } @@ -205,7 +205,7 @@ sub buildConfig push( @{$updatedInterfaceList}, $ifIndex ); } $data->{$category} = $updatedInterfaceList; - + next if scalar( @{$data->{$category}} ) == 0; my $subtreeNode = @@ -226,24 +226,24 @@ sub buildConfig $ifParam->{'searchable'} = 'yes'; # Copy some parameters from IF-MIB discovery results - + for my $p ('interface-name', 'interface-nick', 'node-display-name', 'comment') { $ifParam->{$p} = $interface->{'param'}{$p}; } - + $ifParam->{'nodeid-docsif'} = $data->{'docsConfig'}{$category}{'nodeidCategory'} . '//%nodeid-device%//' . $interface->{$data->{'nameref'}{'ifNodeid'}}; - + $ifParam->{'nodeid'} = '%nodeid-docsif%'; - + my $intfNode = $cb->addSubtree ( $subtreeNode, $interface->{$data->{'nameref'}{'ifSubtreeName'}}, - $ifParam, + $ifParam, $interface->{'docsTemplates'} ); # Apply selector actions @@ -281,7 +281,7 @@ sub buildConfig { $cb->addLeaf( $intfNode, 'Uncorrectable', {'monitor' => $monitor } ); - } + } } elsif( $category eq 'docsCableDownstream') { diff --git a/src/lib/Torrus/DevDiscover/RFC2790_HOST_RESOURCES.pm b/src/lib/Torrus/DevDiscover/RFC2790_HOST_RESOURCES.pm index 0e4a806..a398012 100644 --- a/src/lib/Torrus/DevDiscover/RFC2790_HOST_RESOURCES.pm +++ b/src/lib/Torrus/DevDiscover/RFC2790_HOST_RESOURCES.pm @@ -202,7 +202,7 @@ sub discover { $data->{'hrProcessors'} = []; my $prefixLen = length( $base ) + 1; - + while( my( $oid, $load ) = each %{$table} ) { push( @{$data->{'hrProcessors'}}, substr( $oid, $prefixLen )); @@ -214,7 +214,7 @@ sub discover } } } - + return 1; } @@ -259,16 +259,16 @@ sub buildConfig for my $INDEX ( sort {$a<=>$b} @{$data->{'hrProcessors'}} ) { my $cpuName = 'CPU_' . $INDEX . '_Load'; - + my $param = { 'cpu-id' => $INDEX, 'node-display-name' => 'CPU ' . $INDEX . ' Load', 'precedence' => sprintf("%d", 1000 - $INDEX), }; - + $cb->addLeaf( $subtreeNode, $cpuName, $param, ['RFC2790_HOST_RESOURCES::hr-processor-load']); - + } } } diff --git a/src/lib/Torrus/DevDiscover/Symmetricom.pm b/src/lib/Torrus/DevDiscover/Symmetricom.pm index a11d3ad..56f580a 100644 --- a/src/lib/Torrus/DevDiscover/Symmetricom.pm +++ b/src/lib/Torrus/DevDiscover/Symmetricom.pm @@ -58,7 +58,7 @@ sub checkdevtype { return 0; } - + $devdetails->setCap('interfaceIndexingPersistent'); $devdetails->setDevType('UcdSnmp'); # Force load Ucd @@ -80,9 +80,9 @@ sub discover $data->{'ntp'} = $ntpComment; $data->{'param'}{'comment'} = - $ntpComment->{'ntpSysSystem'} . " " . $ntpComment->{'etcModel'} . + $ntpComment->{'ntpSysSystem'} . " " . $ntpComment->{'etcModel'} . ", Hw Serial#: " . $ntpComment->{'etcSerialNbr'}; - + return 1; } diff --git a/src/lib/Torrus/DevDiscover/Thomson_xDSL.pm b/src/lib/Torrus/DevDiscover/Thomson_xDSL.pm index 117933e..c1f402a 100644 --- a/src/lib/Torrus/DevDiscover/Thomson_xDSL.pm +++ b/src/lib/Torrus/DevDiscover/Thomson_xDSL.pm @@ -51,7 +51,7 @@ sub checkdevtype { return 0; } - + $devdetails->setCap('interfaceIndexingPersistent'); &Torrus::DevDiscover::RFC2863_IF_MIB::addInterfaceFilter @@ -60,7 +60,7 @@ sub checkdevtype 'BRG' => { 'ifType' => 6, # ethernetCsmacd 'ifDescr' => '^BRG:' } }); - + return 1; } @@ -72,14 +72,14 @@ sub discover my $data = $devdetails->data(); my $session = $dd->session(); - + $data->{'nameref'}{'ifSubtreeName'} = 'ifNameT'; $data->{'nameref'}{'ifReferenceName'} = 'ifName'; $data->{'nameref'}{'ifNick'} = 'ifIndex'; $data->{'nameref'}{'ifNodeid'} = 'ifIndex'; undef $data->{'nameref'}{'ifComment'}; - + $data->{'param'}{'snmp-oids-per-pdu'} = 10; return 1; } diff --git a/src/lib/Torrus/DevDiscover/UcdSnmp.pm b/src/lib/Torrus/DevDiscover/UcdSnmp.pm index ce317c0..8506821 100644 --- a/src/lib/Torrus/DevDiscover/UcdSnmp.pm +++ b/src/lib/Torrus/DevDiscover/UcdSnmp.pm @@ -70,7 +70,7 @@ sub checkdevtype my $devdetails = shift; my $sysObjectID = $devdetails->snmpVar( $dd->oiddef('sysObjectID') ); - + if( not $dd->oidBaseMatch( 'ucd', $sysObjectID ) and not $dd->oidBaseMatch( 'net_snmp', $sysObjectID ) ) @@ -136,7 +136,7 @@ sub buildConfig # Hostresources MIB is optional in net-snmp. We try and use the same # subtree name for UCD and Hostresources statistics. - + my $subtreeName = $devdetails->paramString ('RFC2790_HOST_RESOURCES::sysperf-subtree-name'); if( $subtreeName eq '' ) diff --git a/src/lib/Torrus/DevDiscover/Xylan.pm b/src/lib/Torrus/DevDiscover/Xylan.pm index cf55e01..a35fd1f 100644 --- a/src/lib/Torrus/DevDiscover/Xylan.pm +++ b/src/lib/Torrus/DevDiscover/Xylan.pm @@ -123,7 +123,7 @@ sub discover $data->{'nameref'}{'ifSubtreeName'} = 'xylanInterfaceNick'; $data->{'nameref'}{'ifComment'} = 'xylanInterfaceComment'; $data->{'nameref'}{'ifReferenceName'} = 'xylanInterfaceHumanName'; - + my $phyPortTable = $session->get_table( -baseoid => $dd->oiddef('xylanPhyPortTable') ); diff --git a/src/lib/Torrus/ReportGenerator/MonthlySrvUsage.pm b/src/lib/Torrus/ReportGenerator/MonthlySrvUsage.pm index 7054ef5..ccd643a 100644 --- a/src/lib/Torrus/ReportGenerator/MonthlySrvUsage.pm +++ b/src/lib/Torrus/ReportGenerator/MonthlySrvUsage.pm @@ -18,7 +18,7 @@ # For all service IDs available, build monthly usage figures: # Average, Maximum, and Percentile (default 95th percentile) -# +# package Torrus::ReportGenerator::MonthlySrvUsage; @@ -65,12 +65,12 @@ sub generate } my $srvIDParams = Torrus::ServiceID->new(); - + my $srvIDs = $self->{'srvexport'}->getServiceIDs(); for my $serviceid ( @{$srvIDs} ) { &Torrus::DB::checkInterrupted(); - + my $data = $self->{'srvexport'}->getIntervalData ( $self->{'StartDate'}, $self->{'EndDate'}, $serviceid ); @@ -80,16 +80,16 @@ sub generate Debug('MonthlySrvUsage: Generating report for ' . $serviceid); my $params = $srvIDParams->getParams( $serviceid ); - + my @aligned = (); $#aligned = floor( $self->{'RangeSeconds'} / $step ); my $nDatapoints = scalar( @aligned ); - + # Fill in the aligned array. For each interval by modulo(step), # we take the maximum value from the available data my $maxVal = 0; - + for my $row ( @{$data} ) { my $rowtime = str2time( $row->{'srv_date'} . 'T' . @@ -101,7 +101,7 @@ sub generate $value->bzero(); $row->{'value'} = 0; } - + if( ( not defined( $aligned[$pos] ) ) or $aligned[$pos] < $value ) { @@ -172,25 +172,25 @@ sub generate $volumeUnits = 'GB'; $volume /= 1073741824; } - + $self->{'backend'}->addField( $self->{'reportId'}, { 'name' => 'MAX', 'serviceid' => $serviceid, 'value' => $maxVal, 'units' => $usageUnits }); - + $self->{'backend'}->addField( $self->{'reportId'}, { 'name' => 'AVG', 'serviceid' => $serviceid, 'value' => $avgVal, 'units' => $usageUnits }); - + $self->{'backend'}->addField( $self->{'reportId'}, { 'name' => sprintf('%s%s', $percentile, 'TH_PERCENTILE'), 'serviceid' => $serviceid, 'value' => $pcVal, 'units' => $usageUnits }); - + $self->{'backend'}->addField( $self->{'reportId'}, { 'name' => 'UNAVAIL', 'serviceid' => $serviceid, diff --git a/src/lib/Torrus/SQL/ReportFields.pm b/src/lib/Torrus/SQL/ReportFields.pm index f3aa49e..a451cd6 100644 --- a/src/lib/Torrus/SQL/ReportFields.pm +++ b/src/lib/Torrus/SQL/ReportFields.pm @@ -29,7 +29,7 @@ use base 'Torrus::SQL'; our $VERSION = 1.0; -# The name of the table and columns +# The name of the table and columns # defaults configured in torrus-config.pl our $tableName; our %columns; @@ -39,9 +39,9 @@ sub add my $self = shift; my $reportId = shift; my $attrs = shift; - + my $id = $self->sequenceNext(); - + $self->{'sql'}->insert({ 'table' => $tableName, 'fields' => { $columns{'id'} => $id, @@ -58,7 +58,7 @@ sub getAll { my $self = shift; my $reportId = shift; - + $self->{'sql'}->select({ 'table' => $tableName, 'where' => { $columns{'rep_id'} => $reportId }, @@ -75,16 +75,16 @@ sub removeAll { my $self = shift; my $reportId = shift; - + $self->{'sql'}->delete({ 'table' => $tableName, 'where' => { $columns{'rep_id'} => $reportId }}); return; -} - - - - +} + + + + 1; -- 2.11.4.GIT