diff --git a/includes/polling/functions.inc.php b/includes/polling/functions.inc.php index 84fb185572..36ba1a009e 100644 --- a/includes/polling/functions.inc.php +++ b/includes/polling/functions.inc.php @@ -467,6 +467,8 @@ function get_main_serial($device) $serial_output = snmp_get_multi($device, 'entPhysicalSerialNum.1 entPhysicalSerialNum.1001', '-OQUs', 'ENTITY-MIB:OLD-CISCO-CHASSIS-MIB'); if (!empty($serial_output[1]['entPhysicalSerialNum'])) { return $serial_output[1]['entPhysicalSerialNum']; + } elseif (!empty($serial_output[1000]['entPhysicalSerialNum'])) { + return $serial_output[1000]['entPhysicalSerialNum']; } elseif (!empty($serial_output[1001]['entPhysicalSerialNum'])) { return $serial_output[1001]['entPhysicalSerialNum']; } diff --git a/includes/polling/os/ios.inc.php b/includes/polling/os/ios.inc.php index 3d323a76a3..be392e59e6 100644 --- a/includes/polling/os/ios.inc.php +++ b/includes/polling/os/ios.inc.php @@ -34,7 +34,12 @@ if ($data[1]['entPhysicalContainedIn'] == '0') { $hardware = $data[1]['entPhysicalModelName']; } } -if (!empty($data[1001]['entPhysicalModelName'])) { + +if (!empty($data[1000]['entPhysicalModelName'])) { + $hardware = $data[1000]['entPhysicalModelName']; +} elseif (!empty($data[1000]['entPhysicalContainedIn'])) { + $hardware = $data[$data[1000]['entPhysicalContainedIn']]['entPhysicalName']; +} elseif (!empty($data[1001]['entPhysicalModelName'])) { $hardware = $data[1001]['entPhysicalModelName']; } elseif (!empty($data[1001]['entPhysicalContainedIn'])) { $hardware = $data[$data[1001]['entPhysicalContainedIn']]['entPhysicalName'];