snmp__if_combined: don't pull in unneeded data.

plugins/snmp/snmp__if_combined

@@ -85,12 +85,11 @@ Should support indexing by
   - ifIndex
   - ifName
   - ifDescr
-  - ifAlias
   - mac-address
 
 (and anything else MRTG can index by) in addition to OID-index as now.
 
-Pulling in a user definable set of ifName/ifDescr/ifAlias for textual
+Pulling in a user definable set of ifName/ifDescr for textual
 description and even graph_title would also be nice.
 
 IFF we get a patch to support the .oldname attribute then we may use
@@ -447,33 +446,22 @@ sub do_collect {
 	{ 2  => 'ifDescr',
 	  # Type: See above
 	  3  => 'ifType',
-	  4  => 'ifMtu',
 	  5  => 'ifSpeed',
-	  6  => 'ifMac',
-	  7  => 'ifAdminStatus',
 	  # Oper: 1) up 2) down 3) testing
 	  # 4) unknown, 5) dormant 6) not present
 	  # 7) lowerLayerDown
 	  8  => 'ifOperStatus',
 	  10 => 'ifInOctets',
-	  11 => 'ifInUcastPkts',
-	  15 => 'ifUnUnknownProtos',
 	  16 => 'ifOutOctets',
-	  18 => 'ifOutNUcastPkts',
 	});
 
     # ifXEntry - SNMP v2 and up only - on some devices
     $snmpinfoX = $session->get_hash(
 	-baseoid => $ifv2OIDBase,
 	-cols    =>
-	{ 2  => 'ifInMulticastPkts',
+	{ 6  => 'ifHCInOctets',
-	  3  => 'ifInBroadcastPkts',
-	  4  => 'ifOutMulticastPkts',
-	  5  => 'ifOutBroadcastPkts',
-	  6  => 'ifHCInOctets',
 	  10 => 'ifHCOutOctets',
 	  15 => 'ifHighSpeed',
-	  18 => 'ifAlias',
 	});
 }