newdevice: Added detection for GE UPS (#6549) (#6553)

* Add support for GE UPS (#6549)

* rename OS and remove sysDescr regex

html/images/os/ge.svg

@@ -0,0 +1 @@
+<svg id="svg2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 500 500"><style>.st0{fill:#FFFFFF;} .st1{fill:#3B73B9;}</style><g id="g10"><g id="g12"><path id="path14" class="st0" d="M249.98 495C385.32 495 495 385.32 495 250.02 495 114.72 385.32 5 249.98 5 114.68 5 5 114.72 5 250.02S114.68 495 249.98 495"/><path id="path16" class="st1" d="M304.96 186.21c0-27.86 18.86-54.88 29.15-49.79 11.73 5.88-8.79 32.12-29.15 49.79m-128.25 10.15c0-22.4 22.1-64.96 35.6-60.46 15.96 5.32-13.22 48.25-35.6 60.46m-22.41 160.2c-10.16.46-16.96-6.04-16.96-16.89 0-29.15 40.45-57 71-71.95-5.42 40.7-19.17 87.27-54.04 88.84m186.62-94.99c-23.07 0-40.7 16.97-40.7 37.32 0 16.97 10.2 30.54 23.73 30.54 4.79 0 9.53-2.73 9.53-8.79 0-8.87-11.7-11-10.82-24.19.59-8.7 8.79-14.52 16.93-14.52 16.27 0 23.88 15.77 23.88 32.04-.66 25.13-19.16 42.58-40.84 42.58-28.52 0-46.84-27.12-46.84-56.31 0-43.46 28.52-60.42 43.46-64.47.14 0 39.02 6.91 37.81-10.23-.56-7.54-11.77-10.44-19.87-10.75-9.01-.35-18.11 2.89-18.11 2.89-4.72-2.4-8-7.09-10.03-12.49 27.83-21.06 47.51-41.4 47.51-64.48 0-12.21-8.16-23.07-23.77-23.07-27.83 0-48.87 35.29-48.87 67.19 0 5.41 0 10.86 1.4 15.6-17.66 12.88-30.79 20.91-54.52 35.16 0-2.97.62-10.64 2.62-20.56 8.13-8.83 19.3-22.06 19.3-32.25 0-4.74-2.69-8.83-8.17-8.83-13.55 0-23.71 20.38-26.43 34.63-6.11 7.5-18.33 17-28.53 17-8.13 0-10.86-7.47-11.55-10.2 25.8-8.83 57.7-44.12 57.7-76.02 0-6.77-2.72-21.72-23.07-21.72-30.54 0-56.3 45.49-56.3 80.74-10.89 0-14.94-11.52-14.94-20.35 0-8.84 3.39-17.63 3.39-20.36 0-2.72-1.36-6.1-5.45-6.1-10.16 0-16.27 13.57-16.27 29.18.7 21.72 14.94 35.33 33.93 36.66 2.72 12.91 14.24 25.13 28.48 25.13 8.84 0 19.69-2.72 27.16-9.49-.66 4.74-1.32 8.83-2.02 12.88-29.88 15.64-51.6 26.49-71.28 44.13-15.57 14.27-24.4 33.26-24.4 48.17 0 20.39 12.88 39.38 39.34 39.38 31.2 0 54.98-25.1 66.53-59.73 5.41-16.27 7.58-39.97 8.97-61.72 31.18-17.67 45.98-27.85 62.28-39.41 2.03 3.39 4.08 6.1 6.77 8.13-14.24 7.47-48.17 28.52-48.17 78.05 0 35.29 23.73 74.67 70.59 74.67 38.68 0 65.14-31.91 65.14-62.46-.01-27.8-15.62-53.57-45.5-53.57m116.69 58.3c-.1.21-.48.49-1.25.24-.6-.21-.73-.49-.73-.88.03-.38 8.2-24.54 8.13-52.22-.07-29.92-12.21-48.25-27.78-48.25-9.53 0-16.31 6.81-16.31 17.01 0 18.32 22.38 19.69 22.38 59.72 0 16.27-3.39 31.88-8.79 48.84-25.14 84.82-105.22 124.2-183.23 124.2-35.99 0-61.55-7.4-69.15-10.81-.31-.18-.6-.77-.35-1.37.17-.45.7-.8 1.01-.66 3.08 1.19 25.03 8.1 52.19 8.1 29.85 0 47.51-12.21 47.51-27.16 0-9.49-7.47-16.96-16.96-16.96-18.33 0-19.72 23.07-59.07 23.07-16.96 0-31.9-3.39-49.53-8.84C71.5 408.12 31.43 328.74 31.46 250.02c.03-38.36 10.79-68.91 10.96-69.19.14-.2.62-.42 1.21-.2.6.2.73.69.7.87-.97 3.18-8.1 25.07-8.1 52.23 0 29.88 12.21 47.51 27.82 47.51 8.8 0 16.27-6.77 16.27-16.27 0-18.35-22.41-20.38-22.41-59.75 0-16.97 3.42-31.91 8.83-49.54 25.8-84.16 105.22-123.6 183.27-124.21 36.27-.28 68 10.58 69.22 11.55.21.18.42.64.21 1.19-.29.66-.71.73-.91.69-.38-.03-21.02-8.66-52.26-8.66-29.18-.03-47.51 12.19-47.51 27.82 0 8.8 6.81 16.27 16.96 16.27 18.33 0 19.69-22.38 59.07-22.38 16.92 0 31.87 3.35 49.5 8.8 84.86 25.79 123.47 105.87 124.2 183.26.4 39.63-10.77 69.61-10.88 69.86M250.02 16.55c-128.95 0-233.46 104.48-233.46 233.46 0 128.95 104.51 233.43 233.46 233.43 128.92 0 233.43-104.48 233.43-233.43 0-128.28-104.51-233.46-233.43-233.46m0 478.45C114.96 495 5 385.74 5 250.02 5 114.92 114.96 5 250.02 5 385.04 5 495 114.92 495 250.02 495 385.74 385.04 495 250.02 495"/></g></g></svg>

includes/definitions/ge-ups.yaml

@@ -0,0 +1,14 @@
+os: ge-ups
+text: 'GE Digital Energy UPS'
+group: ups
+type: power
+icon: ge
+rfc1628_compat: 1
+over:
+    - { graph: device_current, text: Current }
+    - { graph: device_voltage, text: Voltage }
+    - { graph: device_load, text: Load }
+discovery:
+    -
+        sysObjectId:
+            - .1.3.6.1.4.1.818.1.100.1.1

includes/discovery/functions.inc.php

@@ -959,6 +959,8 @@ function get_device_divisor($device, $os_version, $sensor_type, $oid)
         } elseif ($sensor_type == 'voltage' && !starts_with($oid, '.1.3.6.1.2.1.33.1.2.5.')) {
             return 1;
         }
+    } elseif (($device['os'] == 'ge-digitalenergy') && ($sensor_type == 'load')) {
+        return 1;
     }
 
     return 10; //default

tests/OSDiscoveryTest.php

@@ -865,6 +865,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('gamatronicups');
     }
 
+    public function testGeups()
+    {
+        $this->checkOS('ge-ups');
+    }
+
     public function testGeistWatchdog()
     {
         $this->checkOS('geist-watchdog');

tests/snmpsim/ge-ups.snmprec

@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|GE Web/SNMP Interface
+1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.818.1.100.1.1