refactor: mibs E-G (#5190)

librenms · Dec 19, 2016 · ac316b6 · ac316b6
1 parent ab29261
commit ac316b6
Show file tree

Hide file tree

Showing 128 changed files with 11 additions and 86,614 deletions.
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
@@ -1445,6 +1445,7 @@
 $config['os'][$os]['text']             = 'Fortinet Fortigate';
 $config['os'][$os]['type']             = 'firewall';
 $config['os'][$os]['icon']             = 'fortinet';
+$config['os'][$os]['mib_dir'][]        = 'fortinet';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 $config['os'][$os]['over'][1]['graph'] = 'device_fortigate_cpu';
@@ -1456,6 +1457,7 @@
 $config['os'][$os]['text']             = 'Fortinet FortiSwitch';
 $config['os'][$os]['type']             = 'network';
 $config['os'][$os]['icon']             = 'fortinet';
+$config['os'][$os]['mib_dir'][]        = 'fortinet';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 $config['os'][$os]['over'][1]['graph'] = 'device_processor';
@@ -1604,6 +1606,7 @@
 $config['os'][$os]['text']             = 'Force10 FTOS';
 $config['os'][$os]['type']             = 'network';
 $config['os'][$os]['icon']             = 'force10';
+$config['os'][$os]['mib_dir'][]        = 'f10';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 $config['os'][$os]['over'][1]['graph'] = 'device_processor';
@@ -1615,13 +1618,14 @@
 $config['os'][$os]['text']             = 'Dell Networking OS';
 $config['os'][$os]['type']             = 'network';
 $config['os'][$os]['icon']             = 'dell';
+$config['os'][$os]['mib_dir'][]        = 'dell';
+$config['os'][$os]['mib_dir'][]        = 'f10';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
 $config['os'][$os]['over'][1]['graph'] = 'device_processor';
 $config['os'][$os]['over'][1]['text']  = 'CPU Usage';
 $config['os'][$os]['over'][2]['graph'] = 'device_mempool';
 $config['os'][$os]['over'][2]['text']  = 'Memory Usage';
-$config['os'][$os]['mib_dir'][]        = 'dell';
 
 $os = 'dell-rcs';
 $config['os'][$os]['text']             = 'Dell Remote Console';
@@ -1826,8 +1830,9 @@
 $config['os'][$os]['icon'] = 'axis';
 
 $os = 'gamatronicups';
-$config['os'][$os]['text'] = 'Gamatronic UPS Stack';
-$config['os'][$os]['type'] = 'power';
+$config['os'][$os]['text']      = 'Gamatronic UPS Stack';
+$config['os'][$os]['type']      = 'power';
+$config['os'][$os]['mib_dir'][] = 'gamtronic';
 
 $os = 'eatonups';
 $config['os'][$os]['text']             = 'Eaton UPS';
@@ -2635,6 +2640,7 @@
 $config['os'][$os]['text']             = 'Eaton PDU';
 $config['os'][$os]['type']             = 'power';
 $config['os'][$os]['icon']             = 'eaton';
+$config['os'][$os]['mib_dir'][]        = 'eaton';
 $config['os'][$os]['over'][0]['graph'] = 'device_current';
 $config['os'][$os]['over'][0]['text']  = 'Current';
 

diff --git a/includes/discovery/os/fortiswitch.inc.php b/includes/discovery/os/fortiswitch.inc.php
@@ -23,7 +23,7 @@
  * @author     Neil Lathwood <neil@lathwood.co.uk>
  */
 
-$version = snmp_get($device, 'fsSysVersion.0', '-Oqn', 'FORTINET-FORTISWITCH-MIB');
+$version = snmp_get($device, 'fsSysVersion.0', '-Oqn', 'FORTINET-FORTISWITCH-MIB', 'fortinet');
 if (str_contains($version, 'FortiSwitch')) {
     $os = 'fortiswitch';
 }
diff --git a/includes/discovery/os/gamatronicups.inc.php b/includes/discovery/os/gamatronicups.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 if (empty($sysDescr)) {
-    if (snmp_get($device, 'GAMATRONIC-MIB::psUnitManufacture.0', '-Oqv', '') == 'Gamatronic') {
+    if (snmp_get($device, 'psUnitManufacture.0', '-Oqv', 'GAMATRONIC-MIB', 'gamtronic') == 'Gamatronic') {
         $os = 'gamatronicups';
     }
 }