From b689f7952d842bf771147627d106e4a2b908a92b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Rosiak?= <sorenrosiak@gmail.com>
Date: Wed, 1 Apr 2015 19:17:24 +0200
Subject: [PATCH] FortiGate Minor Change

- Add serial and hardware recognition
- Clean up code
---
 includes/polling/os/fortigate.inc.php | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/includes/polling/os/fortigate.inc.php b/includes/polling/os/fortigate.inc.php
index b49d044a1..daa7fc328 100755
--- a/includes/polling/os/fortigate.inc.php
+++ b/includes/polling/os/fortigate.inc.php
@@ -1,21 +1,12 @@
 <?php
 
 $fnSysVersion = snmp_get($device, "FORTINET-FORTIGATE-MIB::fgSysVersion.0", "-Ovq");
-$serial       = snmp_get($device, "FORTINET-FORTIGATE-MIB::fnSysSerial.0", "-Ovq");
+$serial       = snmp_get($device, "ENTITY-MIB::entPhysicalSerialNum.1", "-Ovq");
+$hardware     = snmp_get($device, "ENTITY-MIB::entPhysicalModelName.1", "-Ovq");
 
 $version = preg_replace("/(.+),(.+),(.+)/", "\\1||\\2||\\3", $fnSysVersion);
 list($version,$features) = explode("||", $version);
 
-if (isset($rewrite_fortinet_hardware[$poll_device['sysObjectID']]))
-{
-  $hardware = $rewrite_fortinet_hardware[$poll_device['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";
-#$data = shell_exec($cmd);
-#list ($cpu, $mem, $ses, $memsize) = explode("\n", $data);
-
 $sessrrd  = $config['rrd_dir'] . "/" . $device['hostname'] . "/fortigate_sessions.rrd";
 $sessions = snmp_get($device, "FORTINET-FORTIGATE-MIB::fgSysSesCount.0", "-Ovq");
 
@@ -44,7 +35,4 @@ if (is_numeric($cpu_usage))
   $graphs['fortigate_cpu'] = TRUE;
 }
 
-#$mem=snmp_get($device, "FORTINET-FORTIGATE-MIB::fgSysMemUsage.0", "-Ovq");
-#$memsize=snmp_get($device, "FORTINET-FORTIGATE-MIB::fgSysMemCapacity", "-Ovq");
-
-?>
+?>
\ No newline at end of file