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

syntaxer run

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2580 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Tom Laermans
2011-09-26 16:06:18 +00:00
parent 6a8f2362a2
commit 6b8cba3d24
11 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
html/pages/devices.inc.php
View File

@@ -247,7 +247,7 @@ if($format == "graph")
{
$graph_type = "device_".$subformat;
if($_SESSION['widescreen']) { $width=270; } else { $width=315; }
if ($_SESSION['widescreen']) { $width=270; } else { $width=315; }
echo("<div style='display: block; padding: 1px; margin: 2px; min-width: ".($width+78)."px; max-width:".($width+78)."px; min-height:170px; max-height:170px; text-align: center; float: left; background-color: #f5f5f5;'>
<a href='device/device=".$device['device_id']."/' onmouseover=\"return overlib('\

2
html/pages/graphs.inc.php
View File

@@ -82,7 +82,7 @@ if (!$auth)
echo("<hr />");
if($vars['legend'] == "no")
if ($vars['legend'] == "no")
{
echo(generate_link("Show Legend",$vars, array('page' => "graphs", 'legend' => NULL)));
} else {

6
html/pages/routing/bgp.inc.php
View File

@@ -66,7 +66,7 @@ else
## End BGP Menu
if(!isset($vars['view'])) { $vars['view'] = 'details'; }
if (!isset($vars['view'])) { $vars['view'] = 'details'; }
echo('<div style="float: right;">');
@@ -140,12 +140,12 @@ else
$where = "AND D.bgpLocalAs = B.bgpPeerRemoteAs";
}
if($vars['adminstatus'] == "stop")
if ($vars['adminstatus'] == "stop")
{
$where .= " AND (B.bgpPeerAdminStatus = 'stop')";
}
if($vars['state'] == "down")
if ($vars['state'] == "down")
{
$where .= " AND (B.bgpPeerState != 'established')";
}

2
includes/defaults.inc.php
View File

@@ -351,8 +351,6 @@ $config['poller_modules']['cisco-cef'] = 1;
$config['poller_modules']['cisco-mac-accounting'] = 1;
$config['poller_modules']['cipsec-tunnels'] = 1;
#include("includes/polling/altiga-ssl.inc.php");
## List of discovery modules. Need to be in this array to be
## considered for execution.

18
includes/discovery/mempools/vrp.inc.php
View File

@@ -7,18 +7,20 @@ if($device['os'] == "vrp")
$mempools_array = snmpwalk_cache_multi_oid($device, "hwEntityMemUsage", $mempools_array, "HUAWEI-ENTITY-EXTENT-MIB" , $config['install_dir']."/mibs");
$mempools_array = snmpwalk_cache_multi_oid($device, "hwEntityMemSize", $mempools_array, "HUAWEI-ENTITY-EXTENT-MIB" , $config['install_dir']."/mibs");
$mempools_array = snmpwalk_cache_multi_oid($device, "hwEntityBomEnDesc", $mempools_array, "HUAWEI-ENTITY-EXTENT-MIB" , $config['install_dir']."/mibs");
if($debug) { print_r($mempools_array); }
if ($debug) { print_r($mempools_array); }
if(is_array($mempools_array)) {
foreach($mempools_array as $index => $entry) {
if($entry['hwEntityMemSize'] != 0 ) {
if (is_array($mempools_array))
{
foreach($mempools_array as $index => $entry)
{
if ($entry['hwEntityMemSize'] != 0 )
{
if ($debug) { echo($index . " " . $entry['hwEntityBomEnDesc'] . " -> " . $entry['hwEntityMemUsage'] . " -> " . $entry['hwEntityMemSize'] . "\n"); }
echo($index . " " . $entry['hwEntityBomEnDesc'] . " -> " . $entry['hwEntityMemUsage'] . " -> " . $entry['hwEntityMemSize'] . "\n");
$usage_oid = ".1.3.6.1.4.1.2011.5.25.31.1.1.1.1.7." . $index;
$descr = $entry['hwEntityBomEnDesc'];
$usage = $entry['hwEntityMemUsage'];
if(!strstr($descr, "No") && !strstr($usage, "No") && $descr != "" ) {
if (!strstr($descr, "No") && !strstr($usage, "No") && $descr != "" )
{
discover_mempool($valid_mempool, $device, $index, "vrp", $descr, "1", NULL, NULL);
}
} ## End if checks
@@ -26,6 +28,6 @@ if($device['os'] == "vrp")
} ## End if array
} ## End VRP mempools
unset ($mempools_array);
unset ($mempools_array);
?>

4
includes/discovery/processors/vrp.inc.php
View File

@@ -13,13 +13,13 @@ if($device['os'] == "vrp")
{
foreach ($processors_array as $index => $entry)
{
if ( $entry['hwEntityMemSize'] != 0 )
if ($entry['hwEntityMemSize'] != 0)
{
if ($debug) { echo($index . " " . $entry['hwEntityBomEnDesc'] . " -> " . $entry['hwEntityCpuUsage'] . " -> " . $entry['hwEntityMemSize']. "\n"); }
$usage_oid = ".1.3.6.1.4.1.2011.5.25.31.1.1.1.1.5." . $index;
$descr = $entry['hwEntityBomEnDesc'];
$usage = $entry['hwEntityCpuUsage'];
if(!strstr($descr, "No") && !strstr($usage, "No") && $descr != "" )
if (!strstr($descr, "No") && !strstr($usage, "No") && $descr != "" )
{
discover_processor($valid['processor'], $device, $usage_oid, $index, "vrp", $descr, "1", $usage, NULL, NULL);
}

4
includes/polling/mempools/vrp.inc.php
View File

@@ -5,11 +5,11 @@ $oid = $mempool['mempool_index'];
if($debug) {echo("Huawei VRP Mempool");}
if(!is_array($mempool_cache['vrp'])) {
if($debug) {echo("caching");}
if ($debug) {echo("caching");}
$mempool_cache['vrp'] = array();
$mempool_cache['vrp'] = snmpwalk_cache_multi_oid($device, "hwEntityMemSize", $mempool_cache['vrp'], "HUAWEI-ENTITY-EXTENT-MIB" , $config['install_dir']."/mibs");
$mempool_cache['vrp'] = snmpwalk_cache_multi_oid($device, "hwEntityMemUsage", $mempool_cache['vrp'], "HUAWEI-ENTITY-EXTENT-MIB" , $config['install_dir']."/mibs");
if($debug) {print_r($mempool_cache);}
if ($debug) {print_r($mempool_cache);}
}
$entry = $mempool_cache['vrp'][$mempool[mempool_index]];