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

junos processor detection change

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1542 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-07-30 13:35:58 +00:00
parent 355890c086
commit aeee6d1eed
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/discovery/processors/junos.inc.php
View File

@ -15,7 +15,7 @@ if($device['os'] == "junos")
{ {
foreach ($processors_array[$device['device_id']] as $index => $entry) 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"); } 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; $usage_oid = ".1.3.6.1.4.1.2636.3.1.13.1.8." . $index;

2
includes/polling/os/procurve.inc.php
View File

@ -3,6 +3,8 @@
list($hardware, $features, $version) = explode(",", str_replace(", ", ",", $sysDescr)); list($hardware, $features, $version) = explode(",", str_replace(", ", ",", $sysDescr));
list($version) = explode("(", $version); list($version) = explode("(", $version);
$cpurrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/procurve-cpu.rrd"; $cpurrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/procurve-cpu.rrd";
$memrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/procurve-mem.rrd"; $memrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/procurve-mem.rrd";