diff --git a/includes/definitions/discovery/routeros.yaml b/includes/definitions/discovery/routeros.yaml
index db4d39d3e0..6d805b887f 100644
--- a/includes/definitions/discovery/routeros.yaml
+++ b/includes/definitions/discovery/routeros.yaml
@@ -1,6 +1,10 @@
 mib: MIKROTIK-MIB
 modules:
     sensors:
+        pre-cache:
+            data:
+                - oid:
+                    - mtxrInterfaceStatsName
         temperature:
             data:
                 -
@@ -12,18 +16,35 @@ modules:
                 -
                     oid: mtxrHlSensorTemperature
                     num_oid: .1.3.6.1.4.1.14988.1.1.3.5.
+                    divisor: 10
                     descr: 'Sensor chip'
                     index: 'mtxrHlSensorTemperature.{{ $index }}'
                 -
                     oid: mtxrHlCpuTemperature
                     num_oid: .1.3.6.1.4.1.14988.1.1.3.6.
+                    divisor: 10
                     descr: 'Processor'
                     index: 'mtxrHlCpuTemperature.{{ $index }}'
                 -
                     oid: mtxrHlBoardTemperature
                     num_oid: .1.3.6.1.4.1.14988.1.1.3.7.
+                    divisor: 10
                     descr: 'System board'
                     index: 'mtxrHlBoardTemperature.{{ $index }}'
+                -
+                    oid: mtxrHlTemperature
+                    num_oid: .1.3.6.1.4.1.14988.1.1.3.10.
+                    divisor: 10
+                    descr: 'Temperature {{ $index }}'
+                    low_limit: -40
+                    low_warn_limit: -35
+                    warn_limit: 65
+                    high_limit: 70
+                -
+                    oid: mtxrHlProcessorTemperature
+                    num_oid: .1.3.6.1.4.1.14988.1.1.3.11.
+                    divisor: 10
+                    descr: 'Processor Temperature {{ $index }}'
         voltage:
             data:
                 -
@@ -60,6 +81,11 @@ modules:
                     num_oid: .1.3.6.1.4.1.14988.1.1.3.4.
                     descr: '12V'
                     index: 'mtxrHlTwelveVoltage.{{ $index }}'
+                -
+                    oid: mtxrHlVoltage
+                    num_oid: .1.3.6.1.4.1.14988.1.1.3.8.
+                    divisor: 10
+                    descr: 'Voltage {{ $index }}'
         current:
             data:
                 -
@@ -79,8 +105,9 @@ modules:
                 -
                     oid: mtxrHlCurrent
                     num_oid: .1.3.6.1.4.1.14988.1.1.3.13.
-                    descr: 'System'
-                    index: 'mtxrHlCurrent.{{ $index }}'
+                    divisor: 1000
+                    descr: 'Current'
+                    index: '0'
         dbm:
             data:
                 -
@@ -151,17 +178,18 @@ modules:
                 -
                     oid: mtxrHlPower
                     num_oid: .1.3.6.1.4.1.14988.1.1.3.12.
-                    descr: 'System'
-                    index: 'mtxrHlPower.{{ $index }}'
+                    divisor: 10
+                    descr: 'Power Usage'
+                    index: '1'
         fanspeed:
             data:
                 -
                     oid: mtxrHlFanSpeed1
                     num_oid: .1.3.6.1.4.1.14988.1.1.3.17.
                     descr: 'Fan #1'
-                    index: 'mtxrHlFanSpeed1.{{ $index }}'
+                    index: '0'
                 -
                     oid: mtxrHlFanSpeed2
                     num_oid: .1.3.6.1.4.1.14988.1.1.3.18.
                     descr: 'Fan #2'
-                    index: 'mtxrHlFanSpeed2.{{ $index }}'
+                    index: '1'
diff --git a/includes/discovery/sensors/current/routeros.inc.php b/includes/discovery/sensors/current/routeros.inc.php
deleted file mode 100644
index c0424169ef..0000000000
--- a/includes/discovery/sensors/current/routeros.inc.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-echo 'MIKROTIK-MIB ';
-  
-$input_oid = '.1.3.6.1.4.1.14988.1.1.3.13.0'; // MIKROTIK-MIB::mtxrHlCurrent
-$input_value = snmp_get($device, $input_oid, '-Oqv');
-$descr = 'Current';
-$divisor = 1000;
-    
-if (is_numeric($input_value) && $input_value > 0) {
-    discover_sensor($valid['sensor'], 'current', $device, $input_oid, 0, $device['os'], $descr, $divisor, 1, null, null, null, null, $input_value / $divisor);
-}
diff --git a/includes/discovery/sensors/fanspeed/routeros.inc.php b/includes/discovery/sensors/fanspeed/routeros.inc.php
deleted file mode 100644
index 07f4775f95..0000000000
--- a/includes/discovery/sensors/fanspeed/routeros.inc.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-echo 'MIKROTIK-MIB ';
-$descr_prefix = 'fan ';
-$oids = array(
-    '.1.3.6.1.4.1.14988.1.1.3.17.0', // MIKROTIK-MIB::mtxrHlFanSpeed1.0
-    '.1.3.6.1.4.1.14988.1.1.3.18.0', // MIKROTIK-MIB::mtxrHlFanSpeed2.0
-);
-
-foreach ($oids as $index => $oid) {
-    $value = trim(snmp_get($device, $oid, '-Oqv'), '"');
-
-    if (is_numeric($value)) {
-        $descr = $descr_prefix . ($index + 1);
-        discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'snmp', $descr, 1, 1, null, null, null, null, $value);
-    }
-}
diff --git a/includes/discovery/sensors/power/routeros.inc.php b/includes/discovery/sensors/power/routeros.inc.php
deleted file mode 100644
index b9bba8ac3c..0000000000
--- a/includes/discovery/sensors/power/routeros.inc.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-echo 'MIKROTIK-MIB  ';
-// Power Usage
-$descr   = "Power Usage";
-$oid     = ".1.3.6.1.4.1.14988.1.1.3.12.0"; // MIKROTIK-MIB::mtxrHlPower
-$value   = snmp_get($device, $oid, '-Oqv');
-$divisor = "10";
-
-if (is_numeric($value)) {
-    discover_sensor($valid['sensor'], 'power', $device, $oid, '1', 'power', $descr, $divisor, 1, null, null, null, null, $value / $divisor);
-}
diff --git a/includes/discovery/sensors/temperature/routeros.inc.php b/includes/discovery/sensors/temperature/routeros.inc.php
deleted file mode 100644
index 1cb715f5c6..0000000000
--- a/includes/discovery/sensors/temperature/routeros.inc.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-echo 'MIKROTIK-MIB ';
-
-$divisor = 10.0;
-$type    = 'mikrotik';
-$insert_index = 0;
-
-$oids = snmp_walk($device, 'mtxrHlTemperature', '-OsqnU', 'MIKROTIK-MIB');
-
-foreach (explode("\n", $oids) as $data) {
-    $data = trim($data);
-    if ($data) {
-        list($oid,$descr) = explode(' ', $data, 2);
-        $split_oid        = explode('.', $oid);
-        $index            = $split_oid[(count($split_oid) - 1)];
-        $descr            = 'Temperature '.$index;
-        $oid              = '.1.3.6.1.4.1.14988.1.1.3.10.'.$index;
-        $temperature      = (snmp_get($device, $oid, '-Oqv') / $divisor);
-
-        discover_sensor($valid['sensor'], 'temperature', $device, $oid, $insert_index, $type, $descr, $divisor, '1', -40, -35, 65, 70, $temperature);
-        $insert_index++;
-    }
-}
-
-$oids = snmp_walk($device, 'mtxrHlProcessorTemperature', '-OsqnU', 'MIKROTIK-MIB');
-
-foreach (explode("\n", $oids) as $data) {
-    $data = trim($data);
-    if ($data) {
-        list($oid,$descr) = explode(' ', $data, 2);
-        $split_oid        = explode('.', $oid);
-        $index            = $split_oid[(count($split_oid) - 1)];
-        $descr            = 'Processor Temperature '.$index;
-        $oid              = '.1.3.6.1.4.1.14988.1.1.3.11.'.$index;
-        $temperature      = (snmp_get($device, $oid, '-Oqv') / $divisor);
-
-        discover_sensor($valid['sensor'], 'temperature', $device, $oid, $insert_index, $type, $descr, $divisor, '1', null, null, null, null, $temperature);
-        $insert_index++;
-    }
-}
diff --git a/includes/discovery/sensors/voltage/routeros.inc.php b/includes/discovery/sensors/voltage/routeros.inc.php
deleted file mode 100644
index 32e9517a16..0000000000
--- a/includes/discovery/sensors/voltage/routeros.inc.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$oids = snmp_walk($device, "mtxrHlVoltage", "-OsqnU", "MIKROTIK-MIB");
-d_echo($oids."\n");
-if ($oids !== false) {
-    echo("MIKROTIK-MIB ");
-
-    $divisor = 10.0;
-    $type = "mikrotik";
-
-    foreach (explode("\n", $oids) as $data) {
-        $data = trim($data);
-        if ($data) {
-            list($oid,$descr) = explode(" ", $data, 2);
-            $split_oid = explode('.', $oid);
-            $index = $split_oid[count($split_oid)-1];
-            $descr = "Voltage " . $index;
-            $oid  = ".1.3.6.1.4.1.14988.1.1.3.8." . $index;
-            $voltage = snmp_get($device, $oid, "-Oqv") / $divisor;
-
-            discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, '1', null, null, null, null, $voltage);
-        }
-    }
-}
diff --git a/tests/data/routeros.json b/tests/data/routeros.json
index 019766b42e..51b069a862 100644
--- a/tests/data/routeros.json
+++ b/tests/data/routeros.json
@@ -2505,6 +2505,29 @@
     "sensors": {
         "discovery": {
             "sensors": [
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.8.25",
+                    "sensor_index": "mtxrOpticalTxBiasCurrent.25",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "sfp1 Tx",
+                    "sensor_divisor": "1000",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0.007",
+                    "sensor_limit": "0.0105",
+                    "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,
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": "0",
                     "sensor_class": "current",
@@ -2528,6 +2551,52 @@
                     "user_func": null,
                     "state_name": null
                 },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.9.25",
+                    "sensor_index": "mtxrOpticalTxPower.25",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "sfp1 Tx",
+                    "sensor_divisor": "1000",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-4.879",
+                    "sensor_limit": "-4.63505",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-5.12295",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.10.25",
+                    "sensor_index": "mtxrOpticalRxPower.25",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "sfp1 Rx",
+                    "sensor_divisor": "1000",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-5.673",
+                    "sensor_limit": "-5.38935",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-5.95665",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": "0",
                     "sensor_class": "power",
@@ -2597,6 +2666,121 @@
                     "user_func": "",
                     "state_name": null
                 },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.3.25",
+                    "sensor_index": "mtxrOpticalRxLoss.25",
+                    "sensor_type": "mtxrOpticalRxLoss",
+                    "sensor_descr": "sfp1 Rx",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "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": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": "mtxrOpticalRxLoss"
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.4.25",
+                    "sensor_index": "mtxrOpticalTxFault.25",
+                    "sensor_type": "mtxrOpticalTxFault",
+                    "sensor_descr": "sfp1 Tx",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "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": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": "mtxrOpticalTxFault"
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.6.25",
+                    "sensor_index": "mtxrOpticalTemperature.25",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "sfp1",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "40",
+                    "sensor_limit": "60",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "30",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.3.10.0",
+                    "sensor_index": "0",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "Temperature 0",
+                    "sensor_divisor": "10",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "33",
+                    "sensor_limit": "70",
+                    "sensor_limit_warn": "65",
+                    "sensor_limit_low": "-40",
+                    "sensor_limit_low_warn": "-35",
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.7.25",
+                    "sensor_index": "mtxrOpticalSupplyVoltage.25",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "sfp1",
+                    "sensor_divisor": "1000",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "3.302",
+                    "sensor_limit": "3.7973",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "2.8067",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": "0",
                     "sensor_class": "voltage",
@@ -2619,12 +2803,101 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.3.8.0",
+                    "sensor_index": "0",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "Voltage 0",
+                    "sensor_divisor": "10",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "15.4",
+                    "sensor_limit": "17.71",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "13.09",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
                 }
             ],
-            "state_indexes": []
+            "state_indexes": [
+                {
+                    "state_name": "mtxrOpticalRxLoss",
+                    "state_descr": "no",
+                    "state_draw_graph": "1",
+                    "state_value": "0",
+                    "state_generic_value": "0"
+                },
+                {
+                    "state_name": "mtxrOpticalRxLoss",
+                    "state_descr": "yes",
+                    "state_draw_graph": "1",
+                    "state_value": "1",
+                    "state_generic_value": "2"
+                },
+                {
+                    "state_name": "mtxrOpticalRxLoss",
+                    "state_descr": "null",
+                    "state_draw_graph": "1",
+                    "state_value": "2",
+                    "state_generic_value": "3"
+                },
+                {
+                    "state_name": "mtxrOpticalTxFault",
+                    "state_descr": "no",
+                    "state_draw_graph": "1",
+                    "state_value": "0",
+                    "state_generic_value": "0"
+                },
+                {
+                    "state_name": "mtxrOpticalTxFault",
+                    "state_descr": "yes",
+                    "state_draw_graph": "1",
+                    "state_value": "1",
+                    "state_generic_value": "2"
+                },
+                {
+                    "state_name": "mtxrOpticalTxFault",
+                    "state_descr": "null",
+                    "state_draw_graph": "1",
+                    "state_value": "2",
+                    "state_generic_value": "3"
+                }
+            ]
         },
         "poller": {
             "sensors": [
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.8.25",
+                    "sensor_index": "mtxrOpticalTxBiasCurrent.25",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "sfp1 Tx",
+                    "sensor_divisor": "1000",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "0.007",
+                    "sensor_limit": "0.0105",
+                    "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,
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": "0",
                     "sensor_class": "current",
@@ -2648,6 +2921,52 @@
                     "user_func": null,
                     "state_name": null
                 },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.9.25",
+                    "sensor_index": "mtxrOpticalTxPower.25",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "sfp1 Tx",
+                    "sensor_divisor": "1000",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-4.879",
+                    "sensor_limit": "-4.63505",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-5.12295",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.10.25",
+                    "sensor_index": "mtxrOpticalRxPower.25",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "sfp1 Rx",
+                    "sensor_divisor": "1000",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "-5.673",
+                    "sensor_limit": "-5.38935",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "-5.95665",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": "0",
                     "sensor_class": "power",
@@ -2717,6 +3036,121 @@
                     "user_func": "",
                     "state_name": null
                 },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.3.25",
+                    "sensor_index": "mtxrOpticalRxLoss.25",
+                    "sensor_type": "mtxrOpticalRxLoss",
+                    "sensor_descr": "sfp1 Rx",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "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": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": "mtxrOpticalRxLoss"
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.4.25",
+                    "sensor_index": "mtxrOpticalTxFault.25",
+                    "sensor_type": "mtxrOpticalTxFault",
+                    "sensor_descr": "sfp1 Tx",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "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": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": "mtxrOpticalTxFault"
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.6.25",
+                    "sensor_index": "mtxrOpticalTemperature.25",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "sfp1",
+                    "sensor_divisor": "1",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "40",
+                    "sensor_limit": "60",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "30",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.3.10.0",
+                    "sensor_index": "0",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "Temperature 0",
+                    "sensor_divisor": "10",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "33",
+                    "sensor_limit": "70",
+                    "sensor_limit_warn": "65",
+                    "sensor_limit_low": "-40",
+                    "sensor_limit_low_warn": "-35",
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.19.1.1.7.25",
+                    "sensor_index": "mtxrOpticalSupplyVoltage.25",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "sfp1",
+                    "sensor_divisor": "1000",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "3.302",
+                    "sensor_limit": "3.7973",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "2.8067",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": "0",
                     "sensor_class": "voltage",
@@ -2739,9 +3173,75 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "state_name": null
+                },
+                {
+                    "sensor_deleted": "0",
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.14988.1.1.3.8.0",
+                    "sensor_index": "0",
+                    "sensor_type": "routeros",
+                    "sensor_descr": "Voltage 0",
+                    "sensor_divisor": "10",
+                    "sensor_multiplier": "1",
+                    "sensor_current": "15.4",
+                    "sensor_limit": "17.71",
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": "13.09",
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": "1",
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "state_name": null
                 }
             ],
-            "state_indexes": []
+            "state_indexes": [
+                {
+                    "state_name": "mtxrOpticalRxLoss",
+                    "state_descr": "no",
+                    "state_draw_graph": "1",
+                    "state_value": "0",
+                    "state_generic_value": "0"
+                },
+                {
+                    "state_name": "mtxrOpticalRxLoss",
+                    "state_descr": "yes",
+                    "state_draw_graph": "1",
+                    "state_value": "1",
+                    "state_generic_value": "2"
+                },
+                {
+                    "state_name": "mtxrOpticalRxLoss",
+                    "state_descr": "null",
+                    "state_draw_graph": "1",
+                    "state_value": "2",
+                    "state_generic_value": "3"
+                },
+                {
+                    "state_name": "mtxrOpticalTxFault",
+                    "state_descr": "no",
+                    "state_draw_graph": "1",
+                    "state_value": "0",
+                    "state_generic_value": "0"
+                },
+                {
+                    "state_name": "mtxrOpticalTxFault",
+                    "state_descr": "yes",
+                    "state_draw_graph": "1",
+                    "state_value": "1",
+                    "state_generic_value": "2"
+                },
+                {
+                    "state_name": "mtxrOpticalTxFault",
+                    "state_descr": "null",
+                    "state_draw_graph": "1",
+                    "state_value": "2",
+                    "state_generic_value": "3"
+                }
+            ]
         }
     },
     "storage": {
@@ -3755,5 +4255,43 @@
                 }
             ]
         }
+    },
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.14988.1",
+                    "sysDescr": "router",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "",
+                    "features": null,
+                    "location": null,
+                    "os": "routeros",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "routeros.svg"
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.14988.1",
+                    "sysDescr": "router",
+                    "sysContact": "<private>",
+                    "version": "6.40.5",
+                    "hardware": "",
+                    "features": "Level 1",
+                    "location": "<private>",
+                    "os": "routeros",
+                    "type": "network",
+                    "serial": "71B1060EE89D",
+                    "icon": "routeros.svg"
+                }
+            ]
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/snmpsim/routeros.snmprec b/tests/snmpsim/routeros.snmprec
index aa6df16b75..cde572ecae 100644
--- a/tests/snmpsim/routeros.snmprec
+++ b/tests/snmpsim/routeros.snmprec
@@ -463,15 +463,53 @@
 1.3.6.1.4.1.14988.1.1.1.3.1.11.2|65|0
 1.3.6.1.4.1.14988.1.1.1.3.1.11.8|65|0
 1.3.6.1.4.1.14988.1.1.1.3.1.11.9|65|4
+1.3.6.1.4.1.14988.1.1.3.8.0|2|154
+1.3.6.1.4.1.14988.1.1.3.10.0|2|330
 1.3.6.1.4.1.14988.1.1.4.3.0|2|1
 1.3.6.1.4.1.14988.1.1.4.4.0|4|6.40.5
 1.3.6.1.4.1.14988.1.1.6.1.0|66|33
 1.3.6.1.4.1.14988.1.1.7.3.0|4|71B1060EE89D
 1.3.6.1.4.1.14988.1.1.14.1.1.2.1|4|wlan1
+1.3.6.1.4.1.14988.1.1.14.1.1.2.2|4|ether2
+1.3.6.1.4.1.14988.1.1.14.1.1.2.3|4|ether3
+1.3.6.1.4.1.14988.1.1.14.1.1.2.4|4|ether4
+1.3.6.1.4.1.14988.1.1.14.1.1.2.5|4|ether5
+1.3.6.1.4.1.14988.1.1.14.1.1.2.6|4|ether6
+1.3.6.1.4.1.14988.1.1.14.1.1.2.7|4|ether7
+1.3.6.1.4.1.14988.1.1.14.1.1.2.8|4|ether8
 1.3.6.1.4.1.14988.1.1.14.1.1.2.9|4|wlan4
+1.3.6.1.4.1.14988.1.1.14.1.1.2.10|4|ether10
+1.3.6.1.4.1.14988.1.1.14.1.1.2.11|4|ether11
+1.3.6.1.4.1.14988.1.1.14.1.1.2.12|4|ether12
+1.3.6.1.4.1.14988.1.1.14.1.1.2.13|4|ether13
+1.3.6.1.4.1.14988.1.1.14.1.1.2.14|4|ether14
+1.3.6.1.4.1.14988.1.1.14.1.1.2.15|4|ether15
+1.3.6.1.4.1.14988.1.1.14.1.1.2.16|4|ether16
+1.3.6.1.4.1.14988.1.1.14.1.1.2.17|4|ether17
+1.3.6.1.4.1.14988.1.1.14.1.1.2.18|4|ether18
+1.3.6.1.4.1.14988.1.1.14.1.1.2.19|4|ether19
+1.3.6.1.4.1.14988.1.1.14.1.1.2.20|4|ether20
+1.3.6.1.4.1.14988.1.1.14.1.1.2.21|4|ether21
+1.3.6.1.4.1.14988.1.1.14.1.1.2.22|4|ether22
+1.3.6.1.4.1.14988.1.1.14.1.1.2.23|4|ether23
+1.3.6.1.4.1.14988.1.1.14.1.1.2.24|4|ether24
+1.3.6.1.4.1.14988.1.1.14.1.1.2.25|4|sfp1
+1.3.6.1.4.1.14988.1.1.14.1.1.2.27|4|cap_wap_downstairs
+1.3.6.1.4.1.14988.1.1.14.1.1.2.28|4|cap_wap_garage
+1.3.6.1.4.1.14988.1.1.14.1.1.2.29|4|cap_wap_upstairs
+1.3.6.1.4.1.14988.1.1.14.1.1.2.30|4|bridge2_CAP
 1.3.6.1.4.1.14988.1.1.15.1.1.1.7|2|7
 1.3.6.1.4.1.14988.1.1.15.1.1.2.7|4|ether5
 1.3.6.1.4.1.14988.1.1.15.1.1.3.7|2|2
 1.3.6.1.4.1.14988.1.1.15.1.1.4.7|2|0
 1.3.6.1.4.1.14988.1.1.15.1.1.5.7|2|0
 1.3.6.1.4.1.14988.1.1.15.1.1.6.7|2|0
+1.3.6.1.4.1.14988.1.1.19.1.1.2.25|4|sfp1
+1.3.6.1.4.1.14988.1.1.19.1.1.3.25|2|0
+1.3.6.1.4.1.14988.1.1.19.1.1.4.25|2|0
+1.3.6.1.4.1.14988.1.1.19.1.1.5.25|66|85000
+1.3.6.1.4.1.14988.1.1.19.1.1.6.25|66|40
+1.3.6.1.4.1.14988.1.1.19.1.1.7.25|66|3302
+1.3.6.1.4.1.14988.1.1.19.1.1.8.25|66|7
+1.3.6.1.4.1.14988.1.1.19.1.1.9.25|2|-4879
+1.3.6.1.4.1.14988.1.1.19.1.1.10.25|2|-5673