--- /dev/null
+++ b/includes/definitions/mibs/aerohive.inc.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package    observium
+ * @subpackage definitions
+ * @copyright  (C) Adam Armstrong
+ *
+ */
+
+// Aerohive Networks / Extreme Networks HiveOS APs.
+
+$mib = 'AH-SYSTEM-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.26928.1.2';
+$config['mibs'][$mib]['mib_dir'] = 'aerohive';
+$config['mibs'][$mib]['descr'] = 'This module contains the MIB definition of aerohive system related information.';
+
+// AH-SYSTEM-MIB::ahSystemSerial.0 = STRING: "..."
+$config['mibs'][$mib]['serial'][] = [ 'oid' => 'ahSystemSerial.0' ];
+
+// AH-SYSTEM-MIB::ahCpuUtilization.0 = INTEGER: 0..100
+$config['mibs'][$mib]['processor']['ahCpuUtilization'] = [
+  'oid'     => 'ahCpuUtilization',
+  'oid_num' => '.1.3.6.1.4.1.26928.1.2.3',
+  'indexes' => [ 0 => [ 'descr' => 'CPU' ] ],
+];
+
+// AH-SYSTEM-MIB::ahMemUtilization.0 = INTEGER: 0..100
+$config['mibs'][$mib]['mempool']['ahMemUtilization'] = [
+  'type'         => 'static',
+  'descr'        => 'Memory',
+  'oid_perc'     => 'ahMemUtilization.0',
+  'oid_perc_num' => '.1.3.6.1.4.1.26928.1.2.4.0',
+];
+
+// Many HiveAP models are fanless with no thermal sensor, so both are
+// optional and simply won't discover when the AP has no such hardware.
+// NOTE: 'oid_num' here must be the *object* OID, not the scalar instance -
+// discover_sensor_definition() appends '.<index>' itself (index 0 for a
+// plain scalar entry with no 'indexes'/'table'), so a trailing '.0' here
+// would double up into '...26928.1.2.10.0.0', which resolves to nothing at
+// poll time and silently reads back as 0 forever (see AH-SYSTEM-MIB::ahCpuUtilization
+// above for the correctly-shaped equivalent in a 'processor' definition).
+// AH-SYSTEM-MIB::ahEnvirmentTemp.0 = INTEGER: 0..100
+$config['mibs'][$mib]['sensor'][] = [
+  'descr'    => 'System Temperature',
+  'class'    => 'temperature',
+  'measured' => 'device',
+  'oid'      => 'ahEnvirmentTemp',
+  'oid_num'  => '.1.3.6.1.4.1.26928.1.2.10',
+  'min'      => 0,
+  'max'      => 100,
+];
+
+// AH-SYSTEM-MIB::ahEnvirmentFan.0 = INTEGER: 0..10000 (RPM)
+$config['mibs'][$mib]['sensor'][] = [
+  'descr'    => 'System Fan',
+  'class'    => 'fanspeed',
+  'measured' => 'device',
+  'oid'      => 'ahEnvirmentFan',
+  'oid_num'  => '.1.3.6.1.4.1.26928.1.2.11',
+  'min'      => 0,
+  'max'      => 10000,
+];
+
+$mib = 'AH-INTERFACE-MIB';
+$config['mibs'][$mib]['enable'] = 1;
+$config['mibs'][$mib]['identity_num'] = '.1.3.6.1.4.1.26928.1.1.1.2.1';
+$config['mibs'][$mib]['mib_dir'] = 'aerohive';
+$config['mibs'][$mib]['descr'] = 'This module contains the MIB definition of interface related information.';
+
+// EOF
--- a/includes/definitions/os/extreme.inc.php
+++ b/includes/definitions/os/extreme.inc.php
@@ -230,11 +230,25 @@
 $config['os'][$os]['type']                  = "wireless";
 $config['os'][$os]['vendor']                = "Aerohive";
 $config['os'][$os]['graphs'][]              = "device_bits";
+$config['os'][$os]['graphs'][]              = "device_processor";
+$config['os'][$os]['graphs'][]              = "device_mempool";
 $config['os'][$os]['sysObjectID'][]         = ".1.3.6.1.4.1.26928.1";
 // AP230, HiveOS 6.6r1 release build2287
 // AP5010-WW, HiveOS 10.6r4 build-604864c
 // AP4000-1-WW, HiveOS 10.6r5 build-d6d8840
 $config['os'][$os]['sysDescr_regex'][]      = '/(?<hardware>.+), HiveOS (?<version>\d[\w\.]+)/';
+// Extreme rebranded HiveOS to "IQ Engine" (same AH-SYSTEM-MIB/AH-INTERFACE-MIB
+// OIDs, same sysObjectID) - whole fleet observed on this string as of 2026-09:
+// AP410C-1, IQ Engine 10.9r1 build-c8073a1
+// AP305C, IQ Engine 10.9r1 build-c8073a1
+// AP3000-WW, IQ Engine 10.9r1 build-37facbb
+// AP510CX, IQ Engine 10.9r1 build-c8073a1
+$config['os'][$os]['sysDescr_regex'][]      = '/(?<hardware>.+), IQ Engine (?<version>\d[\w\.]+)/';
+// AH-INTERFACE-MIB: radios (ahRadioStatsTable/ahRadioAttributeTable) and
+// directly-associated wireless clients (ahAssociationTable).
+// AH-SYSTEM-MIB: CPU/mem utilization, serial, onboard temp/fan sensors.
+$config['os'][$os]['mibs'][]                = "AH-SYSTEM-MIB";
+$config['os'][$os]['mibs'][]                = "AH-INTERFACE-MIB";
 
 $os = "aerohive-os"; // Another broadcom device..
 $config['os'][$os]['text']                  = "Aerohive Switch";
--- /dev/null
+++ b/includes/discovery/wifi/ah-interface-mib.inc.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package        observium
+ * @subpackage     discovery
+ * @copyright  (C) Adam Armstrong
+ *
+ */
+
+// Aerohive / Extreme HiveOS standalone APs.
+//
+// Each HiveOS device is itself a single access point (no controller), so
+// there is no AP-identity OID to key on: we synthesize a stable 'self:'
+// index (explicitly allowed by wifi_is_suspicious_ap_index()) instead.
+//
+// AH-INTERFACE-MIB exposes the AP's own radios (ahRadioStatsTable /
+// ahRadioAttributeTable, keyed by ifIndex) and directly associated
+// wireless clients (ahAssociationTable, keyed by ifIndex + client MAC,
+// SIZE(6) MacAddress -> 6 extra numeric index parts).
+
+if (!function_exists('ah_interface_mib_channel_band')) {
+    function ah_interface_mib_channel_band($channel)
+    {
+        if (!is_numeric($channel)) {
+            return 'unknown';
+        }
+        $channel = (int)$channel;
+        if ($channel >= 1 && $channel <= 14) {
+            return '2.4GHz';
+        }
+        if ($channel >= 36 && $channel <= 177) {
+            return '5GHz';
+        }
+        if ($channel > 177) {
+            return '6GHz';
+        }
+        return 'unknown';
+    }
+}
+
+if (!function_exists('ah_interface_mib_mode_channel')) {
+    // Most-common channel among a set of raw (possibly non-numeric) values.
+    // Used to derive a channel/band for client-bearing ifIndexes that have
+    // no row of their own in ahRadioAttributeTable (see ahClientChannel
+    // usage below) - the access/VAP ifIndex clients associate to is often
+    // distinct from the physical radio ifIndex that reports channel/txpower.
+    function ah_interface_mib_mode_channel($channels)
+    {
+        $counts = [];
+        foreach ($channels as $channel) {
+            if (is_numeric($channel) && (int)$channel > 0) {
+                $counts[(int)$channel] = ($counts[(int)$channel] ?? 0) + 1;
+            }
+        }
+        if (!safe_count($counts)) {
+            return NULL;
+        }
+        arsort($counts);
+        return array_key_first($counts);
+    }
+}
+
+if (!function_exists('ah_interface_mib_index_to_mac')) {
+    // Convert a 6-part dotted-decimal SNMP index fragment (from the fixed
+    // SIZE(6) MacAddress ahClientMac index) into a normal MAC string.
+    function ah_interface_mib_index_to_mac($dotted)
+    {
+        $octets = explode('.', (string)$dotted);
+        // ahClientMac is not IMPLIED, so with numeric index (-Ob) the agent
+        // returns it length-prefixed: "6.a.b.c.d.e.f" - drop the length octet.
+        if (safe_count($octets) === 7 && $octets[0] === '6') {
+            array_shift($octets);
+        }
+        if (safe_count($octets) !== 6) {
+            return '';
+        }
+        $hex = '';
+        foreach ($octets as $octet) {
+            if (!is_numeric($octet) || $octet < 0 || $octet > 255) {
+                return '';
+            }
+            $hex .= zeropad(dechex((int)$octet), 2);
+        }
+        return format_mac($hex);
+    }
+}
+
+print_cli_data("Collecting", "AH-INTERFACE-MIB Radios", 3);
+
+$ah_ap_index = 'self:' . $device['device_id'];
+
+$ah_radio_attrs = snmpwalk_cache_oid($device, 'ahRadioChannel', [], 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_TABLE);
+if (safe_count($ah_radio_attrs)) {
+    $ah_radio_attrs = snmpwalk_cache_oid($device, 'ahRadioTxPower', $ah_radio_attrs, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_TABLE);
+    $ah_radio_attrs = snmpwalk_cache_oid($device, 'ahRadioNoiseFloor', $ah_radio_attrs, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_TABLE);
+}
+
+$ah_radio_ifphys = snmpwalk_cache_oid($device, 'ifPhysAddress', [], 'IF-MIB', NULL, OBS_SNMP_ALL_TABLE);
+
+// Directly associated clients: index = { ifIndex, ahClientMac (6 parts) }
+$ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientSSID', [], 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+if (safe_count($ah_clients)) {
+    $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientChannel', $ah_clients, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+}
+
+// Union of every ifIndex that looks like a radio: has channel/tx-power
+// stats, or currently has an associated client. This way we never lose
+// a live client count just because a radio-attribute row is missing.
+$ah_radio_ifindexes = array_unique(array_merge(array_keys($ah_radio_attrs), array_keys($ah_clients)));
+
+if (safe_count($ah_radio_ifindexes) === 0) {
+    // No response for any of the tables - not a functioning Aerohive AP, or SNMP failure. Bail out.
+    unset($ah_ap_index, $ah_radio_attrs, $ah_radio_ifphys, $ah_clients, $ah_radio_ifindexes);
+    return;
+}
+
+$ah_system_name = snmp_get_oid($device, 'ahSystemName', 'AH-SYSTEM-MIB');
+$ah_serial      = snmp_get_oid($device, 'ahSystemSerial', 'AH-SYSTEM-MIB');
+
+$ap_id = discover_wifi_ap($device, [
+  'ap_mib'          => 'AH-INTERFACE-MIB',
+  'ap_index'        => $ah_ap_index,
+  'ap_number'       => 0,
+  'ap_name'         => safe_empty($ah_system_name) ? $device['hostname'] : $ah_system_name,
+  'ap_address'      => safe_empty($device['ip']) ? NULL : $device['ip'],
+  'ap_serial'       => safe_empty($ah_serial) ? NULL : $ah_serial,
+  'ap_model'        => safe_empty($device['hardware']) ? NULL : $device['hardware'],
+  'ap_location'     => safe_empty($device['location']) ? NULL : $device['location'],
+  'ap_fingerprint'  => NULL,
+  'ap_status'       => 'up',
+  'ap_admin_status' => 'enable',
+  'ap_uptime'       => isset($device['uptime']) && is_numeric($device['uptime']) ? (int)$device['uptime'] : NULL,
+]);
+
+$ah_wlan_ssids = [];
+foreach ($ah_radio_ifindexes as $if_index) {
+    $client_count = 0;
+    $client_channels = [];
+    if (isset($ah_clients[$if_index]) && is_array($ah_clients[$if_index])) {
+        foreach ($ah_clients[$if_index] as $ssid_entry) {
+            $client_count++;
+            if (!safe_empty($ssid_entry['ahClientSSID'])) {
+                $ah_wlan_ssids[$ssid_entry['ahClientSSID']] = TRUE;
+            }
+            $client_channels[] = $ssid_entry['ahClientChannel'] ?? NULL;
+        }
+    }
+
+    $attrs   = $ah_radio_attrs[$if_index] ?? [];
+    $channel = isset($attrs['ahRadioChannel']) && is_numeric($attrs['ahRadioChannel']) ? (int)$attrs['ahRadioChannel'] : NULL;
+    if ($channel === NULL) {
+        // No radio-attribute row for this ifIndex (typically the client-
+        // facing access/VAP interface, distinct from the physical radio
+        // ifIndex) - derive its effective channel from its own clients.
+        $channel = ah_interface_mib_mode_channel($client_channels);
+    }
+
+    discover_wifi_radio($device['device_id'], [
+      'radio_ap'         => $ap_id,
+      'radio_mib'        => 'AH-INTERFACE-MIB',
+      'radio_number'     => (int)$if_index,
+      'radio_util'       => NULL,
+      'radio_type'       => ah_interface_mib_channel_band($channel),
+      'radio_status'     => 'up',
+      'radio_clients'    => $client_count,
+      'radio_txpower'    => isset($attrs['ahRadioTxPower']) && is_numeric($attrs['ahRadioTxPower']) ? (int)$attrs['ahRadioTxPower'] : NULL,
+      'radio_channel'    => $channel,
+      'radio_mac'        => isset($ah_radio_ifphys[$if_index]['ifPhysAddress']) ? format_mac($ah_radio_ifphys[$if_index]['ifPhysAddress']) : NULL,
+      'radio_protection' => 'unknown',
+      'radio_bsstype'    => 'unknown',
+    ]);
+}
+
+foreach (array_keys($ah_wlan_ssids) as $ssid) {
+    discover_wifi_wlan($device['device_id'], [
+      'wlan_index'         => wifi_wlan_synthetic_index($ssid),
+      'wlan_name'          => $ssid,
+      'wlan_admin_status'  => 1,
+      'wlan_ssid'          => $ssid,
+      'wlan_ssid_bcast'    => NULL,
+      'wlan_bssid'         => NULL,
+      'wlan_bss_type'      => NULL,
+      'wlan_channel'       => NULL,
+      'wlan_dtim_period'   => NULL,
+      'wlan_beacon_period' => NULL,
+      'wlan_frag_thresh'   => NULL,
+      'wlan_igmp_snoop'    => NULL,
+      'wlan_prot_mode'     => NULL,
+      'wlan_radio_mode'    => NULL,
+      'wlan_rts_thresh'    => NULL,
+      'wlan_vlan_id'       => NULL,
+    ]);
+}
+
+unset($ah_ap_index, $ah_radio_attrs, $ah_radio_ifphys, $ah_clients, $ah_radio_ifindexes, $ah_system_name, $ah_serial, $ap_id, $ah_wlan_ssids, $if_index, $client_count, $client_channels, $ssid_entry, $attrs, $channel, $ssid);
+
+// EOF
--- /dev/null
+++ b/includes/polling/wifi/ah-interface-mib.inc.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package        observium
+ * @subpackage     poller
+ * @copyright  (C) Adam Armstrong
+ *
+ */
+
+// Aerohive / Extreme HiveOS standalone APs - see includes/discovery/wifi/ah-interface-mib.inc.php
+// for the index/topology rationale (single AP per device, radios keyed by
+// ifIndex, clients keyed by { ifIndex, ahClientMac }).
+//
+// The ahAssociationTable walk here is cached in $GLOBALS so the
+// wifi-sessions counterpart (same poller run, included right after this
+// module) doesn't have to re-walk the whole client table again.
+
+if (!function_exists('ah_interface_mib_channel_band')) {
+    function ah_interface_mib_channel_band($channel)
+    {
+        if (!is_numeric($channel)) {
+            return 'unknown';
+        }
+        $channel = (int)$channel;
+        if ($channel >= 1 && $channel <= 14) {
+            return '2.4GHz';
+        }
+        if ($channel >= 36 && $channel <= 177) {
+            return '5GHz';
+        }
+        if ($channel > 177) {
+            return '6GHz';
+        }
+        return 'unknown';
+    }
+}
+
+if (!function_exists('ah_interface_mib_airtime_util')) {
+    // Derive a channel-utilization percentage from cumulative
+    // ahRadioTxAirtime/ahRadioRxAirtime (Counter64, microseconds) via a
+    // delta-over-time calc against the previous poll's reading.
+    //
+    // wifi_radios has no raw-airtime-counter column to stash the previous
+    // reading in (unlike radio_tx_bytes/radio_tx_retries, which the core
+    // wifi.inc.php framework already round-trips for its own bps/rate
+    // calcs), and the wifi_radio_id for this radio doesn't exist yet at
+    // this point in the poll (the AP/radio upsert runs after this file
+    // returns) - so state is persisted with the generic entity-attrib
+    // store, keyed by (device, ifIndex) instead.
+    function ah_interface_mib_airtime_util($device_id, $if_index, $tx_airtime, $rx_airtime, $now)
+    {
+        if (!is_numeric($tx_airtime) || !is_numeric($rx_airtime)) {
+            return NULL;
+        }
+
+        $attrib_type = 'ah_radio_airtime.' . $if_index;
+        $prev        = get_entity_attrib('device', $device_id, $attrib_type);
+        set_entity_attrib('device', $device_id, $attrib_type, $tx_airtime . ':' . $rx_airtime . ':' . $now);
+
+        $parts = safe_empty($prev) ? [] : explode(':', $prev);
+        if (safe_count($parts) !== 3 || !is_numeric($parts[0]) || !is_numeric($parts[1]) || !is_numeric($parts[2])) {
+            return NULL;
+        }
+        [$prev_tx, $prev_rx, $prev_time] = $parts;
+
+        $period = $now - (int)$prev_time;
+        if ($period <= 0) {
+            return NULL;
+        }
+
+        // A negative delta means a counter reset/reboot/wrap - discard this sample.
+        $tx_delta = $tx_airtime - $prev_tx;
+        $rx_delta = $rx_airtime - $prev_rx;
+        if ($tx_delta < 0 || $rx_delta < 0) {
+            return NULL;
+        }
+
+        $util = (($tx_delta + $rx_delta) / ($period * 1000000)) * 100;
+
+        return (int)round(min(100, max(0, $util)));
+    }
+}
+
+if (!function_exists('ah_interface_mib_mode_channel')) {
+    // Most-common channel among a set of raw (possibly non-numeric) values.
+    // Used to derive a channel/band for client-bearing ifIndexes that have
+    // no row of their own in ahRadioAttributeTable (see ahClientChannel
+    // usage below) - the access/VAP ifIndex clients associate to is often
+    // distinct from the physical radio ifIndex that reports channel/txpower.
+    function ah_interface_mib_mode_channel($channels)
+    {
+        $counts = [];
+        foreach ($channels as $channel) {
+            if (is_numeric($channel) && (int)$channel > 0) {
+                $counts[(int)$channel] = ($counts[(int)$channel] ?? 0) + 1;
+            }
+        }
+        if (!safe_count($counts)) {
+            return NULL;
+        }
+        arsort($counts);
+        return array_key_first($counts);
+    }
+}
+
+print_cli_data("Collecting", "AH-INTERFACE-MIB Radios", 3);
+
+$ah_ap_index = 'self:' . $device['device_id'];
+
+$ah_radio_attrs = snmpwalk_cache_oid($device, 'ahRadioChannel', [], 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_TABLE);
+if (safe_count($ah_radio_attrs)) {
+    $ah_radio_attrs = snmpwalk_cache_oid($device, 'ahRadioTxPower', $ah_radio_attrs, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_TABLE);
+    $ah_radio_attrs = snmpwalk_cache_oid($device, 'ahRadioNoiseFloor', $ah_radio_attrs, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_TABLE);
+}
+
+// ahRadioStatsTable has no byte counters (frames only), so ap_member_tx_bytes/
+// rx_bytes (and their bps rates) stay NULL - only frame counts + retries feed
+// the framework's extended per-radio counters (wifi_radio_counters rrd).
+// ahRadioTxAirtime/RxAirtime (Counter64, us) feed ap_member_util instead (see
+// ah_interface_mib_airtime_util() above).
+$ah_radio_stats = snmpwalk_cache_oid($device, 'ahRadioTxDataFrames', [], 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_TABLE);
+if (safe_count($ah_radio_stats)) {
+    $ah_radio_stats = snmpwalk_cache_oid($device, 'ahRadioRxTotalDataFrames', $ah_radio_stats, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_TABLE);
+    $ah_radio_stats = snmpwalk_cache_oid($device, 'ahRadioTxTotalRetries', $ah_radio_stats, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_TABLE);
+    $ah_radio_stats = snmpwalk_cache_oid($device, 'ahRadioTxAirtime', $ah_radio_stats, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_TABLE);
+    $ah_radio_stats = snmpwalk_cache_oid($device, 'ahRadioRxAirtime', $ah_radio_stats, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_TABLE);
+}
+
+$ah_radio_ifphys = snmpwalk_cache_oid($device, 'ifPhysAddress', [], 'IF-MIB', NULL, OBS_SNMP_ALL_TABLE);
+
+// Client association table, keyed by { ifIndex, ahClientMac }. Walk once
+// here, cache for wifi-sessions, and re-use it to count clients per radio.
+$ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientSSID', [], 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+if (safe_count($ah_clients)) {
+    $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientIP', $ah_clients, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+    $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientHostname', $ah_clients, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+    $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientUsername', $ah_clients, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+    $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientRSSI', $ah_clients, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+    $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientLinkUptime', $ah_clients, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+    $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientChannel', $ah_clients, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+}
+$GLOBALS['snmpwalk_cache'][$device['device_id']]['ah_association_table'] = $ah_clients;
+
+$ah_radio_ifindexes = array_unique(array_merge(array_keys($ah_radio_attrs), array_keys($ah_radio_stats), array_keys($ah_clients)));
+
+if (safe_count($ah_radio_ifindexes) > 0) {
+    $ah_system_name = snmp_get_oid($device, 'ahSystemName', 'AH-SYSTEM-MIB');
+    $ah_serial      = snmp_get_oid($device, 'ahSystemSerial', 'AH-SYSTEM-MIB');
+
+    $aps_poll[$ah_ap_index] = [
+      'device_id'       => $device['device_id'],
+      'ap_mib'          => 'AH-INTERFACE-MIB',
+      'ap_index'        => $ah_ap_index,
+      'ap_name'         => safe_empty($ah_system_name) ? $device['hostname'] : $ah_system_name,
+      'ap_address'      => safe_empty($device['ip']) ? NULL : $device['ip'],
+      'ap_serial'       => safe_empty($ah_serial) ? NULL : $ah_serial,
+      'ap_model'        => safe_empty($device['hardware']) ? NULL : $device['hardware'],
+      'ap_location'     => safe_empty($device['location']) ? NULL : $device['location'],
+      'ap_status'       => 'up',
+      'ap_admin_status' => 'enable',
+      'ap_uptime'       => isset($device['uptime']) && is_numeric($device['uptime']) ? (int)$device['uptime'] : NULL,
+    ];
+
+    $ah_wlans_seen  = [];
+    $ah_total_clients = 0;
+    $ah_now = time();
+    foreach ($ah_radio_ifindexes as $if_index) {
+        $client_count = 0;
+        $client_channels = [];
+        if (isset($ah_clients[$if_index]) && is_array($ah_clients[$if_index])) {
+            foreach ($ah_clients[$if_index] as $client) {
+                $client_count++;
+                if (!safe_empty($client['ahClientSSID'])) {
+                    $ah_wlans_seen[$client['ahClientSSID']][] = (int)$if_index;
+                }
+                $client_channels[] = $client['ahClientChannel'] ?? NULL;
+            }
+        }
+        $ah_total_clients += $client_count;
+
+        $attrs   = $ah_radio_attrs[$if_index] ?? [];
+        $stats   = $ah_radio_stats[$if_index] ?? [];
+        $channel = isset($attrs['ahRadioChannel']) && is_numeric($attrs['ahRadioChannel']) ? (int)$attrs['ahRadioChannel'] : NULL;
+        if ($channel === NULL) {
+            // No radio-attribute row for this ifIndex (typically the client-
+            // facing access/VAP interface, distinct from the physical radio
+            // ifIndex) - derive its effective channel from its own clients.
+            $channel = ah_interface_mib_mode_channel($client_channels);
+        }
+
+        $radio_util = ah_interface_mib_airtime_util(
+            $device['device_id'], (int)$if_index,
+            $stats['ahRadioTxAirtime'] ?? NULL, $stats['ahRadioRxAirtime'] ?? NULL, $ah_now
+        );
+
+        $member_index = $ah_ap_index . '.' . (int)$if_index;
+        $aps_member_poll[$member_index] = [
+          'device_id'             => $device['device_id'],
+          'ap_index'              => $ah_ap_index,
+          'ap_index_member'       => $member_index,
+          'radio_mib'             => 'AH-INTERFACE-MIB',
+          'ap_member_state'       => 'up',
+          'ap_member_admin_state' => 'enable',
+          'ap_member_conns'       => $client_count,
+          'ap_member_channel'     => $channel,
+          'ap_member_radiotype'   => ah_interface_mib_channel_band($channel),
+          'ap_member_util'        => $radio_util,
+          'ap_member_txpower'     => isset($attrs['ahRadioTxPower']) && is_numeric($attrs['ahRadioTxPower']) ? (int)$attrs['ahRadioTxPower'] : NULL,
+          'ap_member_noise'       => isset($attrs['ahRadioNoiseFloor']) && is_numeric($attrs['ahRadioNoiseFloor']) ? (int)$attrs['ahRadioNoiseFloor'] : NULL,
+          'ap_member_radio_mac'   => isset($ah_radio_ifphys[$if_index]['ifPhysAddress']) ? format_mac($ah_radio_ifphys[$if_index]['ifPhysAddress']) : NULL,
+          'ap_member_tx_frames'   => isset($stats['ahRadioTxDataFrames']) && is_numeric($stats['ahRadioTxDataFrames']) ? (int)$stats['ahRadioTxDataFrames'] : NULL,
+          'ap_member_rx_frames'   => isset($stats['ahRadioRxTotalDataFrames']) && is_numeric($stats['ahRadioRxTotalDataFrames']) ? (int)$stats['ahRadioRxTotalDataFrames'] : NULL,
+          'ap_member_retries'     => isset($stats['ahRadioTxTotalRetries']) && is_numeric($stats['ahRadioTxTotalRetries']) ? (int)$stats['ahRadioTxTotalRetries'] : NULL,
+        ];
+    }
+
+    $wifi_controller['aps']     = 1;
+    $wifi_controller['clients'] = $ah_total_clients;
+
+    // Radio<->WLAN map: every SSID is attributed directly to the ifIndex(es)
+    // its currently-associated clients were seen on - no BSSID-matching
+    // heuristics needed, since ahClientSSID/ifIndex come from the same row.
+    $radio_wlan_polled = TRUE;
+    foreach ($ah_wlans_seen as $ssid => $if_indexes) {
+        foreach (array_unique($if_indexes) as $if_index) {
+            $radio_wlan_poll[] = [
+              'ap_index'           => $ah_ap_index,
+              'radio_number'       => (int)$if_index,
+              'wlan_ssid'          => $ssid,
+              'radio_wlan_index'   => 'aerohive:' . $if_index . ':' . $ssid,
+              'radio_wlan_status'  => 'active',
+            ];
+        }
+    }
+}
+
+unset($ah_ap_index, $ah_radio_attrs, $ah_radio_stats, $ah_radio_ifphys, $ah_clients, $ah_radio_ifindexes, $ah_system_name, $ah_serial,
+      $ah_wlans_seen, $ah_total_clients, $ah_now, $if_index, $if_indexes, $client_count, $client_channels, $client, $attrs, $stats, $channel, $radio_util, $member_index, $ssid);
+
+// EOF
--- /dev/null
+++ b/includes/polling/wifi-sessions/ah-interface-mib.inc.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Observium
+ *
+ *   This file is part of Observium.
+ *
+ * @package        observium
+ * @subpackage     poller
+ * @copyright  (C) Adam Armstrong
+ *
+ */
+
+// Aerohive / Extreme HiveOS client sessions (ahAssociationTable).
+//
+// Parse + resolve only: re-use (or, if missing, re-walk) the client table
+// gathered by includes/polling/wifi/ah-interface-mib.inc.php, resolve each
+// client's radio_id via wifi_radios (already upserted for this poll cycle
+// by includes/polling/wifi.inc.php before this dir is included), and
+// append to $sessions_poll. All DB writes, timestamps, diffs and pruning
+// are owned centrally by includes/polling/wifi.inc.php.
+
+if (!function_exists('ah_interface_mib_index_to_mac')) {
+    // Convert a 6-part dotted-decimal SNMP index fragment (from the fixed
+    // SIZE(6) MacAddress ahClientMac index) into a normal MAC string.
+    function ah_interface_mib_index_to_mac($dotted)
+    {
+        $octets = explode('.', (string)$dotted);
+        // ahClientMac is not IMPLIED, so with numeric index (-Ob) the agent
+        // returns it length-prefixed: "6.a.b.c.d.e.f" - drop the length octet.
+        if (safe_count($octets) === 7 && $octets[0] === '6') {
+            array_shift($octets);
+        }
+        if (safe_count($octets) !== 6) {
+            return '';
+        }
+        $hex = '';
+        foreach ($octets as $octet) {
+            if (!is_numeric($octet) || $octet < 0 || $octet > 255) {
+                return '';
+            }
+            $hex .= zeropad(dechex((int)$octet), 2);
+        }
+        return format_mac($hex);
+    }
+}
+
+print_cli_data("Collecting", "AH-INTERFACE-MIB Client Sessions", 3);
+
+if (isset($GLOBALS['snmpwalk_cache'][$device['device_id']]['ah_association_table'])) {
+    $ah_clients = $GLOBALS['snmpwalk_cache'][$device['device_id']]['ah_association_table'];
+} else {
+    // Fallback in case the wifi/ radio module didn't run this cycle.
+    $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientSSID', [], 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+    if (safe_count($ah_clients)) {
+        $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientIP', $ah_clients, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+        $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientHostname', $ah_clients, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+        $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientUsername', $ah_clients, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+        $ah_clients = snmpwalk_cache_twopart_oid($device, 'ahClientLinkUptime', $ah_clients, 'AH-INTERFACE-MIB', NULL, OBS_SNMP_ALL_NUMERIC_INDEX);
+    }
+}
+
+$ah_radio_map = [];
+foreach (dbFetchRows('SELECT `wifi_radio_id`, `radio_number` FROM `wifi_radios` WHERE `device_id` = ?', [$device['device_id']]) as $row) {
+    $ah_radio_map[(int)$row['radio_number']] = (int)$row['wifi_radio_id'];
+}
+
+$sessions_polled = TRUE;
+foreach ($ah_clients as $if_index => $if_clients) {
+    if (!isset($ah_radio_map[(int)$if_index])) {
+        continue;
+    }
+    $wifi_radio_id = $ah_radio_map[(int)$if_index];
+
+    foreach ($if_clients as $mac_index => $client) {
+        $client_mac = ah_interface_mib_index_to_mac($mac_index);
+        if (safe_empty($client_mac)) {
+            continue;
+        }
+        $clean_mac = str_replace(':', '', $client_mac);
+
+        $ipv4 = $client['ahClientIP'] ?? NULL;
+        if (safe_empty($ipv4) || $ipv4 === '0.0.0.0') {
+            $ipv4 = NULL;
+        }
+
+        $sessions_poll[$clean_mac] = [
+          'radio_id'  => $wifi_radio_id,
+          'mac_addr'  => $clean_mac,
+          'ipv4_addr' => $ipv4,
+          'username'  => !safe_empty($client['ahClientUsername']) ? $client['ahClientUsername'] : (!safe_empty($client['ahClientHostname']) ? $client['ahClientHostname'] : NULL),
+          'ssid'      => safe_empty($client['ahClientSSID']) ? NULL : $client['ahClientSSID'],
+          'state'     => 'associated',
+          'uptime'    => isset($client['ahClientLinkUptime']) && is_numeric($client['ahClientLinkUptime']) ? (int)$client['ahClientLinkUptime'] : NULL,
+        ];
+    }
+}
+
+unset($ah_clients, $ah_radio_map, $if_index, $if_clients, $mac_index, $client, $client_mac, $clean_mac, $ipv4, $wifi_radio_id, $row);
+
+// EOF
--- a/includes/entities/wifi.inc.php
+++ b/includes/entities/wifi.inc.php
@@ -62,6 +62,27 @@
     return FALSE;
 }
 
+/**
+ * Change-detection for the AP/radio diff-update loops in polling/wifi.inc.php.
+ *
+ * Those loops intentionally use loose '!=' comparison so a DB string like
+ * "5" isn't treated as different from a freshly-polled PHP int 5 every
+ * single cycle. But PHP's loose comparison also treats 0/'' as equal to
+ * NULL, which silently swallows a genuine transition from "never measured"
+ * (NULL) to a legitimate zero reading (eg. an idle radio at 0% channel
+ * utilization) - the column then stays NULL forever instead of showing 0.
+ * This keeps the loose-comparison behaviour for everything else while
+ * still catching that one NULL<->0 case.
+ */
+function wifi_field_changed($new, $old)
+{
+    if (($new === NULL) !== ($old === NULL)) {
+        return TRUE;
+    }
+
+    return $new != $old;
+}
+
 function wifi_normalize_admin_status($state)
 {
     $state = strtolower(trim((string)$state));
--- a/includes/polling/wifi.inc.php
+++ b/includes/polling/wifi.inc.php
@@ -166,10 +166,11 @@
             $wifi_ap_id = $ap_db['wifi_ap_id'];
             $ap_update  = [];
             foreach ($entry as $param => $value) {
-                // Loose comparison so DB-string vs PHP-int doesn't churn
-                // numeric columns every cycle (matches the diff pattern
-                // used by entities/processor.inc.php and friends).
-                if (!array_key_exists($param, $ap_db) || $entry[$param] != $ap_db[$param]) {
+                // Loose comparison (via wifi_field_changed()) so DB-string vs
+                // PHP-int doesn't churn numeric columns every cycle (matches
+                // the diff pattern used by entities/processor.inc.php and
+                // friends), while still catching a genuine NULL -> 0 change.
+                if (!array_key_exists($param, $ap_db) || wifi_field_changed($entry[$param], $ap_db[$param])) {
                     $ap_update[$param] = safe_empty($entry[$param]) ? ['NULL'] : $entry[$param];
                 }
             }
@@ -403,10 +404,13 @@
             $wifi_radio_id = $ap_member_db['wifi_radio_id'];
             $radio_update  = [];
             foreach ($radio_entry as $param => $value) {
-                // Loose comparison so DB-string vs PHP-int doesn't churn
-                // numeric columns every cycle (matches the diff pattern
-                // used by entities/processor.inc.php and friends).
-                if (!array_key_exists($param, $ap_member_db) || $radio_entry[$param] != $ap_member_db[$param]) {
+                // Loose comparison (via wifi_field_changed()) so DB-string vs
+                // PHP-int doesn't churn numeric columns every cycle (matches
+                // the diff pattern used by entities/processor.inc.php and
+                // friends), while still catching a genuine NULL -> 0 change
+                // (eg. radio_util going from "never measured" to an idle
+                // radio's legitimate 0% channel utilization).
+                if (!array_key_exists($param, $ap_member_db) || wifi_field_changed($radio_entry[$param], $ap_member_db[$param])) {
                     $radio_update[$param] = safe_empty($radio_entry[$param]) ? ['NULL'] : $radio_entry[$param];
                 }
             }
--- a/mibs/aerohive/AH-SMI-MIB
+++ b/mibs/aerohive/AH-SMI-MIB
@@ -40,42 +40,42 @@
 ahAPMRP            OBJECT IDENTIFIER ::= { ahAPCommon 3 }
 ahAPIDP            OBJECT IDENTIFIER ::= { ahAPCommon 4 }
 
-ahAPHiveAP020_ag          OBJECT IDENTIFIER ::= { ahAP 2 }
-ahAPHiveAP028_ag          OBJECT IDENTIFIER ::= { ahAP 3 }
-ahAPHiveAP320_n           OBJECT IDENTIFIER ::= { ahAP 4 }
-ahAPHiveAP340_n           OBJECT IDENTIFIER ::= { ahAP 5 }
-ahAPHiveAP110_n           OBJECT IDENTIFIER ::= { ahAP 6 }
-ahAPHiveAP120_n           OBJECT IDENTIFIER ::= { ahAP 7 }
-ahAPHiveAP170_n           OBJECT IDENTIFIER ::= { ahAP 8 }
-ahAPHiveAP330_n           OBJECT IDENTIFIER ::= { ahAP 9 }
-ahAPHiveAP350_n           OBJECT IDENTIFIER ::= { ahAP 10 }
-ahAPHiveAP121_n           OBJECT IDENTIFIER ::= { ahAP 11 }
-ahAPHiveAP141_n           OBJECT IDENTIFIER ::= { ahAP 12 }
-ahAPHiveAP370_ac          OBJECT IDENTIFIER ::= { ahAP 13 }
-ahAPHiveAP390_ac          OBJECT IDENTIFIER ::= { ahAP 14 }
-ahAPHiveAP230_ac          OBJECT IDENTIFIER ::= { ahAP 15 }
-ahAPHiveAP1130_ac         OBJECT IDENTIFIER ::= { ahAP 16 }
-ahAPHiveAP130_ac          OBJECT IDENTIFIER ::= { ahAP 17 }
-ahAPHiveAP250_ac          OBJECT IDENTIFIER ::= { ahAP 18 }
-ahAPHiveAP245X_ac         OBJECT IDENTIFIER ::= { ahAP 19 }
-ahAPHiveAP550_ac          OBJECT IDENTIFIER ::= { ahAP 20 }
-ahAPHiveAP122_ac          OBJECT IDENTIFIER ::= { ahAP 21 }
-ahAPHiveAP122X_ac         OBJECT IDENTIFIER ::= { ahAP 22 }
-ahAPHiveAP150W_ac         OBJECT IDENTIFIER ::= { ahAP 23 }
-ahAPHiveAP30_ac           OBJECT IDENTIFIER ::= { ahAP 24 }
-ahAPHiveAP630_ax          OBJECT IDENTIFIER ::= { ahAP 25 }
-ahAPHiveAP650_ax          OBJECT IDENTIFIER ::= { ahAP 26 }
-ahAPHiveAP650X_ax         OBJECT IDENTIFIER ::= { ahAP 27 }
-ahAPHiveAP510CX_ax        OBJECT IDENTIFIER ::= { ahAP 29 }
-ahAPHiveAP305C_ax         OBJECT IDENTIFIER ::= { ahAP 30 }
-ahAPHiveAP305CX_ax        OBJECT IDENTIFIER ::= { ahAP 31 }
-ahAPHiveAP410C_ax         OBJECT IDENTIFIER ::= { ahAP 32 }
-ahAPHiveAP460C_ax         OBJECT IDENTIFIER ::= { ahAP 33 }
-ahAPHiveAP460S6C_ax       OBJECT IDENTIFIER ::= { ahAP 34 }
-ahAPHiveAP460S12C_ax      OBJECT IDENTIFIER ::= { ahAP 35 }
-ahAPHiveAP302W_ax         OBJECT IDENTIFIER ::= { ahAP 36 }
-ahAPHiveAP4000_ax         OBJECT IDENTIFIER ::= { ahAP 37 }
-ahAPHiveAP4000U_ax        OBJECT IDENTIFIER ::= { ahAP 38 }
+ahAPHiveAP020ag          OBJECT IDENTIFIER ::= { ahAP 2 }
+ahAPHiveAP028ag          OBJECT IDENTIFIER ::= { ahAP 3 }
+ahAPHiveAP320n           OBJECT IDENTIFIER ::= { ahAP 4 }
+ahAPHiveAP340n           OBJECT IDENTIFIER ::= { ahAP 5 }
+ahAPHiveAP110n           OBJECT IDENTIFIER ::= { ahAP 6 }
+ahAPHiveAP120n           OBJECT IDENTIFIER ::= { ahAP 7 }
+ahAPHiveAP170n           OBJECT IDENTIFIER ::= { ahAP 8 }
+ahAPHiveAP330n           OBJECT IDENTIFIER ::= { ahAP 9 }
+ahAPHiveAP350n           OBJECT IDENTIFIER ::= { ahAP 10 }
+ahAPHiveAP121n           OBJECT IDENTIFIER ::= { ahAP 11 }
+ahAPHiveAP141n           OBJECT IDENTIFIER ::= { ahAP 12 }
+ahAPHiveAP370ac          OBJECT IDENTIFIER ::= { ahAP 13 }
+ahAPHiveAP390ac          OBJECT IDENTIFIER ::= { ahAP 14 }
+ahAPHiveAP230ac          OBJECT IDENTIFIER ::= { ahAP 15 }
+ahAPHiveAP1130ac         OBJECT IDENTIFIER ::= { ahAP 16 }
+ahAPHiveAP130ac          OBJECT IDENTIFIER ::= { ahAP 17 }
+ahAPHiveAP250ac          OBJECT IDENTIFIER ::= { ahAP 18 }
+ahAPHiveAP245Xac         OBJECT IDENTIFIER ::= { ahAP 19 }
+ahAPHiveAP550ac          OBJECT IDENTIFIER ::= { ahAP 20 }
+ahAPHiveAP122ac          OBJECT IDENTIFIER ::= { ahAP 21 }
+ahAPHiveAP122Xac         OBJECT IDENTIFIER ::= { ahAP 22 }
+ahAPHiveAP150Wac         OBJECT IDENTIFIER ::= { ahAP 23 }
+ahAPHiveAP30ac           OBJECT IDENTIFIER ::= { ahAP 24 }
+ahAPHiveAP630ax          OBJECT IDENTIFIER ::= { ahAP 25 }
+ahAPHiveAP650ax          OBJECT IDENTIFIER ::= { ahAP 26 }
+ahAPHiveAP650Xax         OBJECT IDENTIFIER ::= { ahAP 27 }
+ahAPHiveAP510CXax        OBJECT IDENTIFIER ::= { ahAP 29 }
+ahAPHiveAP305Cax         OBJECT IDENTIFIER ::= { ahAP 30 }
+ahAPHiveAP305CXax        OBJECT IDENTIFIER ::= { ahAP 31 }
+ahAPHiveAP410Cax         OBJECT IDENTIFIER ::= { ahAP 32 }
+ahAPHiveAP460Cax         OBJECT IDENTIFIER ::= { ahAP 33 }
+ahAPHiveAP460S6Cax       OBJECT IDENTIFIER ::= { ahAP 34 }
+ahAPHiveAP460S12Cax      OBJECT IDENTIFIER ::= { ahAP 35 }
+ahAPHiveAP302Wax         OBJECT IDENTIFIER ::= { ahAP 36 }
+ahAPHiveAP4000ax         OBJECT IDENTIFIER ::= { ahAP 37 }
+ahAPHiveAP4000Uax        OBJECT IDENTIFIER ::= { ahAP 38 }
 
 AhString ::= TEXTUAL-CONVENTION
    STATUS        current
@@ -103,9 +103,9 @@
                    ahAccess     (1), -- interface is used for access 
                    ahBackhaul   (2), -- interface is used for backhaul
                    ahBridge     (3), -- interface is used for bridge
-                   ahDual       (4)  -- interface is used for dual
-                   ahSensor     (5)  -- interface is used for Sensor
-                   ahWLAN-Wan   (6)  -- interface is used for WLAN-Wan
+                   ahDual       (4), -- interface is used for dual
+                   ahSensor     (5), -- interface is used for Sensor
+                   ahWlanWan    (6)  -- interface is used for WLAN-Wan
                  }
 
 AhMACProtocol ::= TEXTUAL-CONVENTION
