diff --git a/includes/definitions/discovery/arubaos.yaml b/includes/definitions/discovery/arubaos.yaml
new file mode 100644
index 0000000000..b4f0ec584f
--- /dev/null
+++ b/includes/definitions/discovery/arubaos.yaml
@@ -0,0 +1,12 @@
+mib: ARUBA-MIB:WLSX-SYSTEMEXT-MIB
+modules:
+    processors:
+          data:
+              -
+                  oid: WLSX-SYSTEMEXT-MIB::sysExtProcessorLoad
+                  num_oid: '.1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.{{ $index }}'
+                  descr: 'Network Processor CPU{{ $index }}'
+              -
+                  oid: WLSX-SYSTEMEXT-MIB::sysExtProcessorLoad.1
+                  num_oid: '.1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.1'
+                  descr: 'Supervisor Card CPU'
diff --git a/includes/discovery/mempools/arubaos.inc.php b/includes/discovery/mempools/arubaos.inc.php
new file mode 100644
index 0000000000..50a6f02bd7
--- /dev/null
+++ b/includes/discovery/mempools/arubaos.inc.php
@@ -0,0 +1,16 @@
+<?php
+
+if ($device['os'] === 'arubaos') {
+    echo 'ARUBAOS-MEMORY-POOL: ';
+
+    $memory_pool = snmp_get_multi_oid($device, 'sysXMemorySize.1 sysXMemoryUsed.1 sysXMemoryFree.1', '-OQUs', 'WLSX-SWITCH-MIB');
+    
+    $total = $memory_pool['sysXMemorySize.1'];
+    $used  = $memory_pool['sysXMemoryUsed.1'];
+    $free  = $memory_pool['sysXMemoryFree.1'];
+    $perc  = ($mempool['used'] / $mempool['total'] * 100);
+
+    if (is_numeric($total) && is_numeric($used)) {
+        discover_mempool($valid_mempool, $device, 0, 'arubaos', 'Memory', '1', null, null);
+    }
+}
diff --git a/includes/polling/mempools/arubaos.inc.php b/includes/polling/mempools/arubaos.inc.php
new file mode 100644
index 0000000000..b6bbed994b
--- /dev/null
+++ b/includes/polling/mempools/arubaos.inc.php
@@ -0,0 +1,10 @@
+<?php
+
+  echo 'ARUBAOS-MEMORY-POOL: ';
+
+  $memory_pool = snmp_get_multi_oid($device, 'sysXMemorySize.1 sysXMemoryUsed.1 sysXMemoryFree.1', '-OQUs', 'WLSX-SWITCH-MIB');
+
+  $mempool['total'] = $memory_pool['sysXMemorySize.1'];
+  $mempool['used']  = $memory_pool['sysXMemoryUsed.1'];
+  $mempool['free']  = $memory_pool['sysXMemoryFree.1'];
+  $mempool['perc']  = ($mempool['used'] / $mempool['total'] * 100);
diff --git a/tests/data/arubaos_aruba7210.json b/tests/data/arubaos_aruba7210.json
new file mode 100644
index 0000000000..47a095f804
--- /dev/null
+++ b/tests/data/arubaos_aruba7210.json
@@ -0,0 +1,188 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.14823.1.1.32",
+                    "sysDescr": "ArubaOS (MODEL: Aruba7210), Version 8.2.0.2 (62929)",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "",
+                    "features": null,
+                    "location": null,
+                    "os": "arubaos",
+                    "type": "wireless",
+                    "serial": null,
+                    "icon": "aruba.svg"
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.14823.1.1.32",
+                    "sysDescr": "ArubaOS (MODEL: Aruba7210), Version 8.2.0.2 (62929)",
+                    "sysContact": "<private>",
+                    "version": "8.2.0.2",
+                    "hardware": "Aruba7210",
+                    "features": "Local Controller for 10.235.132.234",
+                    "location": "<private>",
+                    "os": "arubaos",
+                    "type": "wireless",
+                    "serial": null,
+                    "icon": "aruba.svg"
+                }
+            ]
+        }
+    },
+    "mempools": {
+        "discovery": {
+            "mempools": [
+                {
+                    "mempool_index": "0",
+                    "entPhysicalIndex": null,
+                    "hrDeviceIndex": null,
+                    "mempool_type": "arubaos",
+                    "mempool_precision": "1",
+                    "mempool_descr": "Memory",
+                    "mempool_perc": "0",
+                    "mempool_used": "0",
+                    "mempool_free": "0",
+                    "mempool_total": "0",
+                    "mempool_largestfree": null,
+                    "mempool_lowestfree": null,
+                    "mempool_deleted": "0",
+                    "mempool_perc_warn": "75"
+                }
+            ]
+        },
+        "poller": {
+            "mempools": [
+                {
+                    "mempool_index": "0",
+                    "entPhysicalIndex": null,
+                    "hrDeviceIndex": null,
+                    "mempool_type": "arubaos",
+                    "mempool_precision": "1",
+                    "mempool_descr": "Memory",
+                    "mempool_perc": "83",
+                    "mempool_used": "4326272",
+                    "mempool_free": "857984",
+                    "mempool_total": "5184256",
+                    "mempool_largestfree": null,
+                    "mempool_lowestfree": null,
+                    "mempool_deleted": "0",
+                    "mempool_perc_warn": "75"
+                }
+            ]
+        }
+    },
+    "processors": {
+        "discovery": {
+            "processors": [
+                {
+                    "entPhysicalIndex": "0",
+                    "hrDeviceIndex": "0",
+                    "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.1",
+                    "processor_index": "1",
+                    "processor_type": "arubaos",
+                    "processor_usage": "2",
+                    "processor_descr": "Supervisor Card CPU",
+                    "processor_precision": "1",
+                    "processor_perc_warn": "75"
+                },
+                {
+                    "entPhysicalIndex": "0",
+                    "hrDeviceIndex": "0",
+                    "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.8",
+                    "processor_index": "8",
+                    "processor_type": "arubaos",
+                    "processor_usage": "0",
+                    "processor_descr": "Network Processor CPU8",
+                    "processor_precision": "1",
+                    "processor_perc_warn": "75"
+                },
+                {
+                    "entPhysicalIndex": "0",
+                    "hrDeviceIndex": "0",
+                    "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.9",
+                    "processor_index": "9",
+                    "processor_type": "arubaos",
+                    "processor_usage": "1",
+                    "processor_descr": "Network Processor CPU9",
+                    "processor_precision": "1",
+                    "processor_perc_warn": "75"
+                },
+                {
+                    "entPhysicalIndex": "0",
+                    "hrDeviceIndex": "0",
+                    "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.10",
+                    "processor_index": "10",
+                    "processor_type": "arubaos",
+                    "processor_usage": "0",
+                    "processor_descr": "Network Processor CPU10",
+                    "processor_precision": "1",
+                    "processor_perc_warn": "75"
+                },
+                {
+                    "entPhysicalIndex": "0",
+                    "hrDeviceIndex": "0",
+                    "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.11",
+                    "processor_index": "11",
+                    "processor_type": "arubaos",
+                    "processor_usage": "0",
+                    "processor_descr": "Network Processor CPU11",
+                    "processor_precision": "1",
+                    "processor_perc_warn": "75"
+                },
+                {
+                    "entPhysicalIndex": "0",
+                    "hrDeviceIndex": "0",
+                    "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.12",
+                    "processor_index": "12",
+                    "processor_type": "arubaos",
+                    "processor_usage": "0",
+                    "processor_descr": "Network Processor CPU12",
+                    "processor_precision": "1",
+                    "processor_perc_warn": "75"
+                },
+                {
+                    "entPhysicalIndex": "0",
+                    "hrDeviceIndex": "0",
+                    "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.13",
+                    "processor_index": "13",
+                    "processor_type": "arubaos",
+                    "processor_usage": "0",
+                    "processor_descr": "Network Processor CPU13",
+                    "processor_precision": "1",
+                    "processor_perc_warn": "75"
+                },
+                {
+                    "entPhysicalIndex": "0",
+                    "hrDeviceIndex": "0",
+                    "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.14",
+                    "processor_index": "14",
+                    "processor_type": "arubaos",
+                    "processor_usage": "0",
+                    "processor_descr": "Network Processor CPU14",
+                    "processor_precision": "1",
+                    "processor_perc_warn": "75"
+                },
+                {
+                    "entPhysicalIndex": "0",
+                    "hrDeviceIndex": "0",
+                    "processor_oid": ".1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.15",
+                    "processor_index": "15",
+                    "processor_type": "arubaos",
+                    "processor_usage": "1",
+                    "processor_descr": "Network Processor CPU15",
+                    "processor_precision": "1",
+                    "processor_perc_warn": "75"
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    }
+}
diff --git a/tests/snmpsim/arubaos_aruba7210.snmprec b/tests/snmpsim/arubaos_aruba7210.snmprec
new file mode 100644
index 0000000000..6fa9a0703b
--- /dev/null
+++ b/tests/snmpsim/arubaos_aruba7210.snmprec
@@ -0,0 +1,21 @@
+1.3.6.1.2.1.1.1.0|4|ArubaOS (MODEL: Aruba7210), Version 8.2.0.2 (62929)
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.14823.1.1.32
+1.3.6.1.2.1.1.3.0|67|417035400
+1.3.6.1.2.1.1.4.0|4|<private>
+1.3.6.1.2.1.1.5.0|4|<private>
+1.3.6.1.2.1.1.6.0|4|<private>
+1.3.6.1.4.1.14823.2.2.1.1.1.4.0|2|5
+1.3.6.1.4.1.14823.2.2.1.1.1.5.0|64|10.235.132.234
+1.3.6.1.4.1.14823.2.2.1.1.1.11.1.2.1|2|5184256
+1.3.6.1.4.1.14823.2.2.1.1.1.11.1.3.1|2|4326272
+1.3.6.1.4.1.14823.2.2.1.1.1.11.1.4.1|2|857984
+1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.1|2|2
+1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.8|2|0
+1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.9|2|1
+1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.10|2|0
+1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.11|2|0
+1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.12|2|0
+1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.13|2|0
+1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.14|2|0
+1.3.6.1.4.1.14823.2.2.1.2.1.13.1.3.15|2|1
+1.3.6.1.6.3.10.2.1.3.0|2|4170149