From 7e7a1ee3da3673fa7ce348968293af5b3aa00ede Mon Sep 17 00:00:00 2001 From: Adam Amstrong Date: Fri, 13 Aug 2010 13:27:01 +0000 Subject: [PATCH] cleaner fortigate hardware git-svn-id: http://www.observium.org/svn/observer/trunk@1678 61d68cd4-352d-0410-923a-c4978735b2b8 --- includes/polling/os/fortigate.inc.php | 2 -- includes/rewrites.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/includes/polling/os/fortigate.inc.php b/includes/polling/os/fortigate.inc.php index 770a4d402..cc570d0ff 100755 --- a/includes/polling/os/fortigate.inc.php +++ b/includes/polling/os/fortigate.inc.php @@ -7,8 +7,6 @@ echo("Fortinet Fortigate Poller\n"); $fnSysVersion = snmp_get($device, "FORTINET-MIB-280::fnSysVersion.0", "-Ovq"); $serial = snmp_get($device, "FORTINET-MIB-280::fnSysSerial.0", "-Ovq"); -echo("$fnSysVersion"); - $version = preg_replace("/(.+),(.+),(.+)/", "\\1||\\2||\\3", $fnSysVersion); list($version,$features) = explode("||", $version); diff --git a/includes/rewrites.php b/includes/rewrites.php index 849b49d35..3a67329e7 100644 --- a/includes/rewrites.php +++ b/includes/rewrites.php @@ -153,7 +153,7 @@ $rewrite_fortinet_hardware = array( '.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.2003' => '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',