From 4be1dfd004671df4d2f135e4c7bea10777c2639f Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Fri, 13 Aug 2010 13:20:26 +0000 Subject: [PATCH] fortigate hardware from sysObjectID git-svn-id: http://www.observium.org/svn/observer/trunk@1676 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/polling/os/extremeware.inc.php | 1 - includes/polling/os/fortigate.inc.php | 18 +- includes/rewrites.php | 214 ++++++++++++++++-------- poller.php | 1 + 4 files changed, 157 insertions(+), 77 deletions(-) diff --git a/includes/polling/os/extremeware.inc.php b/includes/polling/os/extremeware.inc.php index 6d0b959b23..63f5cba302 100644 --- a/includes/polling/os/extremeware.inc.php +++ b/includes/polling/os/extremeware.inc.php @@ -33,7 +33,6 @@ if(!strpos($sysDescr, "XOS")) { } -$sysObjectID = snmp_get($device, "sysObjectID.0", "-Oqvn"); $hardware = rewrite_extreme_hardware($sysObjectID); if($hardware == $sysObjectID) { unset($hardware); } diff --git a/includes/polling/os/fortigate.inc.php b/includes/polling/os/fortigate.inc.php index b6f2462a2e..770a4d4022 100755 --- a/includes/polling/os/fortigate.inc.php +++ b/includes/polling/os/fortigate.inc.php @@ -4,11 +4,17 @@ echo("Fortinet Fortigate Poller\n"); ## FIX ME - find some fortigate hardware to test this on, and to update and generify it -$fnSysVersion = shell_exec($config['snmpget']. " -M ".$config['mibdir']." -m FORTINET-MIB-280 -".$device['snmpver']." -Ovq -c ".$device['community']." ".$device['hostname'].":".$device['port']." fnSysVersion.0"); -$serial = shell_exec($config['snmpget']. " -M ".$config['mibdir']." -m FORTINET-MIB-280 -".$device['snmpver']." -Ovq -c ".$device['community']." ".$device['hostname'].":".$device['port']." fnSysSerial.0"); +$fnSysVersion = snmp_get($device, "FORTINET-MIB-280::fnSysVersion.0", "-Ovq"); +$serial = snmp_get($device, "FORTINET-MIB-280::fnSysSerial.0", "-Ovq"); -$version = preg_replace("/(.+)\ (.+),(.+),(.+)/", "Fortinet \\1||\\2||\\3||\\4", $fnSysVersion); -list($hardware,$version,$features) = explode("||", $version); +echo("$fnSysVersion"); + +$version = preg_replace("/(.+),(.+),(.+)/", "\\1||\\2||\\3", $fnSysVersion); +list($version,$features) = explode("||", $version); + +if(isset($rewrite_fortinet_hardware[$sysObjectID])) { + $hardware = $rewrite_fortinet_hardware[$sysObjectID]; +} #$cmd = $config['snmpget'] . " -M ".$config['mibdir']. " -m FORTINET-MIB-280 -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname']; #$cmd .= " fnSysCpuUsage.0 fnSysMemUsage.0 fnSysSesCount.0 fnSysMemCapacity.0"; @@ -19,7 +25,7 @@ $sessrrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/fortigate_session $sessions = snmp_get($device, "fnSysSesCount.0", "FORTINET-MIB-280"); -if(is_numeric($sessions) +if(is_numeric($sessions)) { if (!is_file($sessrrd)) { @@ -28,7 +34,7 @@ if(is_numeric($sessions) RRA:MAX:0.5:1:800 RRA:MAX:0.5:6:800 RRA:MAX:0.5:24:800 RRA:MAX:0.5:288:800`; } shell_exec($config['rrdtool'] . " update $sessrrd N:$ses"); - $graphs['fortigate_sessions'] + $graphs['fortigate_sessions'] = TRUE; } ?> diff --git a/includes/rewrites.php b/includes/rewrites.php index 83eab92e34..849b49d35b 100644 --- a/includes/rewrites.php +++ b/includes/rewrites.php @@ -128,6 +128,82 @@ $rewrite_ftos_hardware = array ( '.1.3.6.1.4.1.6027.1.3.11'=> 'S25N' ); +$rewrite_fortinet_hardware = array( +'.1.3.6.1.4.1.12356.102.1.1000' => 'FortiAnalyzer 100', +'.1.3.6.1.4.1.12356.102.1.10002' => 'FortiAnalyzer 1000B', +'.1.3.6.1.4.1.12356.102.1.1001' => 'FortiAnalyzer 100A', +'.1.3.6.1.4.1.12356.102.1.1002' => 'FortiAnalyzer 100B', +'.1.3.6.1.4.1.12356.102.1.20000' => 'FortiAnalyzer 2000', +'.1.3.6.1.4.1.12356.102.1.20001' => 'FortiAnalyzer 2000A', +'.1.3.6.1.4.1.12356.102.1.4000' => 'FortiAnalyzer 400', +'.1.3.6.1.4.1.12356.102.1.40000' => 'FortiAnalyzer 4000', +'.1.3.6.1.4.1.12356.102.1.40001' => 'FortiAnalyzer 4000A', +'.1.3.6.1.4.1.12356.102.1.4002' => 'FortiAnalyzer 400B', +'.1.3.6.1.4.1.12356.102.1.8000' => 'FortiAnalyzer 800', +'.1.3.6.1.4.1.12356.102.1.8002' => 'FortiAnalyzer 800B', +'.1.3.6.1.4.1.12356.101.1.1000' => 'FortiGate 100', +'.1.3.6.1.4.1.12356.101.1.10000' => 'FortiGate 1000', +'.1.3.6.1.4.1.12356.101.1.10001' => 'FortiGate 1000A', +'.1.3.6.1.4.1.12356.101.1.10002' => 'FortiGate 1000AFA2', +'.1.3.6.1.4.1.12356.101.1.10003' => 'FortiGate 1000ALENC', +'.1.3.6.1.4.1.12356.101.1.1001' => 'FortiGate 100A', +'.1.3.6.1.4.1.12356.101.1.1002' => 'FortiGate 110C', +'.1.3.6.1.4.1.12356.101.1.1003' => 'FortiGate 111C', +'.1.3.6.1.4.1.12356.101.1.2000' => 'FortiGate 200', +'.1.3.6.1.4.1.12356.101.1.20000' => 'FortiGate 2000', +'.1.3.6.1.4.1.12356.101.1.2001' => 'FortiGate 200A', +'.1.3.6.1.4.1.12356.101.1.2002' => 'FortiGate 224B', +'.1.3.6.1.4.1.12356.101.1.2002' => 'FortiGate 200A', +'.1.3.6.1.4.1.12356.101.1.3000' => 'FortiGate 300', +'.1.3.6.1.4.1.12356.101.1.30000' => 'FortiGate 3000', +'.1.3.6.1.4.1.12356.101.1.3001' => 'FortiGate 300A', +'.1.3.6.1.4.1.12356.101.1.30160' => 'FortiGate 3016B', +'.1.3.6.1.4.1.12356.101.1.302' => 'FortiGate 30B', +'.1.3.6.1.4.1.12356.101.1.3002' => 'FortiGate 310B', +'.1.3.6.1.4.1.12356.101.1.36000' => 'FortiGate 3600', +'.1.3.6.1.4.1.12356.101.1.36003' => 'FortiGate 3600A', +'.1.3.6.1.4.1.12356.101.1.38100' => 'FortiGate 3810A', +'.1.3.6.1.4.1.12356.101.1.4000' => 'FortiGate 400', +'.1.3.6.1.4.1.12356.101.1.40000' => 'FortiGate 4000', +'.1.3.6.1.4.1.12356.101.1.4001' => 'FortiGate 400A', +'.1.3.6.1.4.1.12356.101.1.5000' => 'FortiGate 500', +'.1.3.6.1.4.1.12356.101.1.50000' => 'FortiGate 5000', +'.1.3.6.1.4.1.12356.101.1.50010' => 'FortiGate 5001', +'.1.3.6.1.4.1.12356.101.1.50011' => 'FortiGate 5001A', +'.1.3.6.1.4.1.12356.101.1.50012' => 'FortiGate 5001FA2', +'.1.3.6.1.4.1.12356.101.1.50021' => 'FortiGate 5002A', +'.1.3.6.1.4.1.12356.101.1.50001' => 'FortiGate 5002FB2', +'.1.3.6.1.4.1.12356.101.1.50040' => 'FortiGate 5004', +'.1.3.6.1.4.1.12356.101.1.50050' => 'FortiGate 5005', +'.1.3.6.1.4.1.12356.101.1.50051' => 'FortiGate 5005FA2', +'.1.3.6.1.4.1.12356.101.1.5001' => 'FortiGate 500A', +'.1.3.6.1.4.1.12356.101.1.500' => 'FortiGate 50A', +'.1.3.6.1.4.1.12356.101.1.501' => 'FortiGate 50AM', +'.1.3.6.1.4.1.12356.101.1.502' => 'FortiGate 50B', +'.1.3.6.1.4.1.12356.101.1.504' => 'FortiGate 51B', +'.1.3.6.1.4.1.12356.101.1.600' => 'FortiGate 60', +'.1.3.6.1.4.1.12356.101.1.6201' => 'FortiGate 600D', +'.1.3.6.1.4.1.12356.101.1.602' => 'FortiGate 60ADSL', +'.1.3.6.1.4.1.12356.101.1.603' => 'FortiGate 60B', +'.1.3.6.1.4.1.12356.101.1.601' => 'FortiGate 60M', +'.1.3.6.1.4.1.12356.101.1.6200' => 'FortiGate 620B', +'.1.3.6.1.4.1.12356.101.1.8000' => 'FortiGate 800', +'.1.3.6.1.4.1.12356.101.1.8001' => 'FortiGate 800F', +'.1.3.6.1.4.1.12356.101.1.800' => 'FortiGate 80C', +'.1.3.6.1.4.1.12356.1688' => 'FortiMail 2000A', +'.1.3.6.1.4.1.12356.103.1.1000' => 'FortiManager 100', +'.1.3.6.1.4.1.12356.103.1.20000' => 'FortiManager 2000XL', +'.1.3.6.1.4.1.12356.103.1.30000' => 'FortiManager 3000', +'.1.3.6.1.4.1.12356.103.1.30002' => 'FortiManager 3000B', +'.1.3.6.1.4.1.12356.103.1.4000' => 'FortiManager 400', +'.1.3.6.1.4.1.12356.103.1.4001' => 'FortiManager 400A', +'.1.3.6.1.4.1.12356.106.1.50030' => 'FortiSwitch 5003A', +'.1.3.6.1.4.1.12356.101.1.510' => 'FortiWiFi 50B', +'.1.3.6.1.4.1.12356.101.1.610' => 'FortiWiFi 60', +'.1.3.6.1.4.1.12356.101.1.611' => 'FortiWiFi 60A', +'.1.3.6.1.4.1.12356.101.1.612' => 'FortiWiFi 60AM', +'.1.3.6.1.4.1.12356.101.1.613' => 'FortiWiFi 60B'); + $rewrite_extreme_hardware = array ( '.1.3.6.1.4.1.1916.2.26' => 'Alpine 3802', '.1.3.6.1.4.1.1916.2.20' => 'Alpine 3804', @@ -253,117 +329,113 @@ $rewrite_ironware_hardware = array( 'snFI800Router' => 'FastIron800', 'snFI1500Switch' => 'FastIron1500', 'snFI1500Router' => 'FastIron1500', - 'snFES2402' => 'FastIron Edge Switch(FES) 2402', + 'snFES2402' => 'FES 2402', 'snFES2402Switch' => 'FES2402', 'snFES2402Router' => 'FES2402', - 'snFES4802' => 'FastIron Edge Switch(FES) 4802', + 'snFES4802' => 'FES 4802', 'snFES4802Switch' => 'FES4802', 'snFES4802Router' => 'FES4802', - 'snFES9604' => 'FastIron Edge Switch(FES) 9604', + 'snFES9604' => 'FES 9604', 'snFES9604Switch' => 'FES9604', 'snFES9604Router' => 'FES9604', - 'snFES12GCF' => 'FastIron Edge Switch(FES) 12GCF ', - 'snFES12GCFSwitch' => 'snFES12GCF ', - 'snFES12GCFRouter' => 'snFES12GCF', - 'snFES2402P' => 'FastIron Edge Switch(FES) 2402 POE ', - 'snFES2402P' => 'snFES2402POE ', - 'snFES2402P' => 'snFES2402POE', - 'snFES4802P' => 'FastIron Edge Switch (FES) 4802 POE ', - 'snFES4802P' => 'snFES4802POE ', - 'snFES4802P' => 'snFES4802POE', + 'snFES12GCF' => 'FES 12GCF ', + 'snFES12GCFSwitch' => 'FES12GCF ', + 'snFES12GCFRouter' => 'FES12GCF', + 'snFES2402P' => 'FES 2402 POE ', + 'snFES4802P' => 'FES 4802 POE ', 'snNI4802Switch' => 'NetIron 4802', 'snNI4802Router' => 'NetIron 4802', 'snBIMG8Switch' => 'BigIron MG8', 'snBIMG8Router' => 'BigIron MG8', 'snNI40GRouter' => 'NetIron 40G', - 'snFESX424' => 'FastIron Edge Switch(FES) 24G', + 'snFESX424' => 'FES 24G', 'snFESX424Switch' => 'FESX424', 'snFESX424Router' => 'FESX424', - 'snFESX424Prem' => 'FastIron Edge Switch(FES) 24G-PREM', + 'snFESX424Prem' => 'FES 24G-PREM', 'snFESX424PremSwitch' => 'FESX424-PREM', 'snFESX424PremRouter' => 'FESX424-PREM', - 'snFESX424Plus1XG' => 'FastIron Edge Switch(FES) 24G + 1 10G', + 'snFESX424Plus1XG' => 'FES 24G + 1 10G', 'snFESX424Plus1XGSwitch' => 'FESX424+1XG', 'snFESX424Plus1XGRouter' => 'FESX424+1XG', - 'snFESX424Plus1XGPrem' => 'FastIron Edge Switch(FES) 24G + 1 10G-PREM', + 'snFESX424Plus1XGPrem' => 'FES 24G + 1 10G-PREM', 'snFESX424Plus1XGPremSwitch' => 'FESX424+1XG-PREM', 'snFESX424Plus1XGPremRouter' => 'FESX424+1XG-PREM', - 'snFESX424Plus2XG' => 'FastIron Edge Switch(FES) 24G + 2 10G', + 'snFESX424Plus2XG' => 'FES 24G + 2 10G', 'snFESX424Plus2XGSwitch' => 'FESX424+2XG', 'snFESX424Plus2XGRouter' => 'FESX424+2XG', - 'snFESX424Plus2XGPrem' => 'FastIron Edge Switch(FES) 24G + 2 10G-PREM', + 'snFESX424Plus2XGPrem' => 'FES 24G + 2 10G-PREM', 'snFESX424Plus2XGPremSwitch' => 'FESX424+2XG-PREM', 'snFESX424Plus2XGPremRouter' => 'FESX424+2XG-PREM', - 'snFESX448' => 'FastIron Edge Switch(FES) 48G', + 'snFESX448' => 'FES 48G', 'snFESX448Switch' => 'FESX448', 'snFESX448Router' => 'FESX448', - 'snFESX448Prem' => 'FastIron Edge Switch(FES) 48G-PREM', + 'snFESX448Prem' => 'FES 48G-PREM', 'snFESX448PremSwitch' => 'FESX448-PREM', 'snFESX448PremRouter' => 'FESX448-PREM', - 'snFESX448Plus1XG' => 'FastIron Edge Switch(FES) 48G + 1 10G', + 'snFESX448Plus1XG' => 'FES 48G + 1 10G', 'snFESX448Plus1XGSwitch' => 'FESX448+1XG', 'snFESX448Plus1XGRouter' => 'FESX448+1XG', - 'snFESX448Plus1XGPrem' => 'FastIron Edge Switch(FES) 48G + 1 10G-PREM', + 'snFESX448Plus1XGPrem' => 'FES 48G + 1 10G-PREM', 'snFESX448Plus1XGPremSwitch' => 'FESX448+1XG-PREM', 'snFESX448Plus1XGPremRouter' => 'FESX448+1XG-PREM', - 'snFESX448Plus2XG' => 'FastIron Edge Switch(FES) 48G + 2 10G', + 'snFESX448Plus2XG' => 'FES 48G + 2 10G', 'snFESX448Plus2XGSwitch' => 'FESX448+2XG', 'snFESX448Plus2XGRouter' => 'FESX448+2XG', - 'snFESX448Plus2XGPrem' => 'FastIron Edge Switch(FES) 48G + 2 10G-PREM', + 'snFESX448Plus2XGPrem' => 'FES 48G + 2 10G-PREM', 'snFESX448Plus2XGPremSwitch' => 'FESX448+2XG-PREM', 'snFESX448Plus2XGPremRouter' => 'FESX448+2XG-PREM', - 'snFESX424Fiber' => 'FastIron Edge Switch(FES)Fiber 24G', + 'snFESX424Fiber' => 'FESFiber 24G', 'snFESX424FiberSwitch' => 'FESX424Fiber', 'snFESX424FiberRouter' => 'FESX424Fiber', - 'snFESX424FiberPrem' => 'FastIron Edge Switch(FES)Fiber 24G-PREM', + 'snFESX424FiberPrem' => 'FESFiber 24G-PREM', 'snFESX424FiberPremSwitch' => 'FESX424Fiber-PREM', 'snFESX424FiberPremRouter' => 'FESX424Fiber-PREM', - 'snFESX424FiberPlus1XG' => 'FastIron Edge Switch(FES)Fiber 24G + 1 10G', + 'snFESX424FiberPlus1XG' => 'FESFiber 24G + 1 10G', 'snFESX424FiberPlus1XGSwitch' => 'FESX424Fiber+1XG', 'snFESX424FiberPlus1XGRouter' => 'FESX424Fiber+1XG', - 'snFESX424FiberPlus1XGPrem' => 'FastIron Edge Switch(FES)Fiber 24G + 1 10G-PREM', + 'snFESX424FiberPlus1XGPrem' => 'FESFiber 24G + 1 10G-PREM', 'snFESX424FiberPlus1XGPremSwitch' => 'FESX424Fiber+1XG-PREM', 'snFESX424FiberPlus1XGPremRouter' => 'FESX424Fiber+1XG-PREM', - 'snFESX424FiberPlus2XG' => 'FastIron Edge Switch(FES)Fiber 24G + 2 10G', + 'snFESX424FiberPlus2XG' => 'FESFiber 24G + 2 10G', 'snFESX424FiberPlus2XGSwitch' => 'FESX424Fiber+2XG', 'snFESX424FiberPlus2XGRouter' => 'FESX424Fiber+2XG', - 'snFESX424FiberPlus2XGPrem' => 'FastIron Edge Switch(FES)Fiber 24G + 2 10G-PREM', + 'snFESX424FiberPlus2XGPrem' => 'FESFiber 24G + 2 10G-PREM', 'snFESX424FiberPlus2XGPremSwitch' => 'FESX424Fiber+2XG-PREM', 'snFESX424FiberPlus2XGPremRouter' => 'FESX424Fiber+2XG-PREM', - 'snFESX448Fiber' => 'FastIron Edge Switch(FES)Fiber 48G', + 'snFESX448Fiber' => 'FESFiber 48G', 'snFESX448FiberSwitch' => 'FESX448Fiber', 'snFESX448FiberRouter' => 'FESX448Fiber', - 'snFESX448FiberPrem' => 'FastIron Edge Switch(FES)Fiber 48G-PREM', + 'snFESX448FiberPrem' => 'FESFiber 48G-PREM', 'snFESX448FiberPremSwitch' => 'FESX448Fiber-PREM', 'snFESX448FiberPremRouter' => 'FESX448Fiber-PREM', - 'snFESX448FiberPlus1XG' => 'FastIron Edge Switch(FES)Fiber 48G + 1 10G', + 'snFESX448FiberPlus1XG' => 'FESFiber 48G + 1 10G', 'snFESX448FiberPlus1XGSwitch' => 'FESX448Fiber+1XG', 'snFESX448FiberPlus1XGRouter' => 'FESX448Fiber+1XG', - 'snFESX448FiberPlus1XGPrem' => 'FastIron Edge Switch(FES)Fiber 48G + 1 10G-PREM', + 'snFESX448FiberPlus1XGPrem' => 'FESFiber 48G + 1 10G-PREM', 'snFESX448FiberPlus1XGPremSwitch' => 'FESX448Fiber+1XG-PREM', 'snFESX448FiberPlus1XGPremRouter' => 'FESX448Fiber+1XG-PREM', - 'snFESX448FiberPlus2XG' => 'FastIron Edge Switch(FES)Fiber 48G + 2 10G', + 'snFESX448FiberPlus2XG' => 'FESFiber 48G + 2 10G', 'snFESX448FiberPlus2XGSwitch' => 'FESX448Fiber+2XG', 'snFESX448FiberPlus2XGRouter' => 'FESX448+2XG', - 'snFESX448FiberPlus2XGPrem' => 'FastIron Edge Switch(FES)Fiber 48G + 2 10G-PREM', + 'snFESX448FiberPlus2XGPrem' => 'FESFiber 48G + 2 10G-PREM', 'snFESX448FiberPlus2XGPremSwitch' => 'FESX448Fiber+2XG-PREM', 'snFESX448FiberPlus2XGPremRouter' => 'FESX448Fiber+2XG-PREM', - 'snFESX424P' => 'FastIron Edge Switch(FES) 24G POE', + 'snFESX424P' => 'FES 24G POE', 'snFESX424P' => 'FESX424POE', 'snFESX424P' => 'FESX424POE', - 'snFESX424P' => 'FastIron Edge Switch(FES) 24GPOE-PREM', + 'snFESX424P' => 'FES 24GPOE-PREM', 'snFESX424P' => 'FESX424POE-PREM', 'snFESX424P' => 'FESX424POE-PREM', - 'snFESX424P' => 'FastIron Edge Switch(FES) 24GPOE + 1 10G', + 'snFESX424P' => 'FES 24GPOE + 1 10G', 'snFESX424P' => 'FESX424POE+1XG', 'snFESX424P' => 'FESX424POE+1XG', - 'snFESX424P' => 'FastIron Edge Switch(FES) 24GPOE + 1 10G-PREM', + 'snFESX424P' => 'FES 24GPOE + 1 10G-PREM', 'snFESX424P' => 'FESX424POE+1XG-PREM', 'snFESX424P' => 'FESX424POE+1XG-PREM', - 'snFESX424P' => 'FastIron Edge Switch(FES) 24GPOE + 2 10G', + 'snFESX424P' => 'FES 24GPOE + 2 10G', 'snFESX424P' => 'FESX424POE+2XG', 'snFESX424P' => 'FESX424POE+2XG', - 'snFESX424P' => 'FastIron Edge Switch(FES) 24GPOE + 2 10G-PREM', + 'snFESX424P' => 'FES 24GPOE + 2 10G-PREM', 'snFESX424P' => 'FESX424POE+2XG-PREM', 'snFESX424P' => 'FESX424POE+2XG-PREM', 'snFESX624' => 'FastIron Edge V6 Switch(FES) 24G', @@ -456,22 +528,22 @@ $rewrite_ironware_hardware = array( 'snFESX624P' => 'FastIron Edge V6 Switch(FES) 24GPOE + 2 10G-PREM', 'snFESX624P' => 'FESX624POE+2XG-PREM', 'snFESX624P' => 'FESX624POE+2XG-PREM', - 'snFWSX424' => 'FastIron WorkGroup Switch(FWS) 24G', + 'snFWSX424' => 'FWSX24G', 'snFWSX424Switch' => 'FWSX424', 'snFWSX424Router' => 'FWSX424', - 'snFWSX424Plus1XG' => 'FastIron WorkGroup Switch(FWS) 24G + 1 10G', + 'snFWSX424Plus1XG' => 'FWSX24G + 1 10G', 'snFWSX424Plus1XGSwitch' => 'FWSX424+1XG', 'snFWSX424Plus1XGRouter' => 'FWSX424+1XG', - 'snFWSX424Plus2XG' => 'FastIron WorkGroup Switch(FWS) 24G + 2 10G', + 'snFWSX424Plus2XG' => 'FWSX24G + 2 10G', 'snFWSX424Plus2XGSwitch' => 'FWSX424+2XG', 'snFWSX424Plus2XGRouter' => 'FWSX424+2XG', - 'snFWSX448' => 'FastIron WorkGroup Switch(FWS) 48G', + 'snFWSX448' => 'FWSX48G', 'snFWSX448Switch' => 'FWSX448', 'snFWSX448Router' => 'FWSX448', - 'snFWSX448Plus1XG' => 'FastIron WorkGroup Switch(FWS) 48G + 1 10G', + 'snFWSX448Plus1XG' => 'FWSX48G + 1 10G', 'snFWSX448Plus1XGSwitch' => 'FWSX448+1XG', 'snFWSX448Plus1XGRouter' => 'FWSX448+1XG', - 'snFWSX448Plus2XG' => 'FastIron WorkGroup Switch(FWS) 48G + 2 10G', + 'snFWSX448Plus2XG' => 'FWSX448G+2XG', 'snFWSX448Plus2XGSwitch' => 'FWSX448+2XG', 'snFWSX448Plus2XGRouter' => 'FWSX448+2XG', 'snFastIronSuperXFamily' => 'FastIron SuperX Family', @@ -566,33 +638,27 @@ $rewrite_ironware_hardware = array( 'snNetIronMLX8Router' => 'NetIron MLX-8', 'snNetIronMLX4Router' => 'NetIron MLX-4', 'snNetIronMLX32Router' => 'NetIron MLX-32', - 'snFGS624P' => 'FastIron GS Switch(FGS) 24-port 10/100/1000 POE Ready', + 'snFGS624P' => 'FastIron FGS624P', 'snFGS624PSwitch' => 'FGS624P', 'snFGS624PRouter' => 'FGS624P', - 'snFGS624XGP' => 'FastIron GS Switch(FGS) 24-port 10/100/1000 POE Ready + 1 10G', + 'snFGS624XGP' => 'FastIron FGS624XGP', 'snFGS624XGPSwitch' => 'FGS624XGP', 'snFGS624XGPRouter' => 'FGS624XGP', - 'snFGS624PP' => 'FastIron GS Switch(FGS) 24-port 10/100/1000 POE ', - 'snFGS624PP' => 'snFGS624P-POE', - 'snFGS624PP' => 'snFGS624P-POE', - 'snFGS624XGPP' => 'FastIron GS Switch(FGS) 24-port 10/100/1000 POE + 1 10G', + 'snFGS624PP' => 'FastIron FGS624XGP', 'snFGS624XGPP' => 'FGS624XGP-POE', - 'snFGS624XGPP' => 'FGS624XGP-POE', - 'snFGS648P' => 'FastIron GS Switch(FGS) 48-port 10/100/1000 POE Ready', - 'snFGS648PSwitch' => 'FGS648P', - 'snFGS648PRouter' => 'FGS648P', - 'snFGS648PP' => 'FastIron GS Switch(FGS) 48-port 10/100/1000 POE ', - 'snFGS648PP' => 'snFGS648P-POE', - 'snFGS648PP' => 'snFGS648P-POE', - 'snFLS624' => 'FastIron LS Switch(FLS) 24-port 10/100/1000 ', - 'snFLS624Switch' => 'FLS624', - 'snFLS624Router' => 'FLS624', - 'snFLS648' => 'FastIron LS Switch(FLS) 48-port 10/100/1000', - 'snFLS648Switch' => 'FLS648', - 'snFLS648Router' => 'FLS648', - 'snSI100' => 'ServerIron 100 series', - 'snSI100Switch' => 'SI100', - 'snSI100Router' => 'SI100', + 'snFGS648P' => 'FastIron GS FGS648P', + 'snFGS648PSwitch' => 'FastIron FGS648P', + 'snFGS648PRouter' => 'FastIron FGS648P', + 'snFGS648PP' => 'FastIron FGS648P-POE', + 'snFLS624' => 'FastIron FLS624', + 'snFLS624Switch' => 'FastIron FLS624', + 'snFLS624Router' => 'FastIron FLS624', + 'snFLS648' => 'FastIron FLS648', + 'snFLS648Switch' => 'FastIron FLS648', + 'snFLS648Router' => 'FastIron FLS648', + 'snSI100' => 'ServerIron SI100', + 'snSI100Switch' => 'ServerIron SI100', + 'snSI100Router' => 'ServerIron SI100', 'snSI350' => 'ServerIron 350 series', 'snSI350Switch' => 'SI350', 'snSI350Router' => 'SI350', @@ -755,6 +821,14 @@ function rewrite_ios_features ($features) return ($features); } +function rewrite_fortinet_hardware ($hardware) +{ + global $rewrite_fortinet_hardware; + $hardware = $rewrite_fortinet_hardware[$hardware]; + return ($hardware); +} + + function rewrite_extreme_hardware ($hardware) { global $rewrite_extreme_hardware; diff --git a/poller.php b/poller.php index b77c698f67..53443ec8b5 100755 --- a/poller.php +++ b/poller.php @@ -106,6 +106,7 @@ while ($device = mysql_fetch_assoc($device_query)) $sysName = strtolower($sysName); $hrSystemUptime = snmp_get($device, "HOST-RESOURCES-MIB::hrSystemUptime.0", "-Oqv"); + $sysObjectID = snmp_get($device, "sysObjectID.0", "-Oqvn"); # echo("UPTIMES: ".$hrSystemUptime."|".$sysUptime."]");