From aeee6d1eed7e48577690297b7906bd75cacdb498 Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Fri, 30 Jul 2010 13:35:58 +0000 Subject: [PATCH] junos processor detection change git-svn-id: http://www.observium.org/svn/observer/trunk@1542 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/discovery/processors/junos.inc.php | 2 +- includes/polling/os/procurve.inc.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/discovery/processors/junos.inc.php b/includes/discovery/processors/junos.inc.php index 147fcde56..5f206aadb 100755 --- a/includes/discovery/processors/junos.inc.php +++ b/includes/discovery/processors/junos.inc.php @@ -15,7 +15,7 @@ if($device['os'] == "junos") { foreach ($processors_array[$device['device_id']] as $index => $entry) { - if ($entry['jnxOperatingDRAMSize'] && !strpos($entry['jnxOperatingDescr'], "sensor") && !strstr($entry['jnxOperatingDescr'], "fan")) + if ($entry['jnxOperatingDescr'] == "Routing Engine" || $entry['jnxOperatingDRAMSize'] && !strpos($entry['jnxOperatingDescr'], "sensor") && !strstr($entry['jnxOperatingDescr'], "fan")) { if ($debug) { echo($index . " " . $entry['jnxOperatingDescr'] . " -> " . $entry['jnxOperatingCPU'] . " -> " . $entry['jnxOperatingDRAMSize'] . "\n"); } $usage_oid = ".1.3.6.1.4.1.2636.3.1.13.1.8." . $index; diff --git a/includes/polling/os/procurve.inc.php b/includes/polling/os/procurve.inc.php index 679138e12..902807490 100755 --- a/includes/polling/os/procurve.inc.php +++ b/includes/polling/os/procurve.inc.php @@ -3,6 +3,8 @@ list($hardware, $features, $version) = explode(",", str_replace(", ", ",", $sysDescr)); list($version) = explode("(", $version); + + $cpurrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/procurve-cpu.rrd"; $memrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/procurve-mem.rrd";