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

missing ;, enable cef discovery as default (duh)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2735 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-11-23 15:34:23 +00:00
parent 2237a6ff62
commit cfd3e6d12f
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/includes/print-vlan.inc.php
View File

@@ -27,7 +27,7 @@ foreach (dbFetchRows("SELECT * FROM ports WHERE `device_id` = ? AND `ifVlan` = ?
}
else
{
echo($vlan['port_sep'] . generate_port_link($port, makeshortif($port['label']));
echo($vlan['port_sep'] . generate_port_link($port, makeshortif($port['label'])));
$vlan['port_sep'] = ", ";
}
}

2
includes/defaults.inc.php
View File

@@ -239,6 +239,7 @@ $config['device_traffic_iftype'][] = '/virtual/';
$config['device_traffic_iftype'][] = '/mpls/';
$config['device_traffic_iftype'][] = '/ieee8023adLag/';
$config['device_traffic_iftype'][] = '/l2vlan/';
$config['device_traffic_iftype'][] = '/ppp/';
$config['device_traffic_descr'][] = '/loopback/';
$config['device_traffic_descr'][] = '/vlan/';
@@ -384,6 +385,7 @@ $config['discovery_modules']['cisco-vlans'] = 1;
$config['discovery_modules']['cisco-mac-accounting'] = 1;
$config['discovery_modules']['cisco-pw'] = 1;
$config['discovery_modules']['cisco-vrf'] = 1;
$config['discovery_modules']['cisco-cef'] = 1;
$config['discovery_modules']['vmware-vminfo'] = 1;
$config['discovery_modules']['libvirt-vminfo'] = 1;
$config['discovery_modules']['toner'] = 1;

2
includes/discovery/cisco-cef.inc.php
View File

@@ -4,7 +4,7 @@ echo("Cisco CEF Switching Path: ");
$cefs = array();
$cefs = snmpwalk_cache_threepart_oid($device, "CISCO-CEF-MIB::cefSwitchingPath", $cefs);
if ($debug) { print_r($cefs); }
if (1||$debug) { print_r($cefs); }
if (is_array($cefs))
{