Merge pull request #3204 from murrant/hpilo

Check the sysObjectID before trying to detect ILO temp sensors.
This commit is contained in:
Neil Lathwood
2016-03-09 20:34:03 +00:00
@@ -1,26 +1,28 @@
<?php <?php
echo 'HP_ILO '; if (strpos($sysObjectId, '.1.3.6.1.4.1.232.') !== false) {
$oids = snmp_walk($device, '1.3.6.1.4.1.232.6.2.6.8.1.2.1', '-Osqn', ''); echo 'HP_ILO ';
$oids = trim($oids); $oids = snmp_walk($device, '1.3.6.1.4.1.232.6.2.6.8.1.2.1', '-Osqn', '');
foreach (explode("\n", $oids) as $data) { $oids = trim($oids);
$data = trim($data); foreach (explode("\n", $oids) as $data) {
if ($data != '') { $data = trim($data);
list($oid) = explode(' ', $data); if ($data != '') {
$split_oid = explode('.', $oid); list($oid) = explode(' ', $data);
$temperature_id = $split_oid[(count($split_oid) - 2)].'.'.$split_oid[(count($split_oid) - 1)]; $split_oid = explode('.', $oid);
$temperature_id = $split_oid[(count($split_oid) - 2)].'.'.$split_oid[(count($split_oid) - 1)];
$descr_oid = "1.3.6.1.4.1.232.6.2.6.8.1.3.$temperature_id"; $descr_oid = "1.3.6.1.4.1.232.6.2.6.8.1.3.$temperature_id";
$descr = snmp_get($device, $descr_oid, '-Oqnv', 'CPQHLTH-MIB'); $descr = snmp_get($device, $descr_oid, '-Oqnv', 'CPQHLTH-MIB');
$temperature_oid = "1.3.6.1.4.1.232.6.2.6.8.1.4.$temperature_id"; $temperature_oid = "1.3.6.1.4.1.232.6.2.6.8.1.4.$temperature_id";
$temperature = snmp_get($device, $temperature_oid, '-Oqv', ''); $temperature = snmp_get($device, $temperature_oid, '-Oqv', '');
$threshold_oid = "1.3.6.1.4.1.232.6.2.6.8.1.5.$temperature_id"; $threshold_oid = "1.3.6.1.4.1.232.6.2.6.8.1.5.$temperature_id";
$threshold = snmp_get($device, $threshold_oid, '-Oqv', ''); $threshold = snmp_get($device, $threshold_oid, '-Oqv', '');
if (!empty($temperature)) { if (!empty($temperature)) {
discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'hpilo', $descr, '1', '1', null, null, null, $threshold, $temperature); discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $oid, 'hpilo', $descr, '1', '1', null, null, null, $threshold, $temperature);
}
} }
} }
} }