added support for megatec ups -

includes/definitions.inc.php

@@ -1466,8 +1466,8 @@ $config['os'][$os]['type']             = 'power';
 $config['os'][$os]['over'][0]['graph'] = 'device_current';
 $config['os'][$os]['over'][0]['text']  = 'Current';
 
-$os = 'megatec';
+$os = 'netagent2';
-$config['os'][$os]['text']             = 'Megatec UPS';
+$config['os'][$os]['text']             = 'NET Agent II UPS';
 $config['os'][$os]['group']            = 'ups';
 $config['os'][$os]['type']             = 'power';
 $config['os'][$os]['over'][0]['graph'] = 'device_load';

includes/discovery/os/netagent2.inc.php

@@ -24,5 +24,5 @@
  */
 
 if (starts_with($sysDescr, 'NET Agent II')) {
-    $os = 'megatec';
+    $os = 'netagent2';
 }

includes/discovery/sensors/charge/netagent2.inc.php

@@ -23,12 +23,12 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
-if ($device['os'] == 'megatec') {
+if ($device['os'] == 'netagent2') {
     $charge_oid = '.1.3.6.1.4.1.935.1.1.1.2.2.1.0';
     $charge = snmp_get($device, $charge_oid, '-Osqnv');
 
     if (!empty($charge)) {
-        $type           = 'megatec';
+        $type           = 'netagent2';
         $index          = 0;
         $limit          = 100;
         $lowlimit       = 0;

includes/discovery/sensors/current/netagent2.inc.php

@@ -24,12 +24,12 @@
  */
 
 
-if ($device['os'] == 'megatec') {
+if ($device['os'] == 'netagent2') {
     $battery_current_oid = '.1.3.6.1.4.1.935.1.1.1.3.2.1.0';
     $battery_current = snmp_get($device, $battery_current_oid, '-Oqv');
 
     if (!empty($battery_current) || $battery_current == 0) {
-        $type           = 'megatec';
+        $type           = 'netagent2';
         $index          = 0;
         $limit          = 30;
         $warnlimit      = null;

includes/discovery/sensors/frequencies/netagent2.inc.php

@@ -24,12 +24,12 @@
  */
 
 
-if ($device['os'] == 'megatec') {
+if ($device['os'] == 'netagent2') {
     $in_frequency_oid = '.1.3.6.1.4.1.935.1.1.1.3.2.4.0';
     $in_frequency = snmp_get($device, $in_frequency_oid, '-Oqv');
 
     if (!empty($in_frequency) || $in_frequency == 0) {
-        $type             = 'megatec';
+        $type             = 'netagent2';
         $index            = 0;
         $limit            = 60;
         $warnlimit        = 51;
@@ -61,7 +61,7 @@ if ($device['os'] == 'megatec') {
     $out_frequency = snmp_get($device, $frequency_oid, '-Oqv');
 
     if (!empty($out_frequency) || $out_frequency == 0) {
-        $type             = 'megatec';
+        $type             = 'netagent2';
         $index            = 0;
         $limit            = 60;
         $warnlimit        = 51;

includes/discovery/sensors/load/netagent2.inc.php

@@ -24,12 +24,12 @@
  */
 
 
-if ($device['os'] == 'megatec') {
+if ($device['os'] == 'netagent2') {
     $load_oid = '.1.3.6.1.4.1.935.1.1.1.4.2.3.0';
     $output_load = snmp_get($device, $load_oid, '-Oqv');
 
     if (!empty($output_load) || $output_load == 0) {
-        $type           = 'megatec';
+        $type           = 'netagent2';
         $index          = 0;
         $limit          = 100;
         $warnlimit      = 80;

includes/discovery/sensors/temperatures/netagent2.inc.php

@@ -24,12 +24,12 @@
  */
 
 
-if ($device['os'] == 'megatec') {
+if ($device['os'] == 'netagent2') {
     $ups_temperature_oid = '.1.3.6.1.4.1.935.1.1.1.2.2.3.0';
     $ups_temperature = snmp_get($device, $ups_temperature_oid, '-Oqv');
 
     if (!empty($ups_temperature) || $ups_temperature == 0) {
-        $type           = 'megatec';
+        $type           = 'netagent2';
         $index          = 0;
         $limit          = 50;
         $warnlimit      = 40;

includes/discovery/sensors/voltages/netagent2.inc.php

@@ -24,12 +24,12 @@
  */
 
 
-if ($device['os'] == 'megatec') {
+if ($device['os'] == 'netagent2') {
     $in_voltage_oid = '.1.3.6.1.4.1.935.1.1.1.3.2.1.0';
     $in_voltage = snmp_get($device, $in_voltage_oid, '-Oqv');
 
     if (!empty($in_voltage) || $in_voltage == 0) {
-        $type           = 'megatec';
+        $type           = 'netagent2';
         $index          = 0;
         $limit          = 300;
         $warnlimit      = 253;
@@ -61,7 +61,7 @@ if ($device['os'] == 'megatec') {
     $out_voltage = snmp_get($device, $out_voltage_oid, '-Oqv');
 
     if (!empty($out_voltage) || $out_voltage == 0) {
-        $type           = 'megatec';
+        $type           = 'netagent2';
         $index          = 0;
         $limit          = 300;
         $warnlimit      = 253;

tests/OSDiscoveryTest.php

@@ -1197,7 +1197,7 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
 
     public function testMegatec()
     {
-        $this->checkOS('megatec');
+        $this->checkOS('netagent2');
     }
 
     public function testSmartax()