From 8f2444f7828f911bc3a6063bce410844591bbb18 Mon Sep 17 00:00:00 2001 From: Peca Nesovanovic <59750439+Npeca75@users.noreply.github.com> Date: Wed, 21 Feb 2024 19:15:14 +0100 Subject: [PATCH] Rewrite lmsensors discovery to SnmpQuery:: (#15833) * rewrite lmsensors discovery to SnmpQuery:: * change group name to lowercase (lmsensors) --- .../discovery/sensors/fanspeed/unix.inc.php | 54 +- .../sensors/temperature/unix.inc.php | 56 +- .../discovery/sensors/voltage/unix.inc.php | 54 +- tests/data/aix.json | 82 --- tests/data/arista-mos_metamux48-c-0-16.json | 628 +++++++++--------- tests/data/cumulus_cumulus.json | 30 +- tests/data/cumulus_edgecore-as4610-54p.json | 4 +- tests/data/linux_powermon.json | 14 +- tests/data/linux_raspberrypi-gpiomonitor.json | 6 +- tests/data/recoveryos.json | 14 +- tests/data/recoveryos_8024s.json | 8 +- tests/data/truenas.json | 32 +- .../arista-mos_metamux48-c-0-16.snmprec | 75 +++ tests/snmpsim/cumulus_cumulus.snmprec | 15 + .../cumulus_edgecore-as4610-54p.snmprec | 2 + tests/snmpsim/linux_powermon.snmprec | 1 + .../linux_raspberrypi-gpiomonitor.snmprec | 1 + tests/snmpsim/recoveryos.snmprec | 4 + tests/snmpsim/truenas.snmprec | 6 + 19 files changed, 577 insertions(+), 509 deletions(-) diff --git a/includes/discovery/sensors/fanspeed/unix.inc.php b/includes/discovery/sensors/fanspeed/unix.inc.php index c512ef1340..b5c33c41bf 100644 --- a/includes/discovery/sensors/fanspeed/unix.inc.php +++ b/includes/discovery/sensors/fanspeed/unix.inc.php @@ -1,24 +1,40 @@ . + * + * @link https://www.librenms.org + * + * @author Peca Nesovanovic + */ +use LibreNMS\Util\Oid; -$oids = snmp_walk($device, 'lmFanSensorsDevice', '-OsqnU', 'LM-SENSORS-MIB'); -d_echo($oids . "\n"); - -$oids = trim($oids); -if ($oids) { - echo 'LM-SENSORS '; -} - -foreach (explode("\n", $oids) as $data) { - $data = trim($data); - if ($data) { - [$oid,$descr] = explode(' ', $data, 2); - $split_oid = explode('.', $oid); - $index = $split_oid[count($split_oid) - 1]; - $oid = '.1.3.6.1.4.1.2021.13.16.3.1.3.' . $index; - $current = snmp_get($device, $oid, '-Oqv', 'LM-SENSORS-MIB'); - $descr = trim(str_ireplace('fan-', '', $descr)); - if ($current !== false && $current >= 0) { - discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'lmsensors', $descr, '1', '1', null, null, null, null, $current); +$snmpData = SnmpQuery::cache()->hideMib()->walk('LM-SENSORS-MIB::lmSensors')->table(1); +if (! empty($snmpData)) { + echo 'LM-SENSORS-MIB: ' . PHP_EOL; + foreach ($snmpData as $lmData) { + $type = 'lmFanSensors'; + $divisor = 1; + $index = $lmData[$type . 'Index']; + $descr = $lmData[$type . 'Device']; + $value = intval($lmData[$type . 'Value']) / $divisor; + if (! empty($descr)) { + $oid = Oid::toNumeric('LM-SENSORS-MIB::' . $type . 'Value.' . $index); + discover_sensor($valid['sensor'], 'fanspeed', $device, $oid, $index, 'lmsensors', $descr, $divisor, 1, null, null, null, null, $value, 'snmp', null, null, null, 'lmsensors'); } } } diff --git a/includes/discovery/sensors/temperature/unix.inc.php b/includes/discovery/sensors/temperature/unix.inc.php index 53d6e04ea2..ae5a9fe051 100644 --- a/includes/discovery/sensors/temperature/unix.inc.php +++ b/includes/discovery/sensors/temperature/unix.inc.php @@ -1,26 +1,40 @@ . + * + * @link https://www.librenms.org + * + * @author Peca Nesovanovic + */ +use LibreNMS\Util\Oid; -$oids = snmp_walk($device, 'lmTempSensorsDevice', '-Osqn', 'LM-SENSORS-MIB'); -d_echo($oids . "\n"); - -$oids = trim($oids); -if ($oids) { - echo 'LM-SENSORS-MIB: '; - foreach (explode("\n", $oids) as $data) { - $data = trim($data); - if ($data) { - $divisor = 1000; - [$oid,$descr] = explode(' ', $data, 2); - $split_oid = explode('.', $oid); - $temperature_id = $split_oid[count($split_oid) - 1]; - $temperature_oid = ".1.3.6.1.4.1.2021.13.16.2.1.3.$temperature_id"; - $temperature = floatval(snmp_get($device, $temperature_oid, '-Ovq')) / $divisor; - $descr = str_ireplace('temperature-', '', $descr); - $descr = str_ireplace('temp-', '', $descr); - $descr = trim($descr); - if ($temperature >= 0 && $temperature <= 1000) { - discover_sensor($valid['sensor'], 'temperature', $device, $temperature_oid, $temperature_id, 'lmsensors', $descr, $divisor, 1, null, null, null, null, $temperature); - } +$snmpData = SnmpQuery::cache()->hideMib()->walk('LM-SENSORS-MIB::lmSensors')->table(1); +if (! empty($snmpData)) { + echo 'LM-SENSORS-MIB: ' . PHP_EOL; + foreach ($snmpData as $lmData) { + $type = 'lmTempSensors'; + $divisor = 1000; + $index = $lmData[$type . 'Index']; + $descr = $lmData[$type . 'Device']; + $value = intval($lmData[$type . 'Value']) / $divisor; + if (! empty($descr)) { + $oid = Oid::toNumeric('LM-SENSORS-MIB::' . $type . 'Value.' . $index); + discover_sensor($valid['sensor'], 'temperature', $device, $oid, $index, 'lmsensors', $descr, $divisor, 1, null, null, null, null, $value, 'snmp', null, null, null, 'lmsensors'); } } } diff --git a/includes/discovery/sensors/voltage/unix.inc.php b/includes/discovery/sensors/voltage/unix.inc.php index de20d301f7..5459275e4a 100644 --- a/includes/discovery/sensors/voltage/unix.inc.php +++ b/includes/discovery/sensors/voltage/unix.inc.php @@ -1,24 +1,40 @@ . + * + * @link https://www.librenms.org + * + * @author Peca Nesovanovic + */ +use LibreNMS\Util\Oid; -$oids = snmp_walk($device, 'lmVoltSensorsDevice', '-OsqnU', 'LM-SENSORS-MIB'); -d_echo($oids . "\n"); - -if ($oids) { - echo 'LM-SENSORS '; - - $divisor = 1000; - $type = 'lmsensors'; - - foreach (explode("\n", $oids) as $data) { - $data = trim($data); - if ($data) { - [$oid,$descr] = explode(' ', $data, 2); - $split_oid = explode('.', $oid); - $index = $split_oid[count($split_oid) - 1]; - $oid = '.1.3.6.1.4.1.2021.13.16.4.1.3.' . $index; - $current = floatval(snmp_get($device, $oid, '-Oqv', 'LM-SENSORS-MIB')) / $divisor; - - discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, $type, $descr, $divisor, 1, null, null, null, null, $current); +$snmpData = SnmpQuery::cache()->hideMib()->walk('LM-SENSORS-MIB::lmSensors')->table(1); +if (! empty($snmpData)) { + echo 'LM-SENSORS-MIB: ' . PHP_EOL; + foreach ($snmpData as $lmData) { + $type = 'lmVoltSensors'; + $divisor = 1000; + $index = $lmData[$type . 'Index']; + $descr = $lmData[$type . 'Device']; + $value = intval($lmData[$type . 'Value']) / $divisor; + if (! empty($descr)) { + $oid = Oid::toNumeric('LM-SENSORS-MIB::' . $type . 'Value.' . $index); + discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, 'lmsensors', $descr, $divisor, 1, null, null, null, null, $value, 'snmp', null, null, null, 'lmsensors'); } } } diff --git a/tests/data/aix.json b/tests/data/aix.json index 72e452591e..77472839b9 100644 --- a/tests/data/aix.json +++ b/tests/data/aix.json @@ -1809,87 +1809,5 @@ } ] } - }, - "sensors": { - "discovery": { - "sensors": [ - { - "sensor_deleted": 0, - "sensor_class": "fanspeed", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.2021.13.16.3.1.3.2", - "sensor_index": "2", - "sensor_type": "lmsensors", - "sensor_descr": "NULL", - "group": null, - "sensor_divisor": 1, - "sensor_multiplier": 1, - "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": 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.2021.13.16.2.1.3.2", - "sensor_index": "2", - "sensor_type": "lmsensors", - "sensor_descr": "NULL", - "group": null, - "sensor_divisor": 1000, - "sensor_multiplier": 1, - "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": 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.2021.13.16.4.1.3.2", - "sensor_index": "2", - "sensor_type": "lmsensors", - "sensor_descr": "NULL", - "group": null, - "sensor_divisor": 1000, - "sensor_multiplier": 1, - "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": null, - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "rrd_type": "GAUGE", - "state_name": null - } - ] - }, - "poller": "matches discovery" } } diff --git a/tests/data/arista-mos_metamux48-c-0-16.json b/tests/data/arista-mos_metamux48-c-0-16.json index d2244ba5b8..4fe5acb80f 100644 --- a/tests/data/arista-mos_metamux48-c-0-16.json +++ b/tests/data/arista-mos_metamux48-c-0-16.json @@ -13437,8 +13437,8 @@ "ifName": "sit0", "portName": null, "ifIndex": 2, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -13637,8 +13637,8 @@ "ifName": "ma2", "portName": null, "ifIndex": 4, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -13737,8 +13737,8 @@ "ifName": "ma3", "portName": null, "ifIndex": 5, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -13837,8 +13837,8 @@ "ifName": "ma4", "portName": null, "ifIndex": 6, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -13937,8 +13937,8 @@ "ifName": "ma5", "portName": null, "ifIndex": 7, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -14037,8 +14037,8 @@ "ifName": "ma6", "portName": null, "ifIndex": 8, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -14137,8 +14137,8 @@ "ifName": "docker0", "portName": null, "ifIndex": 9, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -19037,8 +19037,8 @@ "ifName": "ap1", "portName": null, "ifIndex": 10001, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -19137,8 +19137,8 @@ "ifName": "ap2", "portName": null, "ifIndex": 10002, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -19237,8 +19237,8 @@ "ifName": "ap3", "portName": null, "ifIndex": 10003, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -19337,8 +19337,8 @@ "ifName": "ap4", "portName": null, "ifIndex": 10004, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -19437,8 +19437,8 @@ "ifName": "ap5", "portName": null, "ifIndex": 10005, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -19537,8 +19537,8 @@ "ifName": "ap6", "portName": null, "ifIndex": 10006, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -19637,8 +19637,8 @@ "ifName": "ap7", "portName": null, "ifIndex": 10007, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -19737,8 +19737,8 @@ "ifName": "ap8", "portName": null, "ifIndex": 10008, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -19837,8 +19837,8 @@ "ifName": "ap9", "portName": null, "ifIndex": 10009, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -19937,8 +19937,8 @@ "ifName": "ap10", "portName": null, "ifIndex": 10010, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -20037,8 +20037,8 @@ "ifName": "ap11", "portName": null, "ifIndex": 10011, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -20137,8 +20137,8 @@ "ifName": "ap12", "portName": null, "ifIndex": 10012, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -20237,8 +20237,8 @@ "ifName": "ap13", "portName": null, "ifIndex": 10013, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -20337,8 +20337,8 @@ "ifName": "ap14", "portName": null, "ifIndex": 10014, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -20437,8 +20437,8 @@ "ifName": "ap15", "portName": null, "ifIndex": 10015, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -20537,8 +20537,8 @@ "ifName": "ap16", "portName": null, "ifIndex": 10016, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -20637,8 +20637,8 @@ "ifName": "ap17", "portName": null, "ifIndex": 10017, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -20737,8 +20737,8 @@ "ifName": "ap18", "portName": null, "ifIndex": 10018, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -20837,8 +20837,8 @@ "ifName": "ap19", "portName": null, "ifIndex": 10019, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -20937,8 +20937,8 @@ "ifName": "ap20", "portName": null, "ifIndex": 10020, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -21037,8 +21037,8 @@ "ifName": "ap21", "portName": null, "ifIndex": 10021, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -21137,8 +21137,8 @@ "ifName": "ap22", "portName": null, "ifIndex": 10022, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -21237,8 +21237,8 @@ "ifName": "ap23", "portName": null, "ifIndex": 10023, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -21337,8 +21337,8 @@ "ifName": "ap24", "portName": null, "ifIndex": 10024, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -21437,8 +21437,8 @@ "ifName": "ap25", "portName": null, "ifIndex": 10025, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -21537,8 +21537,8 @@ "ifName": "ap26", "portName": null, "ifIndex": 10026, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -21637,8 +21637,8 @@ "ifName": "ap27", "portName": null, "ifIndex": 10027, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -21737,8 +21737,8 @@ "ifName": "ap28", "portName": null, "ifIndex": 10028, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -21837,8 +21837,8 @@ "ifName": "ap29", "portName": null, "ifIndex": 10029, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -21937,8 +21937,8 @@ "ifName": "ap30", "portName": null, "ifIndex": 10030, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -22037,8 +22037,8 @@ "ifName": "ap31", "portName": null, "ifIndex": 10031, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -22137,8 +22137,8 @@ "ifName": "ap32", "portName": null, "ifIndex": 10032, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -22237,8 +22237,8 @@ "ifName": "ap33", "portName": null, "ifIndex": 10033, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -22337,8 +22337,8 @@ "ifName": "ap34", "portName": null, "ifIndex": 10034, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -22437,8 +22437,8 @@ "ifName": "ap35", "portName": null, "ifIndex": 10035, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -22537,8 +22537,8 @@ "ifName": "ap36", "portName": null, "ifIndex": 10036, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -22637,8 +22637,8 @@ "ifName": "ap37", "portName": null, "ifIndex": 10037, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -22737,8 +22737,8 @@ "ifName": "ap38", "portName": null, "ifIndex": 10038, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -22837,8 +22837,8 @@ "ifName": "ap39", "portName": null, "ifIndex": 10039, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -22937,8 +22937,8 @@ "ifName": "ap40", "portName": null, "ifIndex": 10040, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -23037,8 +23037,8 @@ "ifName": "ap41", "portName": null, "ifIndex": 10041, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -23137,8 +23137,8 @@ "ifName": "ap42", "portName": null, "ifIndex": 10042, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -23237,8 +23237,8 @@ "ifName": "ap43", "portName": null, "ifIndex": 10043, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -23337,8 +23337,8 @@ "ifName": "ap44", "portName": null, "ifIndex": 10044, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -23437,8 +23437,8 @@ "ifName": "ap45", "portName": null, "ifIndex": 10045, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -23537,8 +23537,8 @@ "ifName": "ap46", "portName": null, "ifIndex": 10046, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -23637,8 +23637,8 @@ "ifName": "ap47", "portName": null, "ifIndex": 10047, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -23737,8 +23737,8 @@ "ifName": "ap48", "portName": null, "ifIndex": 10048, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -23837,8 +23837,8 @@ "ifName": "ap49", "portName": null, "ifIndex": 10049, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -23937,8 +23937,8 @@ "ifName": "ap50", "portName": null, "ifIndex": 10050, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -24037,8 +24037,8 @@ "ifName": "ap51", "portName": null, "ifIndex": 10051, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -24137,8 +24137,8 @@ "ifName": "ap52", "portName": null, "ifIndex": 10052, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -24237,8 +24237,8 @@ "ifName": "ap53", "portName": null, "ifIndex": 10053, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -24337,8 +24337,8 @@ "ifName": "ap54", "portName": null, "ifIndex": 10054, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -24437,8 +24437,8 @@ "ifName": "ap55", "portName": null, "ifIndex": 10055, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -24537,8 +24537,8 @@ "ifName": "ap56", "portName": null, "ifIndex": 10056, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -24637,8 +24637,8 @@ "ifName": "ap57", "portName": null, "ifIndex": 10057, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -24737,8 +24737,8 @@ "ifName": "ap58", "portName": null, "ifIndex": 10058, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -24837,8 +24837,8 @@ "ifName": "ap59", "portName": null, "ifIndex": 10059, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -24937,8 +24937,8 @@ "ifName": "ap60", "portName": null, "ifIndex": 10060, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -25037,8 +25037,8 @@ "ifName": "ap61", "portName": null, "ifIndex": 10061, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -25137,8 +25137,8 @@ "ifName": "ap62", "portName": null, "ifIndex": 10062, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -25237,8 +25237,8 @@ "ifName": "ap63", "portName": null, "ifIndex": 10063, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -25337,8 +25337,8 @@ "ifName": "ap64", "portName": null, "ifIndex": 10064, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -25437,8 +25437,8 @@ "ifName": "ap65", "portName": null, "ifIndex": 10065, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -25537,8 +25537,8 @@ "ifName": "ap66", "portName": null, "ifIndex": 10066, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -25637,8 +25637,8 @@ "ifName": "ap67", "portName": null, "ifIndex": 10067, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -25737,8 +25737,8 @@ "ifName": "ap68", "portName": null, "ifIndex": 10068, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -25837,8 +25837,8 @@ "ifName": "ap69", "portName": null, "ifIndex": 10069, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -25937,8 +25937,8 @@ "ifName": "ap70", "portName": null, "ifIndex": 10070, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -26037,8 +26037,8 @@ "ifName": "ap71", "portName": null, "ifIndex": 10071, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -26137,8 +26137,8 @@ "ifName": "ap72", "portName": null, "ifIndex": 10072, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -26237,8 +26237,8 @@ "ifName": "ap73", "portName": null, "ifIndex": 10073, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -26337,8 +26337,8 @@ "ifName": "ap74", "portName": null, "ifIndex": 10074, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -26437,8 +26437,8 @@ "ifName": "ap75", "portName": null, "ifIndex": 10075, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -26537,8 +26537,8 @@ "ifName": "ap76", "portName": null, "ifIndex": 10076, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -26799,7 +26799,7 @@ "sensor_index": "22", "sensor_type": "lmsensors", "sensor_descr": "FAN__Metamako i2c-o-i2c_005e", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 7072, @@ -26824,7 +26824,7 @@ "sensor_index": "49", "sensor_type": "lmsensors", "sensor_descr": "fan1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 4294944255, @@ -26849,7 +26849,7 @@ "sensor_index": "50", "sensor_type": "lmsensors", "sensor_descr": "fan2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 4294944808, @@ -26874,7 +26874,7 @@ "sensor_index": "51", "sensor_type": "lmsensors", "sensor_descr": "fan3", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 4294945620, @@ -26899,7 +26899,7 @@ "sensor_index": "52", "sensor_type": "lmsensors", "sensor_descr": "fan4", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 4294944672, @@ -26924,7 +26924,7 @@ "sensor_index": "64", "sensor_type": "lmsensors", "sensor_descr": "FAN__Metamako i2c-o-i2c_005d", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 6816, @@ -26949,7 +26949,7 @@ "sensor_index": "1", "sensor_type": "lmsensors", "sensor_descr": "et14", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0, @@ -26974,7 +26974,7 @@ "sensor_index": "10", "sensor_type": "lmsensors", "sensor_descr": "et39", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.535, @@ -26999,7 +26999,7 @@ "sensor_index": "11", "sensor_type": "lmsensors", "sensor_descr": "et29", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 53.001, @@ -27024,7 +27024,7 @@ "sensor_index": "12", "sensor_type": "lmsensors", "sensor_descr": "Core 0", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 37, @@ -27049,7 +27049,7 @@ "sensor_index": "13", "sensor_type": "lmsensors", "sensor_descr": "Core 1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 36, @@ -27074,7 +27074,7 @@ "sensor_index": "14", "sensor_type": "lmsensors", "sensor_descr": "Core 2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 36, @@ -27099,7 +27099,7 @@ "sensor_index": "15", "sensor_type": "lmsensors", "sensor_descr": "Core 3", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 36, @@ -27124,7 +27124,7 @@ "sensor_index": "16", "sensor_type": "lmsensors", "sensor_descr": "et19", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 53.829, @@ -27149,7 +27149,7 @@ "sensor_index": "17", "sensor_type": "lmsensors", "sensor_descr": "et47", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.995, @@ -27174,7 +27174,7 @@ "sensor_index": "18", "sensor_type": "lmsensors", "sensor_descr": "et9", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 58.488, @@ -27199,7 +27199,7 @@ "sensor_index": "19", "sensor_type": "lmsensors", "sensor_descr": "et37", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.017, @@ -27224,7 +27224,7 @@ "sensor_index": "2", "sensor_type": "lmsensors", "sensor_descr": "et42", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.367, @@ -27249,7 +27249,7 @@ "sensor_index": "23", "sensor_type": "lmsensors", "sensor_descr": "AMBIENT_TEMP__Metamako i2c-o-i2c_005e", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 39.75, @@ -27274,7 +27274,7 @@ "sensor_index": "24", "sensor_type": "lmsensors", "sensor_descr": "INTERNAL_TEMP__Metamako i2c-o-i2c_005e", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 46.75, @@ -27299,7 +27299,7 @@ "sensor_index": "25", "sensor_type": "lmsensors", "sensor_descr": "et27", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 53.606, @@ -27324,7 +27324,7 @@ "sensor_index": "26", "sensor_type": "lmsensors", "sensor_descr": "et17", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0, @@ -27349,7 +27349,7 @@ "sensor_index": "27", "sensor_type": "lmsensors", "sensor_descr": "et45", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.627, @@ -27374,7 +27374,7 @@ "sensor_index": "28", "sensor_type": "lmsensors", "sensor_descr": "et7", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 59.724, @@ -27399,7 +27399,7 @@ "sensor_index": "29", "sensor_type": "lmsensors", "sensor_descr": "et35", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 53.583, @@ -27424,7 +27424,7 @@ "sensor_index": "3", "sensor_type": "lmsensors", "sensor_descr": "et4", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 61.092, @@ -27449,7 +27449,7 @@ "sensor_index": "30", "sensor_type": "lmsensors", "sensor_descr": "adm1032-i2c-1-4d:temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 45, @@ -27474,7 +27474,7 @@ "sensor_index": "31", "sensor_type": "lmsensors", "sensor_descr": "temp2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 58.5, @@ -27499,7 +27499,7 @@ "sensor_index": "32", "sensor_type": "lmsensors", "sensor_descr": "et25", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.785, @@ -27524,7 +27524,7 @@ "sensor_index": "33", "sensor_type": "lmsensors", "sensor_descr": "et15", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.188, @@ -27549,7 +27549,7 @@ "sensor_index": "34", "sensor_type": "lmsensors", "sensor_descr": "et43", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.728, @@ -27574,7 +27574,7 @@ "sensor_index": "35", "sensor_type": "lmsensors", "sensor_descr": "et5", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 61.288, @@ -27599,7 +27599,7 @@ "sensor_index": "36", "sensor_type": "lmsensors", "sensor_descr": "et33", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.517, @@ -27624,7 +27624,7 @@ "sensor_index": "37", "sensor_type": "lmsensors", "sensor_descr": "lm75-i2c-1-4b:temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 51, @@ -27649,7 +27649,7 @@ "sensor_index": "38", "sensor_type": "lmsensors", "sensor_descr": "et23", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.337, @@ -27674,7 +27674,7 @@ "sensor_index": "39", "sensor_type": "lmsensors", "sensor_descr": "et13", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0, @@ -27699,7 +27699,7 @@ "sensor_index": "4", "sensor_type": "lmsensors", "sensor_descr": "et32", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 53.167, @@ -27724,7 +27724,7 @@ "sensor_index": "40", "sensor_type": "lmsensors", "sensor_descr": "et41", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.556, @@ -27749,7 +27749,7 @@ "sensor_index": "41", "sensor_type": "lmsensors", "sensor_descr": "et3", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 60.75, @@ -27774,7 +27774,7 @@ "sensor_index": "42", "sensor_type": "lmsensors", "sensor_descr": "et31", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 52.374, @@ -27799,7 +27799,7 @@ "sensor_index": "43", "sensor_type": "lmsensors", "sensor_descr": "lm75-i2c-1-49:temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 39, @@ -27824,7 +27824,7 @@ "sensor_index": "44", "sensor_type": "lmsensors", "sensor_descr": "et21", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.91, @@ -27849,7 +27849,7 @@ "sensor_index": "45", "sensor_type": "lmsensors", "sensor_descr": "et11", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 56.989, @@ -27874,7 +27874,7 @@ "sensor_index": "46", "sensor_type": "lmsensors", "sensor_descr": "et40", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.648, @@ -27899,7 +27899,7 @@ "sensor_index": "47", "sensor_type": "lmsensors", "sensor_descr": "et1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 60.908, @@ -27924,7 +27924,7 @@ "sensor_index": "48", "sensor_type": "lmsensors", "sensor_descr": "et30", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 52.571, @@ -27949,7 +27949,7 @@ "sensor_index": "5", "sensor_type": "lmsensors", "sensor_descr": "temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 46, @@ -27974,7 +27974,7 @@ "sensor_index": "53", "sensor_type": "lmsensors", "sensor_descr": "et20", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.386, @@ -27999,7 +27999,7 @@ "sensor_index": "54", "sensor_type": "lmsensors", "sensor_descr": "et48", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.639, @@ -28024,7 +28024,7 @@ "sensor_index": "55", "sensor_type": "lmsensors", "sensor_descr": "et10", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 58.611, @@ -28049,7 +28049,7 @@ "sensor_index": "56", "sensor_type": "lmsensors", "sensor_descr": "et38", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.657, @@ -28074,7 +28074,7 @@ "sensor_index": "57", "sensor_type": "lmsensors", "sensor_descr": "et28", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.368, @@ -28099,7 +28099,7 @@ "sensor_index": "58", "sensor_type": "lmsensors", "sensor_descr": "et18", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0, @@ -28124,7 +28124,7 @@ "sensor_index": "59", "sensor_type": "lmsensors", "sensor_descr": "et46", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.814, @@ -28149,7 +28149,7 @@ "sensor_index": "6", "sensor_type": "lmsensors", "sensor_descr": "et22", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 56.503, @@ -28174,7 +28174,7 @@ "sensor_index": "60", "sensor_type": "lmsensors", "sensor_descr": "et8", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 60.552, @@ -28199,7 +28199,7 @@ "sensor_index": "61", "sensor_type": "lmsensors", "sensor_descr": "et36", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.662, @@ -28224,7 +28224,7 @@ "sensor_index": "65", "sensor_type": "lmsensors", "sensor_descr": "AMBIENT_TEMP__Metamako i2c-o-i2c_005d", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 39.75, @@ -28249,7 +28249,7 @@ "sensor_index": "66", "sensor_type": "lmsensors", "sensor_descr": "INTERNAL_TEMP__Metamako i2c-o-i2c_005d", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 49.25, @@ -28274,7 +28274,7 @@ "sensor_index": "67", "sensor_type": "lmsensors", "sensor_descr": "et26", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.368, @@ -28299,7 +28299,7 @@ "sensor_index": "68", "sensor_type": "lmsensors", "sensor_descr": "et16", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.767, @@ -28324,7 +28324,7 @@ "sensor_index": "69", "sensor_type": "lmsensors", "sensor_descr": "et44", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.569, @@ -28349,7 +28349,7 @@ "sensor_index": "7", "sensor_type": "lmsensors", "sensor_descr": "et12", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 58.471, @@ -28374,7 +28374,7 @@ "sensor_index": "70", "sensor_type": "lmsensors", "sensor_descr": "et6", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 59.917, @@ -28399,7 +28399,7 @@ "sensor_index": "71", "sensor_type": "lmsensors", "sensor_descr": "et34", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.696, @@ -28424,7 +28424,7 @@ "sensor_index": "74", "sensor_type": "lmsensors", "sensor_descr": "et24", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 56.476, @@ -28449,7 +28449,7 @@ "sensor_index": "8", "sensor_type": "lmsensors", "sensor_descr": "et2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 61.012, @@ -28474,7 +28474,7 @@ "sensor_index": "9", "sensor_type": "lmsensors", "sensor_descr": "lm75-i2c-1-48:temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 44, @@ -28499,7 +28499,7 @@ "sensor_index": "20", "sensor_type": "lmsensors", "sensor_descr": "VOUT__Metamako i2c-o-i2c_005e", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 12.187, @@ -28524,7 +28524,7 @@ "sensor_index": "21", "sensor_type": "lmsensors", "sensor_descr": "VIN__Metamako i2c-o-i2c_005e", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 212, @@ -28549,7 +28549,7 @@ "sensor_index": "62", "sensor_type": "lmsensors", "sensor_descr": "VOUT__Metamako i2c-o-i2c_005d", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 12.171, @@ -28574,7 +28574,7 @@ "sensor_index": "63", "sensor_type": "lmsensors", "sensor_descr": "VIN__Metamako i2c-o-i2c_005d", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 211, @@ -28599,7 +28599,7 @@ "sensor_index": "72", "sensor_type": "lmsensors", "sensor_descr": "in0", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0.017, @@ -28624,7 +28624,7 @@ "sensor_index": "73", "sensor_type": "lmsensors", "sensor_descr": "in1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 12.096, @@ -28653,7 +28653,7 @@ "sensor_index": "22", "sensor_type": "lmsensors", "sensor_descr": "FAN__Metamako i2c-o-i2c_005e", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 7072, @@ -28678,7 +28678,7 @@ "sensor_index": "49", "sensor_type": "lmsensors", "sensor_descr": "fan1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 23041, @@ -28703,7 +28703,7 @@ "sensor_index": "50", "sensor_type": "lmsensors", "sensor_descr": "fan2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 22488, @@ -28728,7 +28728,7 @@ "sensor_index": "51", "sensor_type": "lmsensors", "sensor_descr": "fan3", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 21676, @@ -28753,7 +28753,7 @@ "sensor_index": "52", "sensor_type": "lmsensors", "sensor_descr": "fan4", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 22624, @@ -28778,7 +28778,7 @@ "sensor_index": "64", "sensor_type": "lmsensors", "sensor_descr": "FAN__Metamako i2c-o-i2c_005d", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 6816, @@ -28803,7 +28803,7 @@ "sensor_index": "1", "sensor_type": "lmsensors", "sensor_descr": "et14", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0, @@ -28828,7 +28828,7 @@ "sensor_index": "10", "sensor_type": "lmsensors", "sensor_descr": "et39", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.535, @@ -28853,7 +28853,7 @@ "sensor_index": "11", "sensor_type": "lmsensors", "sensor_descr": "et29", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 53.001, @@ -28878,7 +28878,7 @@ "sensor_index": "12", "sensor_type": "lmsensors", "sensor_descr": "Core 0", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 37, @@ -28903,7 +28903,7 @@ "sensor_index": "13", "sensor_type": "lmsensors", "sensor_descr": "Core 1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 36, @@ -28928,7 +28928,7 @@ "sensor_index": "14", "sensor_type": "lmsensors", "sensor_descr": "Core 2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 36, @@ -28953,7 +28953,7 @@ "sensor_index": "15", "sensor_type": "lmsensors", "sensor_descr": "Core 3", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 36, @@ -28978,7 +28978,7 @@ "sensor_index": "16", "sensor_type": "lmsensors", "sensor_descr": "et19", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 53.829, @@ -29003,7 +29003,7 @@ "sensor_index": "17", "sensor_type": "lmsensors", "sensor_descr": "et47", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.995, @@ -29028,7 +29028,7 @@ "sensor_index": "18", "sensor_type": "lmsensors", "sensor_descr": "et9", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 58.488, @@ -29053,7 +29053,7 @@ "sensor_index": "19", "sensor_type": "lmsensors", "sensor_descr": "et37", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.017, @@ -29078,7 +29078,7 @@ "sensor_index": "2", "sensor_type": "lmsensors", "sensor_descr": "et42", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.367, @@ -29103,7 +29103,7 @@ "sensor_index": "23", "sensor_type": "lmsensors", "sensor_descr": "AMBIENT_TEMP__Metamako i2c-o-i2c_005e", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 39.75, @@ -29128,7 +29128,7 @@ "sensor_index": "24", "sensor_type": "lmsensors", "sensor_descr": "INTERNAL_TEMP__Metamako i2c-o-i2c_005e", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 46.75, @@ -29153,7 +29153,7 @@ "sensor_index": "25", "sensor_type": "lmsensors", "sensor_descr": "et27", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 53.606, @@ -29178,7 +29178,7 @@ "sensor_index": "26", "sensor_type": "lmsensors", "sensor_descr": "et17", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0, @@ -29203,7 +29203,7 @@ "sensor_index": "27", "sensor_type": "lmsensors", "sensor_descr": "et45", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.627, @@ -29228,7 +29228,7 @@ "sensor_index": "28", "sensor_type": "lmsensors", "sensor_descr": "et7", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 59.724, @@ -29253,7 +29253,7 @@ "sensor_index": "29", "sensor_type": "lmsensors", "sensor_descr": "et35", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 53.583, @@ -29278,7 +29278,7 @@ "sensor_index": "3", "sensor_type": "lmsensors", "sensor_descr": "et4", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 61.092, @@ -29303,7 +29303,7 @@ "sensor_index": "30", "sensor_type": "lmsensors", "sensor_descr": "adm1032-i2c-1-4d:temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 45, @@ -29328,7 +29328,7 @@ "sensor_index": "31", "sensor_type": "lmsensors", "sensor_descr": "temp2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 58.5, @@ -29353,7 +29353,7 @@ "sensor_index": "32", "sensor_type": "lmsensors", "sensor_descr": "et25", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.785, @@ -29378,7 +29378,7 @@ "sensor_index": "33", "sensor_type": "lmsensors", "sensor_descr": "et15", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.188, @@ -29403,7 +29403,7 @@ "sensor_index": "34", "sensor_type": "lmsensors", "sensor_descr": "et43", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.728, @@ -29428,7 +29428,7 @@ "sensor_index": "35", "sensor_type": "lmsensors", "sensor_descr": "et5", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 61.288, @@ -29453,7 +29453,7 @@ "sensor_index": "36", "sensor_type": "lmsensors", "sensor_descr": "et33", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.517, @@ -29478,7 +29478,7 @@ "sensor_index": "37", "sensor_type": "lmsensors", "sensor_descr": "lm75-i2c-1-4b:temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 51, @@ -29503,7 +29503,7 @@ "sensor_index": "38", "sensor_type": "lmsensors", "sensor_descr": "et23", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.337, @@ -29528,7 +29528,7 @@ "sensor_index": "39", "sensor_type": "lmsensors", "sensor_descr": "et13", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0, @@ -29553,7 +29553,7 @@ "sensor_index": "4", "sensor_type": "lmsensors", "sensor_descr": "et32", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 53.167, @@ -29578,7 +29578,7 @@ "sensor_index": "40", "sensor_type": "lmsensors", "sensor_descr": "et41", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.556, @@ -29603,7 +29603,7 @@ "sensor_index": "41", "sensor_type": "lmsensors", "sensor_descr": "et3", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 60.75, @@ -29628,7 +29628,7 @@ "sensor_index": "42", "sensor_type": "lmsensors", "sensor_descr": "et31", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 52.374, @@ -29653,7 +29653,7 @@ "sensor_index": "43", "sensor_type": "lmsensors", "sensor_descr": "lm75-i2c-1-49:temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 39, @@ -29678,7 +29678,7 @@ "sensor_index": "44", "sensor_type": "lmsensors", "sensor_descr": "et21", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.91, @@ -29703,7 +29703,7 @@ "sensor_index": "45", "sensor_type": "lmsensors", "sensor_descr": "et11", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 56.989, @@ -29728,7 +29728,7 @@ "sensor_index": "46", "sensor_type": "lmsensors", "sensor_descr": "et40", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.648, @@ -29753,7 +29753,7 @@ "sensor_index": "47", "sensor_type": "lmsensors", "sensor_descr": "et1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 60.908, @@ -29778,7 +29778,7 @@ "sensor_index": "48", "sensor_type": "lmsensors", "sensor_descr": "et30", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 52.571, @@ -29803,7 +29803,7 @@ "sensor_index": "5", "sensor_type": "lmsensors", "sensor_descr": "temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 46, @@ -29828,7 +29828,7 @@ "sensor_index": "53", "sensor_type": "lmsensors", "sensor_descr": "et20", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.386, @@ -29853,7 +29853,7 @@ "sensor_index": "54", "sensor_type": "lmsensors", "sensor_descr": "et48", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.639, @@ -29878,7 +29878,7 @@ "sensor_index": "55", "sensor_type": "lmsensors", "sensor_descr": "et10", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 58.611, @@ -29903,7 +29903,7 @@ "sensor_index": "56", "sensor_type": "lmsensors", "sensor_descr": "et38", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.657, @@ -29928,7 +29928,7 @@ "sensor_index": "57", "sensor_type": "lmsensors", "sensor_descr": "et28", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.368, @@ -29953,7 +29953,7 @@ "sensor_index": "58", "sensor_type": "lmsensors", "sensor_descr": "et18", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0, @@ -29978,7 +29978,7 @@ "sensor_index": "59", "sensor_type": "lmsensors", "sensor_descr": "et46", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.814, @@ -30003,7 +30003,7 @@ "sensor_index": "6", "sensor_type": "lmsensors", "sensor_descr": "et22", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 56.503, @@ -30028,7 +30028,7 @@ "sensor_index": "60", "sensor_type": "lmsensors", "sensor_descr": "et8", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 60.552, @@ -30053,7 +30053,7 @@ "sensor_index": "61", "sensor_type": "lmsensors", "sensor_descr": "et36", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.662, @@ -30078,7 +30078,7 @@ "sensor_index": "65", "sensor_type": "lmsensors", "sensor_descr": "AMBIENT_TEMP__Metamako i2c-o-i2c_005d", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 39.75, @@ -30103,7 +30103,7 @@ "sensor_index": "66", "sensor_type": "lmsensors", "sensor_descr": "INTERNAL_TEMP__Metamako i2c-o-i2c_005d", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 49.25, @@ -30128,7 +30128,7 @@ "sensor_index": "67", "sensor_type": "lmsensors", "sensor_descr": "et26", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.368, @@ -30153,7 +30153,7 @@ "sensor_index": "68", "sensor_type": "lmsensors", "sensor_descr": "et16", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.767, @@ -30178,7 +30178,7 @@ "sensor_index": "69", "sensor_type": "lmsensors", "sensor_descr": "et44", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 55.569, @@ -30203,7 +30203,7 @@ "sensor_index": "7", "sensor_type": "lmsensors", "sensor_descr": "et12", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 58.471, @@ -30228,7 +30228,7 @@ "sensor_index": "70", "sensor_type": "lmsensors", "sensor_descr": "et6", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 59.917, @@ -30253,7 +30253,7 @@ "sensor_index": "71", "sensor_type": "lmsensors", "sensor_descr": "et34", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 54.696, @@ -30278,7 +30278,7 @@ "sensor_index": "74", "sensor_type": "lmsensors", "sensor_descr": "et24", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 56.476, @@ -30303,7 +30303,7 @@ "sensor_index": "8", "sensor_type": "lmsensors", "sensor_descr": "et2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 61.012, @@ -30328,7 +30328,7 @@ "sensor_index": "9", "sensor_type": "lmsensors", "sensor_descr": "lm75-i2c-1-48:temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 44, @@ -30353,7 +30353,7 @@ "sensor_index": "20", "sensor_type": "lmsensors", "sensor_descr": "VOUT__Metamako i2c-o-i2c_005e", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 12.187, @@ -30378,7 +30378,7 @@ "sensor_index": "21", "sensor_type": "lmsensors", "sensor_descr": "VIN__Metamako i2c-o-i2c_005e", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 212, @@ -30403,7 +30403,7 @@ "sensor_index": "62", "sensor_type": "lmsensors", "sensor_descr": "VOUT__Metamako i2c-o-i2c_005d", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 12.171, @@ -30428,7 +30428,7 @@ "sensor_index": "63", "sensor_type": "lmsensors", "sensor_descr": "VIN__Metamako i2c-o-i2c_005d", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 211, @@ -30453,7 +30453,7 @@ "sensor_index": "72", "sensor_type": "lmsensors", "sensor_descr": "in0", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0.017, @@ -30478,7 +30478,7 @@ "sensor_index": "73", "sensor_type": "lmsensors", "sensor_descr": "in1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 12.096, diff --git a/tests/data/cumulus_cumulus.json b/tests/data/cumulus_cumulus.json index 7cab12eedc..2b466579fd 100644 --- a/tests/data/cumulus_cumulus.json +++ b/tests/data/cumulus_cumulus.json @@ -2166,7 +2166,7 @@ "sensor_index": "1", "sensor_type": "lmsensors", "sensor_descr": "fan1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 6000, @@ -2191,7 +2191,7 @@ "sensor_index": "2", "sensor_type": "lmsensors", "sensor_descr": "fan2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 6000, @@ -2216,7 +2216,7 @@ "sensor_index": "3", "sensor_type": "lmsensors", "sensor_descr": "fan3", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 6000, @@ -2241,7 +2241,7 @@ "sensor_index": "4", "sensor_type": "lmsensors", "sensor_descr": "fan4", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 6000, @@ -2266,7 +2266,7 @@ "sensor_index": "5", "sensor_type": "lmsensors", "sensor_descr": "fan5", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 6000, @@ -2291,7 +2291,7 @@ "sensor_index": "6", "sensor_type": "lmsensors", "sensor_descr": "fan6", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 6000, @@ -2316,7 +2316,7 @@ "sensor_index": "7", "sensor_type": "lmsensors", "sensor_descr": "fan7", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 6000, @@ -2341,7 +2341,7 @@ "sensor_index": "8", "sensor_type": "lmsensors", "sensor_descr": "fan8", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 6000, @@ -2591,7 +2591,7 @@ "sensor_index": "10", "sensor_type": "lmsensors", "sensor_descr": "temp2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 25, @@ -2616,7 +2616,7 @@ "sensor_index": "11", "sensor_type": "lmsensors", "sensor_descr": "temp3", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 25, @@ -2641,7 +2641,7 @@ "sensor_index": "12", "sensor_type": "lmsensors", "sensor_descr": "temp4", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 25, @@ -2666,7 +2666,7 @@ "sensor_index": "13", "sensor_type": "lmsensors", "sensor_descr": "temp5", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 25, @@ -2691,7 +2691,7 @@ "sensor_index": "14", "sensor_type": "lmsensors", "sensor_descr": "temp6", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 25, @@ -2716,7 +2716,7 @@ "sensor_index": "15", "sensor_type": "lmsensors", "sensor_descr": "temp7", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 25, @@ -2741,7 +2741,7 @@ "sensor_index": "9", "sensor_type": "lmsensors", "sensor_descr": "temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 25, diff --git a/tests/data/cumulus_edgecore-as4610-54p.json b/tests/data/cumulus_edgecore-as4610-54p.json index 544abe95ed..da6c2b254f 100644 --- a/tests/data/cumulus_edgecore-as4610-54p.json +++ b/tests/data/cumulus_edgecore-as4610-54p.json @@ -11602,7 +11602,7 @@ "sensor_index": "1", "sensor_type": "lmsensors", "sensor_descr": "fan1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 6026, @@ -11702,7 +11702,7 @@ "sensor_index": "2", "sensor_type": "lmsensors", "sensor_descr": "ambient temp", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 41.5, diff --git a/tests/data/linux_powermon.json b/tests/data/linux_powermon.json index 22b1b0a681..d204f3d892 100644 --- a/tests/data/linux_powermon.json +++ b/tests/data/linux_powermon.json @@ -787,8 +787,8 @@ "ifName": "enp2s0f1", "portName": null, "ifIndex": 3, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -887,8 +887,8 @@ "ifName": "enp3s0f0", "portName": null, "ifIndex": 4, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -987,8 +987,8 @@ "ifName": "enp3s0f1", "portName": null, "ifIndex": 5, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -1489,7 +1489,7 @@ "sensor_index": "1", "sensor_type": "lmsensors", "sensor_descr": "temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 8.3, diff --git a/tests/data/linux_raspberrypi-gpiomonitor.json b/tests/data/linux_raspberrypi-gpiomonitor.json index 1f2548a9c2..56f37e4da7 100644 --- a/tests/data/linux_raspberrypi-gpiomonitor.json +++ b/tests/data/linux_raspberrypi-gpiomonitor.json @@ -537,8 +537,8 @@ "ifName": "wlan0", "portName": null, "ifIndex": 3, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -869,7 +869,7 @@ "sensor_index": "1", "sensor_type": "lmsensors", "sensor_descr": "temp1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 36.476, diff --git a/tests/data/recoveryos.json b/tests/data/recoveryos.json index b46806ec30..496ddd9eb8 100644 --- a/tests/data/recoveryos.json +++ b/tests/data/recoveryos.json @@ -537,8 +537,8 @@ "ifName": "docker0", "portName": null, "ifIndex": 3, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -1122,7 +1122,7 @@ "sensor_index": "1", "sensor_type": "lmsensors", "sensor_descr": "Physical id 0", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 100, @@ -1147,7 +1147,7 @@ "sensor_index": "2", "sensor_type": "lmsensors", "sensor_descr": "Core 0", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 100, @@ -1172,7 +1172,7 @@ "sensor_index": "3", "sensor_type": "lmsensors", "sensor_descr": "Physical id 2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 100, @@ -1196,8 +1196,8 @@ "sensor_oid": ".1.3.6.1.4.1.2021.13.16.2.1.3.4", "sensor_index": "4", "sensor_type": "lmsensors", - "sensor_descr": "coreisa-0002:Core 0", - "group": null, + "sensor_descr": "coretemp-isa-0002:Core 0", + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 100, diff --git a/tests/data/recoveryos_8024s.json b/tests/data/recoveryos_8024s.json index 2c57510b91..00828f132b 100644 --- a/tests/data/recoveryos_8024s.json +++ b/tests/data/recoveryos_8024s.json @@ -837,8 +837,8 @@ "ifName": "eth1", "portName": null, "ifIndex": 3, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -1137,8 +1137,8 @@ "ifName": "docker0", "portName": null, "ifIndex": 6, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "up", "ifOperStatus_prev": "up", diff --git a/tests/data/truenas.json b/tests/data/truenas.json index d0e1423a4a..071b1941c5 100644 --- a/tests/data/truenas.json +++ b/tests/data/truenas.json @@ -1437,8 +1437,8 @@ "ifName": "lo0", "portName": null, "ifIndex": 6, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "up", "ifOperStatus_prev": "up", @@ -1537,8 +1537,8 @@ "ifName": "pflog0", "portName": null, "ifIndex": 7, - "ifSpeed": 0, - "ifSpeed_prev": null, + "ifSpeed": null, + "ifSpeed_prev": 0, "ifConnectorPresent": "true", "ifOperStatus": "down", "ifOperStatus_prev": "down", @@ -2689,7 +2689,7 @@ "sensor_index": "1", "sensor_type": "lmsensors", "sensor_descr": "CPU0", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 27.9, @@ -2714,7 +2714,7 @@ "sensor_index": "2", "sensor_type": "lmsensors", "sensor_descr": "CPU1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 27.9, @@ -2739,7 +2739,7 @@ "sensor_index": "3", "sensor_type": "lmsensors", "sensor_descr": "CPU2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 27.9, @@ -2764,7 +2764,7 @@ "sensor_index": "4", "sensor_type": "lmsensors", "sensor_descr": "CPU3", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 27.9, @@ -2789,7 +2789,7 @@ "sensor_index": "5", "sensor_type": "lmsensors", "sensor_descr": "ada1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 32, @@ -2814,7 +2814,7 @@ "sensor_index": "6", "sensor_type": "lmsensors", "sensor_descr": "ada0", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 31, @@ -3337,7 +3337,7 @@ "sensor_index": "1", "sensor_type": "lmsensors", "sensor_descr": "CPU0", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 27.9, @@ -3362,7 +3362,7 @@ "sensor_index": "2", "sensor_type": "lmsensors", "sensor_descr": "CPU1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 27.9, @@ -3387,7 +3387,7 @@ "sensor_index": "3", "sensor_type": "lmsensors", "sensor_descr": "CPU2", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 27.9, @@ -3412,7 +3412,7 @@ "sensor_index": "4", "sensor_type": "lmsensors", "sensor_descr": "CPU3", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 27.9, @@ -3437,7 +3437,7 @@ "sensor_index": "5", "sensor_type": "lmsensors", "sensor_descr": "ada1", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 32, @@ -3462,7 +3462,7 @@ "sensor_index": "6", "sensor_type": "lmsensors", "sensor_descr": "ada0", - "group": null, + "group": "lmsensors", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 31, diff --git a/tests/snmpsim/arista-mos_metamux48-c-0-16.snmprec b/tests/snmpsim/arista-mos_metamux48-c-0-16.snmprec index f2454a8c05..81dabb049c 100644 --- a/tests/snmpsim/arista-mos_metamux48-c-0-16.snmprec +++ b/tests/snmpsim/arista-mos_metamux48-c-0-16.snmprec @@ -5076,6 +5076,69 @@ 1.3.6.1.4.1.2021.11.65.0|65|0 1.3.6.1.4.1.2021.11.66.0|65|0 1.3.6.1.4.1.2021.11.67.0|2|4 + +1.3.6.1.4.1.2021.13.16.2.1.1.1|2|1 +1.3.6.1.4.1.2021.13.16.2.1.1.2|2|2 +1.3.6.1.4.1.2021.13.16.2.1.1.3|2|3 +1.3.6.1.4.1.2021.13.16.2.1.1.4|2|4 +1.3.6.1.4.1.2021.13.16.2.1.1.5|2|5 +1.3.6.1.4.1.2021.13.16.2.1.1.6|2|6 +1.3.6.1.4.1.2021.13.16.2.1.1.7|2|7 +1.3.6.1.4.1.2021.13.16.2.1.1.8|2|8 +1.3.6.1.4.1.2021.13.16.2.1.1.9|2|9 +1.3.6.1.4.1.2021.13.16.2.1.1.10|2|10 +1.3.6.1.4.1.2021.13.16.2.1.1.11|2|11 +1.3.6.1.4.1.2021.13.16.2.1.1.12|2|12 +1.3.6.1.4.1.2021.13.16.2.1.1.13|2|13 +1.3.6.1.4.1.2021.13.16.2.1.1.14|2|14 +1.3.6.1.4.1.2021.13.16.2.1.1.15|2|15 +1.3.6.1.4.1.2021.13.16.2.1.1.16|2|16 +1.3.6.1.4.1.2021.13.16.2.1.1.17|2|17 +1.3.6.1.4.1.2021.13.16.2.1.1.18|2|18 +1.3.6.1.4.1.2021.13.16.2.1.1.19|2|19 +1.3.6.1.4.1.2021.13.16.2.1.1.23|2|23 +1.3.6.1.4.1.2021.13.16.2.1.1.24|2|24 +1.3.6.1.4.1.2021.13.16.2.1.1.25|2|25 +1.3.6.1.4.1.2021.13.16.2.1.1.26|2|26 +1.3.6.1.4.1.2021.13.16.2.1.1.27|2|27 +1.3.6.1.4.1.2021.13.16.2.1.1.28|2|28 +1.3.6.1.4.1.2021.13.16.2.1.1.29|2|29 +1.3.6.1.4.1.2021.13.16.2.1.1.30|2|30 +1.3.6.1.4.1.2021.13.16.2.1.1.31|2|31 +1.3.6.1.4.1.2021.13.16.2.1.1.32|2|32 +1.3.6.1.4.1.2021.13.16.2.1.1.33|2|33 +1.3.6.1.4.1.2021.13.16.2.1.1.34|2|34 +1.3.6.1.4.1.2021.13.16.2.1.1.35|2|35 +1.3.6.1.4.1.2021.13.16.2.1.1.36|2|36 +1.3.6.1.4.1.2021.13.16.2.1.1.37|2|37 +1.3.6.1.4.1.2021.13.16.2.1.1.38|2|38 +1.3.6.1.4.1.2021.13.16.2.1.1.39|2|39 +1.3.6.1.4.1.2021.13.16.2.1.1.40|2|40 +1.3.6.1.4.1.2021.13.16.2.1.1.41|2|41 +1.3.6.1.4.1.2021.13.16.2.1.1.42|2|42 +1.3.6.1.4.1.2021.13.16.2.1.1.43|2|43 +1.3.6.1.4.1.2021.13.16.2.1.1.44|2|44 +1.3.6.1.4.1.2021.13.16.2.1.1.45|2|45 +1.3.6.1.4.1.2021.13.16.2.1.1.46|2|46 +1.3.6.1.4.1.2021.13.16.2.1.1.47|2|47 +1.3.6.1.4.1.2021.13.16.2.1.1.48|2|48 +1.3.6.1.4.1.2021.13.16.2.1.1.53|2|53 +1.3.6.1.4.1.2021.13.16.2.1.1.54|2|54 +1.3.6.1.4.1.2021.13.16.2.1.1.55|2|55 +1.3.6.1.4.1.2021.13.16.2.1.1.56|2|56 +1.3.6.1.4.1.2021.13.16.2.1.1.57|2|57 +1.3.6.1.4.1.2021.13.16.2.1.1.58|2|58 +1.3.6.1.4.1.2021.13.16.2.1.1.59|2|59 +1.3.6.1.4.1.2021.13.16.2.1.1.60|2|60 +1.3.6.1.4.1.2021.13.16.2.1.1.61|2|61 +1.3.6.1.4.1.2021.13.16.2.1.1.65|2|65 +1.3.6.1.4.1.2021.13.16.2.1.1.66|2|66 +1.3.6.1.4.1.2021.13.16.2.1.1.67|2|67 +1.3.6.1.4.1.2021.13.16.2.1.1.68|2|68 +1.3.6.1.4.1.2021.13.16.2.1.1.69|2|69 +1.3.6.1.4.1.2021.13.16.2.1.1.70|2|70 +1.3.6.1.4.1.2021.13.16.2.1.1.71|2|71 +1.3.6.1.4.1.2021.13.16.2.1.1.74|2|74 1.3.6.1.4.1.2021.13.16.2.1.2.1|4|et14 1.3.6.1.4.1.2021.13.16.2.1.2.2|4|et42 1.3.6.1.4.1.2021.13.16.2.1.2.3|4|et4 @@ -5200,6 +5263,12 @@ 1.3.6.1.4.1.2021.13.16.2.1.3.70|66|59917 1.3.6.1.4.1.2021.13.16.2.1.3.71|66|54696 1.3.6.1.4.1.2021.13.16.2.1.3.74|66|56476 +1.3.6.1.4.1.2021.13.16.3.1.1.22|2|22 +1.3.6.1.4.1.2021.13.16.3.1.1.49|2|49 +1.3.6.1.4.1.2021.13.16.3.1.1.50|2|50 +1.3.6.1.4.1.2021.13.16.3.1.1.51|2|51 +1.3.6.1.4.1.2021.13.16.3.1.1.52|2|52 +1.3.6.1.4.1.2021.13.16.3.1.1.64|2|64 1.3.6.1.4.1.2021.13.16.3.1.2.22|4|FAN__Metamako i2c-o-i2c_005e 1.3.6.1.4.1.2021.13.16.3.1.2.49|4|fan1 1.3.6.1.4.1.2021.13.16.3.1.2.50|4|fan2 @@ -5212,6 +5281,12 @@ 1.3.6.1.4.1.2021.13.16.3.1.3.51|66|4294945620 1.3.6.1.4.1.2021.13.16.3.1.3.52|66|4294944672 1.3.6.1.4.1.2021.13.16.3.1.3.64|66|6816 +1.3.6.1.4.1.2021.13.16.4.1.1.20|2|20 +1.3.6.1.4.1.2021.13.16.4.1.1.21|2|21 +1.3.6.1.4.1.2021.13.16.4.1.1.62|2|62 +1.3.6.1.4.1.2021.13.16.4.1.1.63|2|63 +1.3.6.1.4.1.2021.13.16.4.1.1.72|2|72 +1.3.6.1.4.1.2021.13.16.4.1.1.73|2|73 1.3.6.1.4.1.2021.13.16.4.1.2.20|4|VOUT__Metamako i2c-o-i2c_005e 1.3.6.1.4.1.2021.13.16.4.1.2.21|4|VIN__Metamako i2c-o-i2c_005e 1.3.6.1.4.1.2021.13.16.4.1.2.62|4|VOUT__Metamako i2c-o-i2c_005d diff --git a/tests/snmpsim/cumulus_cumulus.snmprec b/tests/snmpsim/cumulus_cumulus.snmprec index 02a7eac2a6..d325968c21 100644 --- a/tests/snmpsim/cumulus_cumulus.snmprec +++ b/tests/snmpsim/cumulus_cumulus.snmprec @@ -1391,6 +1391,13 @@ 1.3.6.1.4.1.2021.13.15.1.1.14.28|70|0 1.3.6.1.4.1.2021.13.15.1.1.14.29|70|0 1.3.6.1.4.1.2021.13.15.1.1.14.30|70|0 +1.3.6.1.4.1.2021.13.16.2.1.1.9|2|9 +1.3.6.1.4.1.2021.13.16.2.1.1.10|2|10 +1.3.6.1.4.1.2021.13.16.2.1.1.11|2|11 +1.3.6.1.4.1.2021.13.16.2.1.1.12|2|12 +1.3.6.1.4.1.2021.13.16.2.1.1.13|2|13 +1.3.6.1.4.1.2021.13.16.2.1.1.14|2|14 +1.3.6.1.4.1.2021.13.16.2.1.1.15|2|15 1.3.6.1.4.1.2021.13.16.2.1.2.9|4|temp1 1.3.6.1.4.1.2021.13.16.2.1.2.10|4|temp2 1.3.6.1.4.1.2021.13.16.2.1.2.11|4|temp3 @@ -1405,6 +1412,14 @@ 1.3.6.1.4.1.2021.13.16.2.1.3.13|66|25000 1.3.6.1.4.1.2021.13.16.2.1.3.14|66|25000 1.3.6.1.4.1.2021.13.16.2.1.3.15|66|25000 +1.3.6.1.4.1.2021.13.16.3.1.1.1|2|1 +1.3.6.1.4.1.2021.13.16.3.1.1.2|2|2 +1.3.6.1.4.1.2021.13.16.3.1.1.3|2|3 +1.3.6.1.4.1.2021.13.16.3.1.1.4|2|4 +1.3.6.1.4.1.2021.13.16.3.1.1.5|2|5 +1.3.6.1.4.1.2021.13.16.3.1.1.6|2|6 +1.3.6.1.4.1.2021.13.16.3.1.1.7|2|7 +1.3.6.1.4.1.2021.13.16.3.1.1.8|2|8 1.3.6.1.4.1.2021.13.16.3.1.2.1|4|fan1 1.3.6.1.4.1.2021.13.16.3.1.2.2|4|fan2 1.3.6.1.4.1.2021.13.16.3.1.2.3|4|fan3 diff --git a/tests/snmpsim/cumulus_edgecore-as4610-54p.snmprec b/tests/snmpsim/cumulus_edgecore-as4610-54p.snmprec index a323bbc399..d8ee6d9853 100644 --- a/tests/snmpsim/cumulus_edgecore-as4610-54p.snmprec +++ b/tests/snmpsim/cumulus_edgecore-as4610-54p.snmprec @@ -4959,8 +4959,10 @@ 1.3.6.1.4.1.2021.13.15.1.1.14.30|70|0 1.3.6.1.4.1.2021.13.15.1.1.14.31|70|0 1.3.6.1.4.1.2021.13.15.1.1.14.32|70|0 +1.3.6.1.4.1.2021.13.16.2.1.1.2|2|2 1.3.6.1.4.1.2021.13.16.2.1.2.2|4|ambient temp 1.3.6.1.4.1.2021.13.16.2.1.3.2|66|41500 +1.3.6.1.4.1.2021.13.16.3.1.1.1|2|1 1.3.6.1.4.1.2021.13.16.3.1.2.1|4|fan1 1.3.6.1.4.1.2021.13.16.3.1.3.1|66|6026 1.3.6.1.6.3.10.2.1.3.0|2|870526 diff --git a/tests/snmpsim/linux_powermon.snmprec b/tests/snmpsim/linux_powermon.snmprec index 8314775d11..1a9a8699bf 100644 --- a/tests/snmpsim/linux_powermon.snmprec +++ b/tests/snmpsim/linux_powermon.snmprec @@ -1519,6 +1519,7 @@ 1.3.6.1.4.1.2021.13.15.1.1.14.5|70|149000 1.3.6.1.4.1.2021.13.15.1.1.14.6|70|2018371000 1.3.6.1.4.1.2021.13.15.1.1.14.7|70|19000 +1.3.6.1.4.1.2021.13.16.2.1.1.1|2|1 1.3.6.1.4.1.2021.13.16.2.1.2.1|4|temp1 1.3.6.1.4.1.2021.13.16.2.1.3.1|66|8300 1.3.6.1.4.1.8072.1.3.2.2.1.21.5.120.109.114.105.103|2|1 diff --git a/tests/snmpsim/linux_raspberrypi-gpiomonitor.snmprec b/tests/snmpsim/linux_raspberrypi-gpiomonitor.snmprec index 93f1f8afc4..b445e29343 100644 --- a/tests/snmpsim/linux_raspberrypi-gpiomonitor.snmprec +++ b/tests/snmpsim/linux_raspberrypi-gpiomonitor.snmprec @@ -1286,6 +1286,7 @@ 1.3.6.1.4.1.2021.13.15.1.1.13.25|70|7337767936 1.3.6.1.4.1.2021.13.15.1.1.13.26|70|1024 1.3.6.1.4.1.2021.13.15.1.1.13.27|70|7337766912 +1.3.6.1.4.1.2021.13.16.2.1.1.1|2|1 1.3.6.1.4.1.2021.13.16.2.1.2.1|4|temp1 1.3.6.1.4.1.2021.13.16.2.1.3.1|66|36476 1.3.6.1.4.1.2021.7890.1.3.1.1.6.100.105.115.116.114.111|4|Raspbian 10.4 diff --git a/tests/snmpsim/recoveryos.snmprec b/tests/snmpsim/recoveryos.snmprec index 025e714e44..02c76601a9 100644 --- a/tests/snmpsim/recoveryos.snmprec +++ b/tests/snmpsim/recoveryos.snmprec @@ -675,6 +675,10 @@ 1.3.6.1.4.1.2021.13.15.1.1.13.12|70|12304896 1.3.6.1.4.1.2021.13.15.1.1.13.13|70|162040637952 1.3.6.1.4.1.2021.13.15.1.1.13.14|70|162040588800 +1.3.6.1.4.1.2021.13.16.2.1.1.1|2|1 +1.3.6.1.4.1.2021.13.16.2.1.1.2|2|2 +1.3.6.1.4.1.2021.13.16.2.1.1.3|2|3 +1.3.6.1.4.1.2021.13.16.2.1.1.4|2|4 1.3.6.1.4.1.2021.13.16.2.1.2.1|4|Physical id 0 1.3.6.1.4.1.2021.13.16.2.1.2.2|4|Core 0 1.3.6.1.4.1.2021.13.16.2.1.2.3|4|Physical id 2 diff --git a/tests/snmpsim/truenas.snmprec b/tests/snmpsim/truenas.snmprec index 584a773655..4d976f736e 100644 --- a/tests/snmpsim/truenas.snmprec +++ b/tests/snmpsim/truenas.snmprec @@ -1767,6 +1767,12 @@ 1.3.6.1.4.1.2021.13.15.1.1.13.66|70|32562192 1.3.6.1.4.1.2021.13.15.1.1.13.67|70|32562192 1.3.6.1.4.1.2021.13.15.1.1.13.68|70|0 +1.3.6.1.4.1.2021.13.16.2.1.1.1|2|1 +1.3.6.1.4.1.2021.13.16.2.1.1.2|2|2 +1.3.6.1.4.1.2021.13.16.2.1.1.3|2|3 +1.3.6.1.4.1.2021.13.16.2.1.1.4|2|4 +1.3.6.1.4.1.2021.13.16.2.1.1.5|2|5 +1.3.6.1.4.1.2021.13.16.2.1.1.6|2|6 1.3.6.1.4.1.2021.13.16.2.1.2.1|4|CPU0 1.3.6.1.4.1.2021.13.16.2.1.2.2|4|CPU1 1.3.6.1.4.1.2021.13.16.2.1.2.3|4|CPU2