diff --git a/includes/discovery/sensors/current/awplus.inc.php b/includes/discovery/sensors/current/awplus.inc.php
new file mode 100644
index 0000000000..902ef50cbf
--- /dev/null
+++ b/includes/discovery/sensors/current/awplus.inc.php
@@ -0,0 +1,40 @@
+<?php
+
+$divisor = 1000000;
+
+if ($pre_cache['awplus-sfpddm']) {
+    foreach ($pre_cache['awplus-sfpddm'] as $index => $data) {
+        if (isset($data['atPluggableDiagTxBiasStatusReading'])) {
+            $ifIndex = explode('.', $index, 2)[0];
+            $high_limit = isset($data['atPluggableDiagTxBiasAlarmMax']) ? ($data['atPluggableDiagTxBiasAlarmMax'] / $divisor) : null;
+            $high_warn_limit = isset($data['atPluggableDiagTxBiasWarningMax']) ? ($data['atPluggableDiagTxBiasWarningMax'] / $divisor) : null;
+            $low_warn_limit = isset($data['atPluggableDiagTxBiasWarningMin']) ? ($data['atPluggableDiagTxBiasWarningMin'] / $divisor) : null;
+            $low_limit = isset($data['atPluggableDiagTxBiasAlarmMin']) ? ($data['atPluggableDiagTxBiasAlarmMin'] / $divisor) : null;
+
+            $tmp = get_port_by_index_cache($device['device_id'], $ifIndex);
+            $descr = $tmp['ifName'];
+            $oid = '.1.3.6.1.4.1.207.8.4.4.3.28.1.3.1.3.' . $index;
+            discover_sensor(
+                $valid['sensor'],
+                'current',
+                $device,
+                $oid,
+                'SFP:' . $descr,
+                'atPluggableDiagTxBiasStatusReading',
+                'SFP:' . $descr,
+                $divisor,
+                null, // $multiplier,
+                $low_limit,
+                $low_warn_limit,
+                $high_warn_limit,
+                $high_limit,
+                $value,
+                'snmp',
+                $ifIndex,
+                null,
+                null,
+                'SFP'
+            );
+        }
+    }
+}
diff --git a/includes/discovery/sensors/dbm/awplus.inc.php b/includes/discovery/sensors/dbm/awplus.inc.php
new file mode 100644
index 0000000000..2a6d42793d
--- /dev/null
+++ b/includes/discovery/sensors/dbm/awplus.inc.php
@@ -0,0 +1,76 @@
+<?php
+
+$divisor = 10000;
+
+if ($pre_cache['awplus-sfpddm']) {
+    foreach ($pre_cache['awplus-sfpddm'] as $index => $data) {
+        if (isset($data['atPluggableDiagTxPowerStatusReading'])) {
+            $ifIndex = explode('.', $index, 2)[0];
+            $high_limit = isset($data['atPluggableDiagTxPowerAlarmMax']) ? mw_to_dbm($data['atPluggableDiagTxPowerAlarmMax'] / $divisor) : null;
+            $high_warn_limit = isset($data['atPluggableDiagTxPowerWarningMax']) ? mw_to_dbm($data['atPluggableDiagTxPowerWarningMax'] / $divisor) : null;
+            $low_warn_limit = isset($data['atPluggableDiagTxPowerWarningMin']) ? mw_to_dbm($data['atPluggableDiagTxPowerWarningMin'] / $divisor) : null;
+            $low_limit = isset($data['atPluggableDiagTxPowerAlarmMin']) ? mw_to_dbm($data['atPluggableDiagTxPowerAlarmMin'] / $divisor) : null;
+
+            $tmp = get_port_by_index_cache($device['device_id'], $ifIndex);
+            $descr = $tmp['ifName'];
+            $oid = '.1.3.6.1.4.1.207.8.4.4.3.28.1.4.1.3.' . $index;
+            discover_sensor(
+                $valid['sensor'],
+                'dbm',
+                $device,
+                $oid,
+                'SFP:' . $descr,
+                'atPluggableDiagTxPowerStatusReading',
+                'SFP:' . $descr,
+                $divisor,
+                null, // $multiplier,
+                $low_limit,
+                $low_warn_limit,
+                $high_warn_limit,
+                $high_limit,
+                $value,
+                'snmp',
+                $ifIndex,
+                null,
+                'mw_to_dbm',
+                'TX Power'
+            );
+        }
+    }
+}
+if ($pre_cache['awplus-sfpddm']) {
+    foreach ($pre_cache['awplus-sfpddm'] as $index => $data) {
+        if (isset($data['atPluggableDiagRxPowerStatusReading'])) {
+            $ifIndex = explode('.', $index, 2)[0];
+            $high_limit = isset($data['atPluggableDiagRxPowerAlarmMax']) ? mw_to_dbm($data['atPluggableDiagRxPowerAlarmMax'] / $divisor) : null;
+            $high_warn_limit = isset($data['atPluggableDiagRxPowerWarningMax']) ? mw_to_dbm($data['atPluggableDiagRxPowerWarningMax'] / $divisor) : null;
+            $low_warn_limit = isset($data['atPluggableDiagRxPowerWarningMin']) ? mw_to_dbm($data['atPluggableDiagRxPowerWarningMin'] / $divisor) : null;
+            $low_limit = isset($data['atPluggableDiagRxPowerAlarmMin']) ? mw_to_dbm($data['atPluggableDiagRxPowerAlarmMin'] / $divisor) : null;
+
+            $tmp = get_port_by_index_cache($device['device_id'], $ifIndex);
+            $descr = $tmp['ifName'];
+            $oid = '.1.3.6.1.4.1.207.8.4.4.3.28.1.5.1.3.' . $index;
+            discover_sensor(
+                $valid['sensor'],
+                'dbm',
+                $device,
+                $oid,
+                'SFP:' . $descr,
+                'atPluggableDiagRxPowerStatusReading',
+                'SFP:' . $descr,
+                $divisor,
+                null, // $multiplier,
+                $low_limit,
+                $low_warn_limit,
+                $high_warn_limit,
+                $high_limit,
+                $value,
+                'snmp',
+                $ifIndex,
+                null,
+                'mw_to_dbm',
+                'RX Power'
+            );
+        }
+    }
+}
diff --git a/includes/discovery/sensors/pre-cache/awplus.inc.php b/includes/discovery/sensors/pre-cache/awplus.inc.php
new file mode 100644
index 0000000000..1d81a20724
--- /dev/null
+++ b/includes/discovery/sensors/pre-cache/awplus.inc.php
@@ -0,0 +1,19 @@
+<?php
+
+echo 'atPluggableDiagTempEntry ';
+$pre_cache['awplus-sfpddm'] = snmpwalk_cache_oid($device, 'atPluggableDiagTempEntry', [], 'AT-PLUGGABLE-DIAGNOSTICS-MIB');
+
+echo 'atPluggableDiagVccEntry ';
+$pre_cache['awplus-sfpddm'] = snmpwalk_cache_oid($device, 'atPluggableDiagVccEntry', $pre_cache['awplus-sfpddm'], 'AT-PLUGGABLE-DIAGNOSTICS-MIB');
+
+echo  'atPluggableDiagTxBiasEntry ';
+$pre_cache['awplus-sfpddm'] = snmpwalk_cache_oid($device, 'atPluggableDiagTxBiasEntry', $pre_cache['awplus-sfpddm'], 'AT-PLUGGABLE-DIAGNOSTICS-MIB');
+
+echo 'atPluggableDiagTxPowerEntry ';
+$pre_cache['awplus-sfpddm'] = snmpwalk_cache_oid($device, 'atPluggableDiagTxPowerEntry', $pre_cache['awplus-sfpddm'], 'AT-PLUGGABLE-DIAGNOSTICS-MIB');
+
+echo 'atPluggableDiagRxPowerEntry ';
+$pre_cache['awplus-sfpddm'] = snmpwalk_cache_oid($device, 'atPluggableDiagRxPowerEntry', $pre_cache['awplus-sfpddm'], 'AT-PLUGGABLE-DIAGNOSTICS-MIB');
+
+echo 'atPluggableDiagRxLosTable ';
+$pre_cache['awplus-sfpddm'] = snmpwalk_cache_oid($device, 'atPluggableDiagRxLosTable', $pre_cache['awplus-sfpddm'], 'AT-PLUGGABLE-DIAGNOSTICS-MIB');
diff --git a/includes/discovery/sensors/temperature/awplus.inc.php b/includes/discovery/sensors/temperature/awplus.inc.php
new file mode 100644
index 0000000000..5aa8490661
--- /dev/null
+++ b/includes/discovery/sensors/temperature/awplus.inc.php
@@ -0,0 +1,40 @@
+<?php
+
+$divisor = 1000;
+
+if ($pre_cache['awplus-sfpddm']) {
+    foreach ($pre_cache['awplus-sfpddm'] as $index => $data) {
+        if (isset($data['atPluggableDiagTempStatusReading'])) {
+            $ifIndex = explode('.', $index, 2)[0];
+            $high_limit = isset($data['atPluggableDiagTempAlarmMax']) ? $data['atPluggableDiagTempAlarmMax'] / $divisor : null;
+            $high_warn_limit = isset($data['atPluggableDiagTempWarningMax']) ? $data['atPluggableDiagTempWarningMax'] / $divisor : null;
+            $low_warn_limit = isset($data['atPluggableDiagTempWarningMin']) ? $data['atPluggableDiagTempWarningMin'] / $divisor : null;
+            $low_limit = isset($data['atPluggableDiagTempAlarmMin']) ? $data['atPluggableDiagTempAlarmMin'] / $divisor : null;
+
+            $tmp = get_port_by_index_cache($device['device_id'], $ifIndex);
+            $descr = $tmp['ifName'];
+            $oid = '.1.3.6.1.4.1.207.8.4.4.3.28.1.1.1.3.' . $index;
+            discover_sensor(
+                $valid['sensor'],
+                'temperature',
+                $device,
+                $oid,
+                'SFP:' . $descr,
+                'atPluggableDiagTempStatusReading',
+                'SFP:' . $descr,
+                $divisor,
+                null, // $multiplier,
+                $low_limit,
+                $low_warn_limit,
+                $high_warn_limit,
+                $high_limit,
+                $value,
+                'snmp',
+                $ifIndex,
+                null,
+                null,
+                'SFP Temperature'
+            );
+        }
+    }
+}
diff --git a/includes/discovery/sensors/voltage/awplus.inc.php b/includes/discovery/sensors/voltage/awplus.inc.php
new file mode 100644
index 0000000000..9c9f3ded33
--- /dev/null
+++ b/includes/discovery/sensors/voltage/awplus.inc.php
@@ -0,0 +1,40 @@
+<?php
+
+$divisor = 10000;
+
+if ($pre_cache['awplus-sfpddm']) {
+    foreach ($pre_cache['awplus-sfpddm'] as $index => $data) {
+        if (isset($data['atPluggableDiagVccStatusReading'])) {
+            $ifIndex = explode('.', $index, 2)[0];
+            $high_limit = isset($data['atPluggableDiagVccAlarmMax']) ? ($data['atPluggableDiagVccAlarmMax'] / $divisor) : null;
+            $high_warn_limit = isset($data['atPluggableDiagVccWarningMax']) ? ($data['atPluggableDiagVccWarningMax'] / $divisor) : null;
+            $low_warn_limit = isset($data['atPluggableDiagVccWarningMin']) ? ($data['atPluggableDiagVccWarningMin'] / $divisor) : null;
+            $low_limit = isset($data['atPluggableDiagVccAlarmMin']) ? ($data['atPluggableDiagVccAlarmMin'] / $divisor) : null;
+
+            $tmp = get_port_by_index_cache($device['device_id'], $ifIndex);
+            $descr = $tmp['ifName'];
+            $oid = '.1.3.6.1.4.1.207.8.4.4.3.28.1.2.1.3.' . $index;
+            discover_sensor(
+                $valid['sensor'],
+                'voltage',
+                $device,
+                $oid,
+                'SFP:' . $descr,
+                'atPluggableDiagVccStatusReading',
+                'SFP:' . $descr,
+                $divisor,
+                null, // $multiplier,
+                $low_limit,
+                $low_warn_limit,
+                $high_warn_limit,
+                $high_limit,
+                $value,
+                'snmp',
+                $ifIndex,
+                null,
+                null,
+                'SFP'
+            );
+        }
+    }
+}
diff --git a/tests/data/awplus_sfp.json b/tests/data/awplus_sfp.json
new file mode 100644
index 0000000000..e33fe40ffe
--- /dev/null
+++ b/tests/data/awplus_sfp.json
@@ -0,0 +1,1192 @@
+{
+    "sensors": {
+        "discovery": {
+            "sensors": [
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.28.1.3.1.3.5028.1",
+                    "sensor_index": "SFP:",
+                    "sensor_type": "atPluggableDiagTxBiasStatusReading",
+                    "sensor_descr": "SFP:",
+                    "group": "SFP",
+                    "sensor_divisor": 1000000,
+                    "sensor_multiplier": 0,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5028",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.28.1.5.1.3.5028.1",
+                    "sensor_index": "SFP:",
+                    "sensor_type": "atPluggableDiagRxPowerStatusReading",
+                    "sensor_descr": "SFP:",
+                    "group": "RX Power",
+                    "sensor_divisor": 10000,
+                    "sensor_multiplier": 0,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5028",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": "mw_to_dbm",
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.28.1.4.1.3.5028.1",
+                    "sensor_index": "SFP:",
+                    "sensor_type": "atPluggableDiagTxPowerStatusReading",
+                    "sensor_descr": "SFP:",
+                    "group": "TX Power",
+                    "sensor_divisor": 10000,
+                    "sensor_multiplier": 0,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5028",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": "mw_to_dbm",
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "fanspeed",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.1.1.1",
+                    "sensor_index": "atEnvMonv2FanIndex.1.1.1",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "atEnvMonv2FanDescription",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2129,
+                    "sensor_limit": 3832.2,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 1703.2,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.1.1.1",
+                    "sensor_index": "atEnvMonv2FanIndex.1.1.1",
+                    "sensor_type": "AtFanState",
+                    "sensor_descr": "atEnvMonv2FanDescription",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtFanState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.1.7",
+                    "sensor_index": "atEnvMonv2TemperatureIndex.1.1.7",
+                    "sensor_type": "AtTemperatureState",
+                    "sensor_descr": "Temp: CPU",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtTemperatureState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.1.8",
+                    "sensor_index": "atEnvMonv2TemperatureIndex.1.1.8",
+                    "sensor_type": "AtTemperatureState",
+                    "sensor_descr": "Temp: System",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtTemperatureState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.2",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.2",
+                    "sensor_type": "AtVoltageState",
+                    "sensor_descr": "Voltage: 1.8V",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtVoltageState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.3",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.3",
+                    "sensor_type": "AtVoltageState",
+                    "sensor_descr": "Voltage: 1.0V",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtVoltageState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.4",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.4",
+                    "sensor_type": "AtVoltageState",
+                    "sensor_descr": "Voltage: 3.3V",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtVoltageState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.5",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.5",
+                    "sensor_type": "AtVoltageState",
+                    "sensor_descr": "Voltage: 5.0V",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtVoltageState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.6",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.6",
+                    "sensor_type": "AtVoltageState",
+                    "sensor_descr": "Voltage: 1.2V",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtVoltageState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.28.1.1.1.3.5028.1",
+                    "sensor_index": "SFP:",
+                    "sensor_type": "atPluggableDiagTempStatusReading",
+                    "sensor_descr": "SFP:",
+                    "group": "SFP Temperature",
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 0,
+                    "sensor_current": 0,
+                    "sensor_limit": 20,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": -10,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5028",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.1.7",
+                    "sensor_index": "atEnvMonv2TemperatureIndex.1.1.7",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Temp: CPU",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 49,
+                    "sensor_limit": 65,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 39,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.1.8",
+                    "sensor_index": "atEnvMonv2TemperatureIndex.1.1.8",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Temp: System",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 52,
+                    "sensor_limit": 65,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 42,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.28.1.2.1.3.5028.1",
+                    "sensor_index": "SFP:",
+                    "sensor_type": "atPluggableDiagVccStatusReading",
+                    "sensor_descr": "SFP:",
+                    "group": "SFP",
+                    "sensor_divisor": 10000,
+                    "sensor_multiplier": 0,
+                    "sensor_current": 0,
+                    "sensor_limit": 0,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5028",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.2",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.2",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Voltage: 1.8V",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1.803,
+                    "sensor_limit": 1.975,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 1.612,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.3",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.3",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Voltage: 1.0V",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0.999,
+                    "sensor_limit": 1.09,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 0.891,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.4",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.4",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Voltage: 3.3V",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 3.351,
+                    "sensor_limit": 3.562,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 3.028,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.5",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.5",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Voltage: 5.0V",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 5,
+                    "sensor_limit": 5.498,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 4.503,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.6",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.6",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Voltage: 1.2V",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1.215,
+                    "sensor_limit": 1.292,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 1.046,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                }
+            ],
+            "state_indexes": [
+                {
+                    "state_name": "AtFanState",
+                    "state_descr": "null",
+                    "state_draw_graph": 0,
+                    "state_value": -1,
+                    "state_generic_value": 3
+                },
+                {
+                    "state_name": "AtFanState",
+                    "state_descr": "failed",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "AtFanState",
+                    "state_descr": "good",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "AtTemperatureState",
+                    "state_descr": "null",
+                    "state_draw_graph": 0,
+                    "state_value": -1,
+                    "state_generic_value": 3
+                },
+                {
+                    "state_name": "AtTemperatureState",
+                    "state_descr": "outOfRange",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "AtTemperatureState",
+                    "state_descr": "inRange",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "AtVoltageState",
+                    "state_descr": "null",
+                    "state_draw_graph": 0,
+                    "state_value": -1,
+                    "state_generic_value": 3
+                },
+                {
+                    "state_name": "AtVoltageState",
+                    "state_descr": "outOfRange",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "AtVoltageState",
+                    "state_descr": "inRange",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                }
+            ]
+        },
+        "poller": {
+            "sensors": [
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.28.1.3.1.3.5028.1",
+                    "sensor_index": "SFP:",
+                    "sensor_type": "atPluggableDiagTxBiasStatusReading",
+                    "sensor_descr": "SFP:",
+                    "group": "SFP",
+                    "sensor_divisor": 1000000,
+                    "sensor_multiplier": 0,
+                    "sensor_current": 0.041124,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5028",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 0,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.28.1.5.1.3.5028.1",
+                    "sensor_index": "SFP:",
+                    "sensor_type": "atPluggableDiagRxPowerStatusReading",
+                    "sensor_descr": "SFP:",
+                    "group": "RX Power",
+                    "sensor_divisor": 10000,
+                    "sensor_multiplier": 0,
+                    "sensor_current": -20.362121726544,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5028",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 0,
+                    "user_func": "mw_to_dbm",
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.28.1.4.1.3.5028.1",
+                    "sensor_index": "SFP:",
+                    "sensor_type": "atPluggableDiagTxPowerStatusReading",
+                    "sensor_descr": "SFP:",
+                    "group": "TX Power",
+                    "sensor_divisor": 10000,
+                    "sensor_multiplier": 0,
+                    "sensor_current": -2.4123945609002,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5028",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 0,
+                    "user_func": "mw_to_dbm",
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "fanspeed",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.1.1.1",
+                    "sensor_index": "atEnvMonv2FanIndex.1.1.1",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "atEnvMonv2FanDescription",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2129,
+                    "sensor_limit": 3832.2,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 1703.2,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.1.1.1",
+                    "sensor_index": "atEnvMonv2FanIndex.1.1.1",
+                    "sensor_type": "AtFanState",
+                    "sensor_descr": "atEnvMonv2FanDescription",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtFanState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.1.7",
+                    "sensor_index": "atEnvMonv2TemperatureIndex.1.1.7",
+                    "sensor_type": "AtTemperatureState",
+                    "sensor_descr": "Temp: CPU",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtTemperatureState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.1.8",
+                    "sensor_index": "atEnvMonv2TemperatureIndex.1.1.8",
+                    "sensor_type": "AtTemperatureState",
+                    "sensor_descr": "Temp: System",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtTemperatureState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.2",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.2",
+                    "sensor_type": "AtVoltageState",
+                    "sensor_descr": "Voltage: 1.8V",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtVoltageState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.3",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.3",
+                    "sensor_type": "AtVoltageState",
+                    "sensor_descr": "Voltage: 1.0V",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtVoltageState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.4",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.4",
+                    "sensor_type": "AtVoltageState",
+                    "sensor_descr": "Voltage: 3.3V",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtVoltageState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.5",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.5",
+                    "sensor_type": "AtVoltageState",
+                    "sensor_descr": "Voltage: 5.0V",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtVoltageState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.6",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.6",
+                    "sensor_type": "AtVoltageState",
+                    "sensor_descr": "Voltage: 1.2V",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "AtVoltageState"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.28.1.1.1.3.5028.1",
+                    "sensor_index": "SFP:",
+                    "sensor_type": "atPluggableDiagTempStatusReading",
+                    "sensor_descr": "SFP:",
+                    "group": "SFP Temperature",
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 0,
+                    "sensor_current": 57.984,
+                    "sensor_limit": 20,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": -10,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5028",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 0,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.1.7",
+                    "sensor_index": "atEnvMonv2TemperatureIndex.1.1.7",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Temp: CPU",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 49,
+                    "sensor_limit": 65,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 39,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.1.8",
+                    "sensor_index": "atEnvMonv2TemperatureIndex.1.1.8",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Temp: System",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 52,
+                    "sensor_limit": 65,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 42,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.28.1.2.1.3.5028.1",
+                    "sensor_index": "SFP:",
+                    "sensor_type": "atPluggableDiagVccStatusReading",
+                    "sensor_descr": "SFP:",
+                    "group": "SFP",
+                    "sensor_divisor": 10000,
+                    "sensor_multiplier": 0,
+                    "sensor_current": 3.3065,
+                    "sensor_limit": 0,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "5028",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 0,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.2",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.2",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Voltage: 1.8V",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1.803,
+                    "sensor_limit": 1.975,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 1.612,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.3",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.3",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Voltage: 1.0V",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0.999,
+                    "sensor_limit": 1.09,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 0.891,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.4",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.4",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Voltage: 3.3V",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 3.351,
+                    "sensor_limit": 3.562,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 3.028,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.5",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.5",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Voltage: 5.0V",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 5,
+                    "sensor_limit": 5.498,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 4.503,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.6",
+                    "sensor_index": "atEnvMonv2VoltageIndex.1.1.6",
+                    "sensor_type": "awplus",
+                    "sensor_descr": "Voltage: 1.2V",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1.215,
+                    "sensor_limit": 1.292,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 1.046,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                }
+            ],
+            "state_indexes": [
+                {
+                    "state_name": "AtFanState",
+                    "state_descr": "null",
+                    "state_draw_graph": 0,
+                    "state_value": -1,
+                    "state_generic_value": 3
+                },
+                {
+                    "state_name": "AtFanState",
+                    "state_descr": "failed",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "AtFanState",
+                    "state_descr": "good",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "AtTemperatureState",
+                    "state_descr": "null",
+                    "state_draw_graph": 0,
+                    "state_value": -1,
+                    "state_generic_value": 3
+                },
+                {
+                    "state_name": "AtTemperatureState",
+                    "state_descr": "outOfRange",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "AtTemperatureState",
+                    "state_descr": "inRange",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "AtVoltageState",
+                    "state_descr": "null",
+                    "state_draw_graph": 0,
+                    "state_value": -1,
+                    "state_generic_value": 3
+                },
+                {
+                    "state_name": "AtVoltageState",
+                    "state_descr": "outOfRange",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "AtVoltageState",
+                    "state_descr": "inRange",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/snmpsim/awplus_sfp.snmprec b/tests/snmpsim/awplus_sfp.snmprec
new file mode 100644
index 0000000000..913e6307f5
--- /dev/null
+++ b/tests/snmpsim/awplus_sfp.snmprec
@@ -0,0 +1,71 @@
+1.3.6.1.2.1.1.1.0|4|Allied Telesis router/switch, Software (AlliedWare Plus) Version 5.5.0-2.3
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.207.1.4.253
+1.3.6.1.2.1.99.1.1.1.4.35|2|2194
+1.3.6.1.2.1.99.1.1.1.4.36|2|1803
+1.3.6.1.2.1.99.1.1.1.4.37|2|999
+1.3.6.1.2.1.99.1.1.1.4.38|2|3351
+1.3.6.1.2.1.99.1.1.1.4.39|2|5000
+1.3.6.1.2.1.99.1.1.1.4.40|2|1215
+1.3.6.1.2.1.99.1.1.1.4.41|2|49
+1.3.6.1.2.1.99.1.1.1.4.42|2|52
+1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.1.1.1|66|2129
+1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.1.1.1|2|2
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.1.1.1.2|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.1.1.1.3|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.1.1.1.4|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.1.1.1.5|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.1.1.1.6|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.2.1.1.2|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.2.1.1.3|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.2.1.1.4|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.2.1.1.5|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.2.1.1.6|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.3.1.1.2|66|2
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.3.1.1.3|66|3
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.3.1.1.4|66|4
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.3.1.1.5|66|5
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.3.1.1.6|66|6
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.4.1.1.2|4|Voltage: 1.8V
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.4.1.1.3|4|Voltage: 1.0V
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.4.1.1.4|4|Voltage: 3.3V
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.4.1.1.5|4|Voltage: 5.0V
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.4.1.1.6|4|Voltage: 1.2V
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.2|2|1803
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.3|2|999
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.4|2|3351
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.5|2|5000
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.5.1.1.6|2|1215
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.6.1.1.2|2|1975
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.6.1.1.3|2|1090
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.6.1.1.4|2|3562
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.6.1.1.5|2|5498
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.6.1.1.6|2|1292
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.7.1.1.2|2|1612
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.7.1.1.3|2|891
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.7.1.1.4|2|3028
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.7.1.1.5|2|4503
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.7.1.1.6|2|1046
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.2|2|2
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.3|2|2
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.4|2|2
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.5|2|2
+1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.1.6|2|2
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.1.1.1.7|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.1.1.1.8|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.2.1.1.7|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.2.1.1.8|66|1
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.3.1.1.7|66|7
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.3.1.1.8|66|8
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.4.1.1.7|4|Temp: CPU
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.4.1.1.8|4|Temp: System
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.1.7|2|49
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.1.8|2|52
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.6.1.1.7|2|65
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.6.1.1.8|2|65
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.1.7|2|2
+1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.1.8|2|2
+1.3.6.1.4.1.207.8.4.4.3.28.1.1.1.3.5028.1|2|57984
+1.3.6.1.4.1.207.8.4.4.3.28.1.2.1.3.5028.1|2|33065
+1.3.6.1.4.1.207.8.4.4.3.28.1.3.1.3.5028.1|2|41124
+1.3.6.1.4.1.207.8.4.4.3.28.1.4.1.3.5028.1|2|5738
+1.3.6.1.4.1.207.8.4.4.3.28.1.5.1.3.5028.1|2|92