Add more discovery components for Dell PowerConnect 28xx (#13420)

* Add Processor discovery for Dell PowerConnect 28xx

* Add Temperature discovery and cleanup code

* Add test data for PowerConnect 2824

* Add Serial Number

* Don't add VLANs as Ports

* Revert "Don't add VLANs as Ports"

* Remove invalid mempool from tests

LibreNMS/OS/Powerconnect.php

@@ -52,6 +52,7 @@ class Powerconnect extends OS implements ProcessorDiscovery, ProcessorPolling
         if (Str::startsWith($device['sysObjectID'], [
             '.1.3.6.1.4.1.674.10895.3020',
             '.1.3.6.1.4.1.674.10895.3021',
+            '.1.3.6.1.4.1.674.10895.3028',
             '.1.3.6.1.4.1.674.10895.3030',
             '.1.3.6.1.4.1.674.10895.3031',
         ])) {

includes/definitions/discovery/powerconnect.yaml

@@ -11,3 +11,4 @@ modules:
         features: Dell-Vendor-MIB::productIdentificationDescription.0
         hardware: Dell-Vendor-MIB::productIdentificationDisplayName.0
         version: Dell-Vendor-MIB::productIdentificationVersion.0
+        serial: Dell-Vendor-MIB::productIdentificationSerialNumber.1

includes/discovery/sensors/temperature/powerconnect.inc.php

@@ -2,26 +2,12 @@
 
 switch ($device['sysObjectID']) {
     /**
-     * Dell Powerconnect 5548
      * Operating Temperature: 0º C to 45º C
      */
-    case '.1.3.6.1.4.1.674.10895.3031':
-        $temperature = trim(snmp_get($device, '.1.3.6.1.4.1.89.53.15.1.9.1', '-Ovq'));
-        discover_sensor($valid['sensor'], 'temperature', $device, '.1.3.6.1.4.1.89.53.15.1.9.1', 0, 'powerconnect', 'Internal Temperature', '1', '1', '0', null, null, '45', $temperature);
-        break;
-    /**
-     * Dell Powerconnect 3548
-     * Operating Temperature: 0º C to 45º C
-     */
-    case '.1.3.6.1.4.1.674.10895.3017':
-        $temperature = trim(snmp_get($device, '.1.3.6.1.4.1.89.53.15.1.9.1', '-Ovq'));
-        discover_sensor($valid['sensor'], 'temperature', $device, '.1.3.6.1.4.1.89.53.15.1.9.1', 0, 'powerconnect', 'Internal Temperature', '1', '1', '0', null, null, '45', $temperature);
-        break;
-    /**
-     * Dell Powerconnect 3548P
-     * Operating Temperature: 0º C to 45º C
-     */
-    case '.1.3.6.1.4.1.674.10895.3019':
+    case '.1.3.6.1.4.1.674.10895.3031': /* Dell Powerconnect 5548 */
+    case '.1.3.6.1.4.1.674.10895.3017': /* Dell Powerconnect 3548 */
+    case '.1.3.6.1.4.1.674.10895.3019': /* Dell Powerconnect 3548P */
+    case '.1.3.6.1.4.1.674.10895.3028': /* Dell Powerconnect 2848 */
         $temperature = trim(snmp_get($device, '.1.3.6.1.4.1.89.53.15.1.9.1', '-Ovq'));
         discover_sensor($valid['sensor'], 'temperature', $device, '.1.3.6.1.4.1.89.53.15.1.9.1', 0, 'powerconnect', 'Internal Temperature', '1', '1', '0', null, null, '45', $temperature);
         break;