From 82cf34ec35b73c955a51488fba4f13def34795f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= Date: Wed, 22 Jun 2016 21:47:09 +0200 Subject: [PATCH 1/2] Cisco SB SG220 Fix #3529 --- includes/polling/os/ciscosb.inc.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/includes/polling/os/ciscosb.inc.php b/includes/polling/os/ciscosb.inc.php index ec5be7967b..e4ec6c5061 100644 --- a/includes/polling/os/ciscosb.inc.php +++ b/includes/polling/os/ciscosb.inc.php @@ -13,3 +13,7 @@ $version = snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenPara $hardware = str_replace(' ', '', snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamModelName.1', '-Ovq')); $serial = snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamSerialNum.1', '-Ovq'); $features = snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamServiceTag.1', '-Ovq'); + +if ($poll_device['sysObjectID'] == '.1.3.6.1.4.1.9.6.1.89.26.1') { + $hardware = 'SG220-26'; +} \ No newline at end of file From 5262bb0ea98e6d5834fb442d61c1e43d1da13c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= Date: Wed, 22 Jun 2016 21:58:09 +0200 Subject: [PATCH 2/2] Small change. --- includes/polling/os/ciscosb.inc.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/includes/polling/os/ciscosb.inc.php b/includes/polling/os/ciscosb.inc.php index e4ec6c5061..224cb8adee 100644 --- a/includes/polling/os/ciscosb.inc.php +++ b/includes/polling/os/ciscosb.inc.php @@ -9,11 +9,14 @@ * option) any later version. Please see LICENSE.txt at the top level of * the source code distribution for details. */ -$version = snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamSoftwareVersion.1', '-Ovq'); -$hardware = str_replace(' ', '', snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamModelName.1', '-Ovq')); -$serial = snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamSerialNum.1', '-Ovq'); -$features = snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamServiceTag.1', '-Ovq'); if ($poll_device['sysObjectID'] == '.1.3.6.1.4.1.9.6.1.89.26.1') { - $hardware = 'SG220-26'; -} \ No newline at end of file + $hardware = 'SG220-26'; +} +else { + $hardware = str_replace(' ', '', snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamModelName.1', '-Ovq')); +} + +$version = snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamSoftwareVersion.1', '-Ovq'); +$serial = snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamSerialNum.1', '-Ovq'); +$features = snmp_get($device, 'CISCOSB-Physicaldescription-MIB::rlPhdUnitGenParamServiceTag.1', '-Ovq'); \ No newline at end of file