From 22a407f77c268ba8f482e4cf685260ae9fcc3d74 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Wed, 11 Apr 2012 23:29:34 +0000 Subject: [PATCH] silly dell with all their different oids - more printer info git-svn-id: http://www.observium.org/svn/observer/trunk@3025 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/polling/os/dell-laser.inc.php | 27 +++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/includes/polling/os/dell-laser.inc.php b/includes/polling/os/dell-laser.inc.php index 28aeaee43a..e3ba6f0133 100644 --- a/includes/polling/os/dell-laser.inc.php +++ b/includes/polling/os/dell-laser.inc.php @@ -3,18 +3,35 @@ # SNMPv2-SMI::enterprises.253.8.51.10.2.1.7.2.28110202 = STRING: "MFG:Dell;CMD:PJL,RASTER,DOWNLOAD,PCLXL,PCL,POSTSCRIPT;MDL:Laser Printer # 3100cn;DES:Dell Laser Printer 3100cn;CLS:PRINTER;STS:AAAMAwAAAAAAAgJ/HgMKBigDCgY8AwAzcJqwggAAwAAACAAAAAAA/w==;" -$dellinfo = explode(';',trim(snmp_get($device, "1.3.6.1.4.1.253.8.51.10.2.1.7.2.28110202", "-OQv", "", ""),'" ')); +$modelinfo = explode(';',trim(snmp_get($device, "1.3.6.1.4.1.253.8.51.10.2.1.7.2.28110202", "-OQv"),'" ')); -foreach ($dellinfo as $dellinf) +# SNMPv2-SMI::enterprises.674.10898.100.2.1.2.1.3.1 = STRING: "COMMAND SET:;MODEL:Dell Laser Printer 5310n" +$modelinfo = array_merge($modelinfo,explode(';',trim(snmp_get($device, "1.3.6.1.4.1.674.10898.100.2.1.2.1.3.1", "-OQv", "", ""),'" '))); + +# SNMPv2-SMI::enterprises.641.2.1.2.1.3.1 = STRING: "COMMAND SET:;MODEL:Dell Laser Printer 1700n" +$modelinfo = array_merge($modelinfo,explode(';',trim(snmp_get($device, "1.3.6.1.4.1.641.2.1.2.1.3.1", "-OQv", "", ""),'" '))); + +foreach ($modelinfo as $line) { - list($key,$value) = explode(':',$dellinf); + list($key,$value) = explode(':',$line); $dell_laser[$key] = $value; } -$hardware = $dell_laser['MDL']; +$hardware = ($dell_laser['MDL'] != "" ? $dell_laser['MDL'] : $dell_laser['MODEL']); list(,$version) = explode('Engine ',$poll_device['sysDescr']); -$version = "Engine " . trim($version,')'); +if ($version) +{ + $version = "Engine " . trim($version,')'); +} +else +{ + $version = trim(snmp_get($device, "1.3.6.1.4.1.674.10898.100.1.1.1.0", "-OQv"),'"'); + if (!$version) + { + $version = trim(snmp_get($device, "1.3.6.1.4.1.641.1.1.1.0", "-OQv"),'"'); + } +} ?> \ No newline at end of file