From 35ad2004f6707415cab37e7357ea4008c72f5134 Mon Sep 17 00:00:00 2001 From: Casey Schoonover Date: Mon, 27 Jun 2016 10:22:23 -0500 Subject: [PATCH 1/2] Added additional DNOS polling for hardware/firmware version --- includes/polling/os/dnos.inc.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/includes/polling/os/dnos.inc.php b/includes/polling/os/dnos.inc.php index 3db01a8a6a..fea9b7e1f4 100644 --- a/includes/polling/os/dnos.inc.php +++ b/includes/polling/os/dnos.inc.php @@ -9,6 +9,17 @@ Copyright (c) 1999-2015 by Dell Inc. All Rights Reserved. Build Time: Mon May 4 20:52:56 2015"; */ -list(,,$version,$hardware,,) = explode(PHP_EOL, $poll_device['sysDescr']); -list(,$version) = explode(': ',$version); -list(,$hardware) = explode(': ',$hardware); + + +$temp_hardware = snmp_get($device, 'productIdentificationDisplayName.0', '-Ovq', 'Dell-Vendor-MIB'); + +if (preg_match('/Dell Networking N[1234].*/' , $temp_hardware) == 1) { // If Dell N-Series + $hardware = $temp_hardware; + $version = snmp_get($device, 'productIdentificationVersion.0', '-Ovq', 'Dell-Vendor-MIB'); + $features = snmp_get($device, 'productIdentificationDescription.0', '-Ovq', 'Dell-Vendor-MIB'); +} +else { // Assume S-series + list(,,$version,$hardware,,) = explode(PHP_EOL, $poll_device['sysDescr']); + list(,$version) = explode(': ',$version); + list(,$hardware) = explode(': ',$hardware); +} From d3569140cd4d68930ac37e4a4fc9fbe3140bd52d Mon Sep 17 00:00:00 2001 From: Casey Schoonover Date: Mon, 27 Jun 2016 10:23:08 -0500 Subject: [PATCH 2/2] Removed some unnecessary whitespace --- includes/polling/os/dnos.inc.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/includes/polling/os/dnos.inc.php b/includes/polling/os/dnos.inc.php index fea9b7e1f4..9b3f1a1d57 100644 --- a/includes/polling/os/dnos.inc.php +++ b/includes/polling/os/dnos.inc.php @@ -9,8 +9,6 @@ Copyright (c) 1999-2015 by Dell Inc. All Rights Reserved. Build Time: Mon May 4 20:52:56 2015"; */ - - $temp_hardware = snmp_get($device, 'productIdentificationDisplayName.0', '-Ovq', 'Dell-Vendor-MIB'); if (preg_match('/Dell Networking N[1234].*/' , $temp_hardware) == 1) { // If Dell N-Series