syntaxer run

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
+10 -8
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 -4
View File
@@ -11,17 +11,17 @@ if($device['os'] == "vrp")
if (is_array($processors_array))
{
foreach ($processors_array as $index => $entry)
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);
discover_processor($valid['processor'], $device, $usage_oid, $index, "vrp", $descr, "1", $usage, NULL, NULL);
}
} ## End if checks
} ## End Foreach