diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 826b722170..2c6f057f17 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -772,7 +772,7 @@ $config['os'][$os]['over'][1]['text'] = 'CPU Usage'; $config['os'][$os]['over'][2]['graph'] = 'device_mempool'; $config['os'][$os]['over'][2]['text'] = 'Memory Usage'; -$os = 'accedian'; +$os = 'aen'; $config['os'][$os]['text'] = 'Accedian AEN'; $config['os'][$os]['type'] = 'network'; $config['os'][$os]['icon'] = 'accedian'; diff --git a/includes/discovery/os/metronid.inc.php b/includes/discovery/os/metronid.inc.php index 5db612896c..d986a7d626 100644 --- a/includes/discovery/os/metronid.inc.php +++ b/includes/discovery/os/metronid.inc.php @@ -15,6 +15,6 @@ if (!$os) { if (preg_match('/AMN-/', $sysDescr)) { - $os = 'accedian'; + $os = 'aen'; } } diff --git a/includes/discovery/processors/metronid.inc.php b/includes/discovery/processors/metronid.inc.php index c244fc7e4e..ff5b284857 100644 --- a/includes/discovery/processors/metronid.inc.php +++ b/includes/discovery/processors/metronid.inc.php @@ -14,18 +14,18 @@ -if ($device['os'] == 'accedian') { - if ($device['version'] == 'AEN_5.3.1_22558') { - } // don't poll 5.3.1_22558 devices due to bug that crashes snmpd - else { - echo 'Accedian MetroNID:'; - $descr = 'Processor'; - $usage = snmp_get($device, '.1.3.6.1.4.1.22420.1.1.20.0', '-Ovq'); - $usage = trim($usage, "percent"); - echo "usage"; +if ($device['os'] == 'aen') { + if ($device['version'] == 'AEN_5.3.1_22558') { + } // don't poll v5.3.1_22558 devices due to bug that crashes snmpd + else { + echo 'Accedian MetroNID:'; + $descr = 'Processor'; + $usage = snmp_get($device, '.1.3.6.1.4.1.22420.1.1.20.0', '-Ovq'); + $usage = trim($usage, "percent"); + echo "usage"; - if (is_numeric($usage)) { - discover_processor($valid['processor'], $device, '.1.3.6.1.4.1.22420.1.1.20.0', '0', 'accedian', $descr, '1', $usage, null, null); + if (is_numeric($usage)) { + discover_processor($valid['processor'], $device, '.1.3.6.1.4.1.22420.1.1.20.0', '0', 'aen', $descr, '1', $usage, null, null); + } } - } } diff --git a/includes/discovery/sensors/temperatures/metronid.inc.php b/includes/discovery/sensors/temperatures/metronid.inc.php index 7650b4c669..8e0999f5ad 100644 --- a/includes/discovery/sensors/temperatures/metronid.inc.php +++ b/includes/discovery/sensors/temperatures/metronid.inc.php @@ -13,7 +13,7 @@ */ -if ($device['os'] == 'accedian') { +if ($device['os'] == 'aen') { echo("Accedian MetroNID"); // Chassis temperature diff --git a/includes/polling/os/accedian.inc.php b/includes/polling/os/aen.inc.php similarity index 100% rename from includes/polling/os/accedian.inc.php rename to includes/polling/os/aen.inc.php