diff --git a/config.php.default b/config.php.default index ede43b92a7..e982338c3f 100755 --- a/config.php.default +++ b/config.php.default @@ -86,6 +86,7 @@ $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_pseudowires'] = 1; # Enable Pseudowires $config['enable_etherlike'] = 1; # Enable Polling EtherLike-MIB (doubles interface processing time) diff --git a/discovery.php b/discovery.php index 8ddcddbacb..855d926708 100755 --- a/discovery.php +++ b/discovery.php @@ -71,7 +71,7 @@ while ($device = mysql_fetch_array($device_query)) { if($device['os'] == "JunOS") { include("includes/discovery/bgp-peers.php"); } - if($device['os'] == "IOS" || $device['os'] == "IOS XE" || $device['os'] == "CatOS") { + if($device['os'] == "IOS" || $device['os'] == "IOS XE" || $device['os'] == "CatOS" || $device['os'] == "ASA") { include("includes/discovery/cisco-vlans.php"); include("includes/discovery/cisco-physical.php"); include("includes/discovery/bgp-peers.php"); diff --git a/html/includes/graphs/cmpMemPool.inc.php b/html/includes/graphs/cmpMemPool.inc.php index f575260694..c9089ae7b2 100755 --- a/html/includes/graphs/cmpMemPool.inc.php +++ b/html/includes/graphs/cmpMemPool.inc.php @@ -6,7 +6,7 @@ include("common.inc.php"); $iter = "1"; $sql = mysql_query("SELECT * FROM `cmpMemPool` AS C, `devices` AS D where C.`cmp_id` = '".mres($_GET['id'])."' AND C.device_id = D.device_id"); - $rrd_options .= " COMMENT:\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Cur\ \ \ \ Max\\\\n"; + $rrd_options .= " COMMENT:' Cur Max\\n'"; while($mempool = mysql_fetch_array($sql)) { if($iter=="1") {$colour="CC0000";} elseif($iter=="2") {$colour="008C00";} elseif($iter=="3") {$colour="4096EE"; } elseif($iter=="4") {$colour="73880A";} elseif($iter=="5") {$colour="D01F3C";} elseif($iter=="6") {$colour="36393D"; diff --git a/html/pages/device/overview/cmp.inc.php b/html/pages/device/overview/cmp.inc.php index d7a3a5204a..8ee3d679ae 100644 --- a/html/pages/device/overview/cmp.inc.php +++ b/html/pages/device/overview/cmp.inc.php @@ -15,7 +15,7 @@ if(mysql_result(mysql_query("SELECT count(*) from cmpMemPool WHERE device_id = ' $mempool['descr_fixed'] = str_replace("Sub-Module", "Mod", $mempool['descr_fixed']); $mempool['descr_fixed'] = str_replace("DFC Card", "DFC", $mempool['descr_fixed']); - $proc_url = "?page=device/".$device['device_id']."/sensors/mempools/"; + $proc_url = "/device/".$device['device_id']."/health/cmp/"; $mempool_popup = "onmouseover=\"return overlib('