mirror of
				https://github.com/librenms/librenms.git
				synced 2024-10-07 16:52:45 +00:00 
			
		
		
		
	Add Blue Coat Packetshaper detection, fix Minkels RMS polling, more printer devices, minor fixes here and there
git-svn-id: http://www.observium.org/svn/observer/trunk@1480 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
		| @@ -4,7 +4,7 @@ if(!$os) { | ||||
|  | ||||
|   if(strstr($sysDescr, "Pulsar M")) { $os = "mgeups"; } | ||||
|   else if(strstr($sysDescr, "Evolution S")) { $os = "mgeups"; } | ||||
|   else if(strstr($sysDescr, "Galaxy PW")) { $os = "mgeups"; } | ||||
|   else if (preg_match("/^Galaxy /", $sysDescr)) { $os = "mgeups"; } | ||||
|  | ||||
| } | ||||
|  | ||||
|   | ||||
							
								
								
									
										9
									
								
								includes/discovery/os/okilan.inc.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								includes/discovery/os/okilan.inc.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| <?php | ||||
|  | ||||
| if(!$os) { | ||||
|  | ||||
|   if(strstr($sysDescr, "OKI OkiLAN")) { $os = "okilan"; } | ||||
|  | ||||
| } | ||||
|  | ||||
| ?> | ||||
							
								
								
									
										9
									
								
								includes/discovery/os/packetshaper.inc.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								includes/discovery/os/packetshaper.inc.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| <?php | ||||
|  | ||||
| if(!$os) { | ||||
|  | ||||
|   if(strstr($sysDescr, "PacketShaper")) { $os = "packetshaper"; } | ||||
|  | ||||
| } | ||||
|  | ||||
| ?> | ||||
| @@ -1,14 +1,20 @@ | ||||
| <?php | ||||
|  | ||||
|   $hardware = snmp_get($device, "hrDeviceDescr", "-OQv", "HOST-RESOURCES-MIB"); | ||||
| # 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==;" | ||||
|  | ||||
|   list(,$version) = split('Engine ',$sysDescr); | ||||
|    | ||||
|   $version = "Engine " . trim($version,')'); | ||||
| $dellinfo = explode(';',trim(snmp_get($device, "1.3.6.1.4.1.253.8.51.10.2.1.7.2.28110202", "-OQv", "", ""),'" ')); | ||||
|  | ||||
|   if (strstr($hardware  ,';')) | ||||
|   { | ||||
|     $hardware = substr($hardware,0,strpos($hardware,';')); | ||||
|   } | ||||
| foreach ($dellinfo as $dellinf) | ||||
| { | ||||
|   list($key,$value) = explode(':',$dellinf); | ||||
|   $dell_laser[$key] = $value; | ||||
| } | ||||
|      | ||||
| $hardware = $dell_laser['MDL']; | ||||
|      | ||||
| list(,$version) = split('Engine ',$sysDescr); | ||||
|  | ||||
| $version = "Engine " . trim($version,')'); | ||||
|  | ||||
| ?> | ||||
|   | ||||
							
								
								
									
										26
									
								
								includes/polling/os/jetdirect.inc.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								includes/polling/os/jetdirect.inc.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,26 @@ | ||||
| <?php | ||||
|  | ||||
| # ...7.0 = STRING: "MFG:Hewlett-Packard;CMD:PJL,MLC,BIDI-ECP,PCL,POSTSCRIPT,PCLXL;MDL:hp LaserJet 1320 series;CLS:PRINTER;DES:Hewlett-Packard LaserJet 1320 series;MEM:9MB;COMMENT:RES=1200x1;" | ||||
|  | ||||
| $jdinfo = explode(';',trim(snmp_get($device, "1.3.6.1.4.1.11.2.3.9.1.1.7.0", "-OQv", "", ""),'" ')); | ||||
|  | ||||
| foreach ($jdinfo as $jdi) | ||||
| { | ||||
|   list($key,$value) = explode(':',$jdi); | ||||
|   $jetdirect[$key] = $value; | ||||
| } | ||||
|  | ||||
| $hardware = $jetdirect['DES']; | ||||
|  | ||||
| if ($hardware == '') | ||||
| { | ||||
|   $hardware = $jetdirect['DESCRIPTION']; | ||||
| } | ||||
|  | ||||
| # Strip off useless brand fields | ||||
| $hardware = str_replace('HP ','',$hardware); | ||||
| $hardware = str_replace('Hewlett-Packard ','',$hardware); | ||||
| $hardware = str_replace(' Series','',$hardware); | ||||
| $hardware = ucfirst($hardware); | ||||
|  | ||||
| ?> | ||||
							
								
								
									
										14
									
								
								includes/polling/os/kyocera.inc.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								includes/polling/os/kyocera.inc.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| <?php | ||||
|  | ||||
| # Some useful OIDs at http://www.kyoceramita.be/en/index/kyoware_solutions/system_management/kyocount_3_01.-contextmargin-65897-files-62084-File.cpsdownload.tmp/Models.xml | ||||
|  | ||||
| # SNMPv2-SMI::enterprises.1347.43.5.1.1.1.1 = STRING: "FS-1028MFP" | ||||
| $hardware = trim(snmp_get($device, "1.3.6.1.4.1.1347.43.5.1.1.1.1", "-OQv", "", ""),'" '); | ||||
|  | ||||
| # SNMPv2-SMI::enterprises.1347.43.5.1.1.28.1 = STRING: "QUV9600664" | ||||
| $serial = trim(snmp_get($device, "1.3.6.1.4.1.1347.43.5.1.1.28.1", "-OQv", "", ""),'" '); | ||||
|  | ||||
| # SNMPv2-SMI::enterprises.1347.43.5.4.1.5.1.1 = STRING: "2H9_2F00.002.002" | ||||
| $version = trim(snmp_get($device, "1.3.6.1.4.1.1347.43.5.4.1.5.1.1", "-OQv", "", ""),'" '); | ||||
|  | ||||
| ?> | ||||
| @@ -2,6 +2,6 @@ | ||||
|  | ||||
| # AKCP clone | ||||
|  | ||||
| include('includes/polling/device-akcp.inc.php'); | ||||
| include('includes/polling/os/akcp.inc.php'); | ||||
|  | ||||
| ?> | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| <?php | ||||
|  | ||||
| $version = trim(snmp_get($device, "1.3.6.1.4.1.14988.1.1.4.4.0", "-OQv", "", ""),'"'); | ||||
| $features .= "Level " . trim(snmp_get($device, "1.3.6.1.4.1.14988.1.1.4.3.0", "-OQv", "", ""),'"'); | ||||
| $features = "Level " . trim(snmp_get($device, "1.3.6.1.4.1.14988.1.1.4.3.0", "-OQv", "", ""),'"'); | ||||
|  | ||||
| ?> | ||||
|   | ||||
							
								
								
									
										25
									
								
								includes/polling/os/xerox.inc.php
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								includes/polling/os/xerox.inc.php
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,25 @@ | ||||
| <?php | ||||
|  | ||||
| # ...253.8.51.1.2.1.20.1 = STRING: "MFG:Xerox;CMD:Adobe PostScript 3,PCL;MDL:Phaser 4510N;CLS:Printer;DES:Xerox Phaser 4510 Laser Printer, PostScript 3, Letter/A4 Size" | ||||
|  | ||||
| $xinfo = explode(';',trim(snmp_get($device, "1.3.6.1.4.1.253.8.51.1.2.1.20.1", "-OQv", "", ""),'" ')); | ||||
|  | ||||
| foreach ($xinfo as $xi) | ||||
| { | ||||
|   list($key,$value) = explode(':',$xi); | ||||
|   $xerox[$key] = $value; | ||||
| } | ||||
|  | ||||
| list($hardware) = explode(',',$xerox['DES']); | ||||
|  | ||||
| #SNMPv2-SMI::enterprises.236.11.5.1.1.1.1.0 = STRING: "Xerox Phaser 3200MFP" | ||||
| #SNMPv2-SMI::enterprises.236.11.5.1.1.1.2.0 = STRING: "1.15" | ||||
|  | ||||
| if ($hardware == '') | ||||
| { | ||||
|   $hardware = trim(snmp_get($device, "1.3.6.1.4.1.236.11.5.1.1.1.1.0", "-OQv", "", ""),'" '); | ||||
| } | ||||
|  | ||||
| $version = trim(snmp_get($device, "1.3.6.1.4.1.236.11.5.1.1.1.2.0", "-OQv", "", ""),'" '); | ||||
|  | ||||
| ?> | ||||
| @@ -154,6 +154,10 @@ $config['os'][$os]['type']    		= "network"; | ||||
| $config['os'][$os]['ifname']  		= 1; | ||||
| $config['os'][$os]['icon']    		= "extreme"; | ||||
|  | ||||
| $os = "packetshaper"; | ||||
| $config['os'][$os]['text']   		= "Blue Coat Packetshaper"; | ||||
| $config['os'][$os]['type']   		= "network"; | ||||
|  | ||||
| $os = "xos"; | ||||
| $config['os'][$os]['text']    		= "Extreme XOS"; | ||||
| $config['os'][$os]['type']    		= "network"; | ||||
| @@ -192,7 +196,7 @@ $config['os'][$os]['text']           	= "Dell DRAC"; | ||||
| $config['os'][$os]['icon']           	= "dell"; | ||||
|  | ||||
| $os = "bcm963"; | ||||
| $config['os'][$os]['text']		= "Broadcom BCM963xxx"; | ||||
| $config['os'][$os]['text']		= "Broadcom BCM963xx"; | ||||
| $config['os'][$os]['icon']		= "broadcom"; | ||||
| $config['os'][$os]['over'][0]['graph']  = "device_bits"; | ||||
| $config['os'][$os]['over'][0]['text']   = "Device Traffic"; | ||||
| @@ -366,6 +370,13 @@ $config['os'][$os]['type']		= "printer"; | ||||
| $config['os'][$os]['over'][0]['graph']  = "device_toner"; | ||||
| $config['os'][$os]['over'][0]['text']   = "Toner"; | ||||
|  | ||||
| $os = "okilan"; | ||||
| $config['os'][$os]['group'] 	   	= "printer"; | ||||
| $config['os'][$os]['text']  	   	= "OKI Printer"; | ||||
| $config['os'][$os]['overgraph'][]       = "device_toner"; | ||||
| $config['os'][$os]['overtext']          = "Toner"; | ||||
| $config['os'][$os]['type']              = "printer"; | ||||
|  | ||||
| $os = "brother"; | ||||
| $config['os'][$os]['group'] 	   	= "printer"; | ||||
| $config['os'][$os]['text']  	   	= "Brother Printer"; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user