From 640c16674282eda1d6c642ce7977a15906f4d8af Mon Sep 17 00:00:00 2001 From: Axemann Date: Thu, 1 Mar 2018 17:09:49 -0600 Subject: [PATCH 1/7] Add contact,relay,outlet discovery; update yaml,snmprec,json --- includes/definitions/aos-emu2.yaml | 41 + .../discovery/sensors/state/aos-emu2.inc.php | 204 +++++ tests/data/aos-emu2_ap9320.json | 788 ++++++++++++++++++ tests/snmpsim/aos-emu2_ap9320.snmprec | 52 +- 4 files changed, 1083 insertions(+), 2 deletions(-) create mode 100644 includes/discovery/sensors/state/aos-emu2.inc.php mode change 100755 => 100644 tests/data/aos-emu2_ap9320.json mode change 100755 => 100644 tests/snmpsim/aos-emu2_ap9320.snmprec diff --git a/includes/definitions/aos-emu2.yaml b/includes/definitions/aos-emu2.yaml index 6edab1c72299..b7070eb9cac5 100644 --- a/includes/definitions/aos-emu2.yaml +++ b/includes/definitions/aos-emu2.yaml @@ -2,9 +2,50 @@ os: aos-emu2 text: 'APC Environmental Monitoring Unit' type: environment icon: apc +over: + - {graph: device_temperature, text: Temperature} + - {graph: device_humidity, text: Humidity} mib_dir: - apc discovery: - sysObjectID: - .1.3.6.1.4.1.318.1.3.8.2 - .1.3.6.1.4.1.318.1.3.8.3 +discovery_modules: + ports: 0 + ports-stack: 0 + entity-physical: 0 + processors: 0 + mempools: 0 + cisco-vrf-lite: 0 + storage: 0 + hr-device: 0 + discovery-protocols: 0 + bgp-peers: 0 + vlans: 0 + ucd-diskio: 0 + services: 0 + stp: 0 + ntp: 0 + wireless: 0 + fdb-table: 0 +poller_modules: + ipmi: 0 + entity-physical: 0 + processors: 0 + mempools: 0 + storage: 0 + netstats: 0 + hr-mib: 0 + ucd-mib: 0 + ipSystemStats: 0 + ports: 0 + bgp-peers: 0 + ospf: 0 + ucd-diskio: 0 + services: 0 + stp: 0 + ntp: 0 + wireless: 0 + fdb-table: 0 + applications: 0 diff --git a/includes/discovery/sensors/state/aos-emu2.inc.php b/includes/discovery/sensors/state/aos-emu2.inc.php new file mode 100644 index 000000000000..7dcddf9944e7 --- /dev/null +++ b/includes/discovery/sensors/state/aos-emu2.inc.php @@ -0,0 +1,204 @@ +. + * + * @package LibreNMS + * @link http://librenms.org + * @copyright 2018 Ben Gibbons + * @author Ben Gibbons + */ + + // Input Contact discovery + +$contacts['emu2_contacts'] = snmpwalk_cache_oid($device, 'emsInputContactStatusEntry', array(), 'PowerNet-MIB'); + +foreach ($contacts['emu2_contacts'] as $id => $contact) { + $index = $contact['emsInputContactStatusInputContactIndex']; + $oid = '.1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.' . $index; + $descr = $contact['emsInputContactStatusInputContactName']; + $currentstate = $contact['emsInputContactStatusInputContactState']; + $normalstate = $contact['emsInputContactStatusInputContactNormalState']; + if (is_array($contacts['emu2_contacts']) && $normalstate == 'normallyClosedEMS') { + $state_name_nc = 'emsInputContactNormalState_NC'; + $state_index_id = create_state_index($state_name_nc); + if ($state_index_id !== null) { + $states = array( + array($state_index_id,'Normal',0,1,0) , + array($state_index_id,'Alert',0,2,1) + ); + foreach ($states as $value) { + $insert = array( + 'state_index_id' => $value[0], + 'state_descr' => $value[1], + 'state_draw_graph' => $value[2], + 'state_value' => $value[3], + 'state_generic_value' => $value[4] + ); + dbInsert($insert, 'state_translations'); + } + } + } + elseif (is_array($contacts['emu2_contacts']) && $normalstate == 'normallyOpenEMS') { + $state_name_no = 'emsInputContactNormalState_NO'; + $state_index_id = create_state_index($state_name_no); + if ($state_index_id !== null) { + $states = array( + array($state_index_id,'Normal',0,2,0) , + array($state_index_id,'Alert',0,1,1) + ); + foreach ($states as $value) { + $insert = array( + 'state_index_id' => $value[0], + 'state_descr' => $value[1], + 'state_draw_graph' => $value[2], + 'state_value' => $value[3], + 'state_generic_value' => $value[4] + ); + dbInsert($insert, 'state_translations'); + } + } + } + if ($normalstate == 'normallyClosedEMS') { + discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_nc, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); + create_sensor_to_state_index($device, $state_name_nc, $index); + } + elseif ($normalstate == 'normallyOpenEMS') { + discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_no, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); + create_sensor_to_state_index($device, $state_name_no, $index); + } +} + +// Output Relay discovery + +$relays['emu2_relays'] = snmpwalk_cache_oid($device, 'emsOutputRelayStatusEntry', array(), 'PowerNet-MIB'); + +foreach ($relays['emu2_relays'] as $id => $relay) { + $index = $relay['emsOutputRelayStatusOutputRelayIndex']; + $oid = '.1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.' . $index; + $descr = $relay['emsOutputRelayStatusOutputRelayName']; + $currentstate = $relay['emsOutputRelayStatusOutputRelayState']; + $normalstate = $relay['emsOutputRelayStatusOutputRelayNormalState']; + if (is_array($relays['emu2_relays']) && $normalstate == 'normallyClosedEMS') { + $state_name_nc = 'emsOutputRelayNormalState_NC'; + $state_index_id = create_state_index($state_name_nc); + if ($state_index_id !== null) { + $states = array( + array($state_index_id,'Normal',0,1,0) , + array($state_index_id,'Alert',0,2,1) + ); + foreach ($states as $value) { + $insert = array( + 'state_index_id' => $value[0], + 'state_descr' => $value[1], + 'state_draw_graph' => $value[2], + 'state_value' => $value[3], + 'state_generic_value' => $value[4] + ); + dbInsert($insert, 'state_translations'); + } + } + } + elseif (is_array($relays['emu2_relays']) && $normalstate == 'normallyOpenEMS') { + $state_name_no = 'emsOutputRelayNormalState_NO'; + $state_index_id = create_state_index($state_name_no); + if ($state_index_id !== null) { + $states = array( + array($state_index_id,'Normal',0,2,0) , + array($state_index_id,'Alert',0,1,1) + ); + foreach ($states as $value) { + $insert = array( + 'state_index_id' => $value[0], + 'state_descr' => $value[1], + 'state_draw_graph' => $value[2], + 'state_value' => $value[3], + 'state_generic_value' => $value[4] + ); + dbInsert($insert, 'state_translations'); + } + } + } + if ($normalstate == 'normallyClosedEMS') { + discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_nc, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); + create_sensor_to_state_index($device, $state_name_nc, $index); + } + elseif ($normalstate == 'normallyOpenEMS') { + discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_no, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); + create_sensor_to_state_index($device, $state_name_no, $index); + } +} + +// Outlet discovery + +$outlets['emu2_outlets'] = snmpwalk_cache_oid($device, 'emsOutletStatusEntry', array(), 'PowerNet-MIB'); + +foreach ($outlets['emu2_outlets'] as $id => $outlet) { + $index = $outlet['emsOutletStatusOutletIndex']; + $oid = '.1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.' . $index; + $descr = $outlet['emsOutletStatusOutletName']; + $currentstate = $outlet['emsOutletStatusOutletState']; + $normalstate = $outlet['emsOutletStatusOutletNormalState']; + if (is_array($outlets['emu2_outlets']) && $normalstate == 'normallyOnEMS') { + $state_name_on = 'emsOutletNormalState_ON'; + $state_index_id = create_state_index($state_name_on); + if ($state_index_id !== null) { + $states = array( + array($state_index_id,'On',0,1,0) , + array($state_index_id,'Off',0,2,1) + ); + foreach ($states as $value) { + $insert = array( + 'state_index_id' => $value[0], + 'state_descr' => $value[1], + 'state_draw_graph' => $value[2], + 'state_value' => $value[3], + 'state_generic_value' => $value[4] + ); + dbInsert($insert, 'state_translations'); + } + } + } + elseif (is_array($outlets['emu2_outlets']) && $normalstate == 'normallyOffEMS') { + $state_name_off = 'emsOutletNormalState_OFF'; + $state_index_id = create_state_index($state_name_off); + if ($state_index_id !== null) { + $states = array( + array($state_index_id,'Off',0,2,0) , + array($state_index_id,'On',0,1,1) + ); + foreach ($states as $value) { + $insert = array( + 'state_index_id' => $value[0], + 'state_descr' => $value[1], + 'state_draw_graph' => $value[2], + 'state_value' => $value[3], + 'state_generic_value' => $value[4] + ); + dbInsert($insert, 'state_translations'); + } + } + } + if ($normalstate == 'normallyOnEMS') { + discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_on, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); + create_sensor_to_state_index($device, $state_name_on, $index); + } + elseif ($normalstate == 'normallyOffEMS') { + discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_off, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); + create_sensor_to_state_index($device, $state_name_off, $index); + } +} diff --git a/tests/data/aos-emu2_ap9320.json b/tests/data/aos-emu2_ap9320.json old mode 100755 new mode 100644 index ccc9592338d9..c5096af00a39 --- a/tests/data/aos-emu2_ap9320.json +++ b/tests/data/aos-emu2_ap9320.json @@ -36,5 +36,793 @@ } ] } + }, + "sensors": { + "discovery": { + "sensors": [ + { + "sensor_deleted": "0", + "sensor_class": "humidity", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.13.1.1.6.2", + "sensor_index": "2", + "sensor_type": "aos-emu2", + "sensor_descr": "Loc Env Probe 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "36", + "sensor_limit": "99", + "sensor_limit_warn": "90", + "sensor_limit_low": "0", + "sensor_limit_low_warn": "8", + "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": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.1", + "sensor_index": "1", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 1", + "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": "1", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.2", + "sensor_index": "2", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 2", + "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": "2", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.3", + "sensor_index": "3", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 3", + "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": "3", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.4", + "sensor_index": "4", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 4", + "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": "4", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.5", + "sensor_index": "5", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 5", + "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": "5", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.6", + "sensor_index": "6", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 6", + "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": "6", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.7", + "sensor_index": "7", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 7", + "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": "7", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.8", + "sensor_index": "8", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 8", + "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": "8", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.1", + "sensor_index": "1", + "sensor_type": "emsOutputRelayNormalState_NO", + "sensor_descr": "Relay 1", + "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": "1", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsOutputRelayNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.2", + "sensor_index": "2", + "sensor_type": "emsOutputRelayNormalState_NO", + "sensor_descr": "Relay 2", + "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": "2", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsOutputRelayNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.1", + "sensor_index": "1", + "sensor_type": "emsOutletNormalState_OFF", + "sensor_descr": "Outlet 1", + "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": "1", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsOutletNormalState_OFF" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.2", + "sensor_index": "2", + "sensor_type": "emsOutletNormalState_OFF", + "sensor_descr": "Outlet 2", + "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": "2", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "emsOutletNormalState_OFF" + }, + { + "sensor_deleted": "0", + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.13.1.1.3.1", + "sensor_index": "1", + "sensor_type": "aos-emu2", + "sensor_descr": "Loc Env Probe 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "27.22", + "sensor_limit": "60", + "sensor_limit_warn": "29.44", + "sensor_limit_low": "0", + "sensor_limit_low_warn": "0.56", + "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.318.1.1.10.3.13.1.1.3.2", + "sensor_index": "2", + "sensor_type": "aos-emu2", + "sensor_descr": "Loc Env Probe 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "23.89", + "sensor_limit": "60", + "sensor_limit_warn": "26.67", + "sensor_limit_low": "0", + "sensor_limit_low_warn": "0.56", + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + } + ], + "state_indexes": [ + { + "state_name": "emsInputContactNormalState_NO", + "state_descr": "Alert", + "state_draw_graph": "0", + "state_value": "1", + "state_generic_value": "1" + }, + { + "state_name": "emsInputContactNormalState_NO", + "state_descr": "Normal", + "state_draw_graph": "0", + "state_value": "2", + "state_generic_value": "0" + }, + { + "state_name": "emsOutletNormalState_OFF", + "state_descr": "On", + "state_draw_graph": "0", + "state_value": "1", + "state_generic_value": "1" + }, + { + "state_name": "emsOutletNormalState_OFF", + "state_descr": "Off", + "state_draw_graph": "0", + "state_value": "2", + "state_generic_value": "0" + }, + { + "state_name": "emsOutputRelayNormalState_NO", + "state_descr": "Alert", + "state_draw_graph": "0", + "state_value": "1", + "state_generic_value": "1" + }, + { + "state_name": "emsOutputRelayNormalState_NO", + "state_descr": "Normal", + "state_draw_graph": "0", + "state_value": "2", + "state_generic_value": "0" + } + ] + }, + "poller": { + "sensors": [ + { + "sensor_deleted": "0", + "sensor_class": "humidity", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.13.1.1.6.2", + "sensor_index": "2", + "sensor_type": "aos-emu2", + "sensor_descr": "Loc Env Probe 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "36", + "sensor_limit": "99", + "sensor_limit_warn": "90", + "sensor_limit_low": "0", + "sensor_limit_low_warn": "8", + "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": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.1", + "sensor_index": "1", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "1", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.2", + "sensor_index": "2", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "2", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.3", + "sensor_index": "3", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 3", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "3", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.4", + "sensor_index": "4", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 4", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "4", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.5", + "sensor_index": "5", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 5", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "5", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.6", + "sensor_index": "6", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 6", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "6", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.7", + "sensor_index": "7", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 7", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "7", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.8", + "sensor_index": "8", + "sensor_type": "emsInputContactNormalState_NO", + "sensor_descr": "Contact 8", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "8", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsInputContactNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.1", + "sensor_index": "1", + "sensor_type": "emsOutputRelayNormalState_NO", + "sensor_descr": "Relay 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "1", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsOutputRelayNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.2", + "sensor_index": "2", + "sensor_type": "emsOutputRelayNormalState_NO", + "sensor_descr": "Relay 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "2", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsOutputRelayNormalState_NO" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.1", + "sensor_index": "1", + "sensor_type": "emsOutletNormalState_OFF", + "sensor_descr": "Outlet 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "1", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsOutletNormalState_OFF" + }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.2", + "sensor_index": "2", + "sensor_type": "emsOutletNormalState_OFF", + "sensor_descr": "Outlet 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "2", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "2", + "entPhysicalIndex_measured": null, + "sensor_prev": "0", + "user_func": null, + "state_name": "emsOutletNormalState_OFF" + }, + { + "sensor_deleted": "0", + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.13.1.1.3.1", + "sensor_index": "1", + "sensor_type": "aos-emu2", + "sensor_descr": "Loc Env Probe 1", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "27.22", + "sensor_limit": "60", + "sensor_limit_warn": "29.44", + "sensor_limit_low": "0", + "sensor_limit_low_warn": "0.56", + "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.318.1.1.10.3.13.1.1.3.2", + "sensor_index": "2", + "sensor_type": "aos-emu2", + "sensor_descr": "Loc Env Probe 2", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "23.89", + "sensor_limit": "60", + "sensor_limit_warn": "26.67", + "sensor_limit_low": "0", + "sensor_limit_low_warn": "0.56", + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + } + ], + "state_indexes": [ + { + "state_name": "emsInputContactNormalState_NO", + "state_descr": "Alert", + "state_draw_graph": "0", + "state_value": "1", + "state_generic_value": "1" + }, + { + "state_name": "emsInputContactNormalState_NO", + "state_descr": "Normal", + "state_draw_graph": "0", + "state_value": "2", + "state_generic_value": "0" + }, + { + "state_name": "emsOutletNormalState_OFF", + "state_descr": "On", + "state_draw_graph": "0", + "state_value": "1", + "state_generic_value": "1" + }, + { + "state_name": "emsOutletNormalState_OFF", + "state_descr": "Off", + "state_draw_graph": "0", + "state_value": "2", + "state_generic_value": "0" + }, + { + "state_name": "emsOutputRelayNormalState_NO", + "state_descr": "Alert", + "state_draw_graph": "0", + "state_value": "1", + "state_generic_value": "1" + }, + { + "state_name": "emsOutputRelayNormalState_NO", + "state_descr": "Normal", + "state_draw_graph": "0", + "state_value": "2", + "state_generic_value": "0" + } + ] + } } } diff --git a/tests/snmpsim/aos-emu2_ap9320.snmprec b/tests/snmpsim/aos-emu2_ap9320.snmprec old mode 100755 new mode 100644 index 2f846d00b9b7..4017f507c91c --- a/tests/snmpsim/aos-emu2_ap9320.snmprec +++ b/tests/snmpsim/aos-emu2_ap9320.snmprec @@ -1,6 +1,6 @@ 1.3.6.1.2.1.1.1.0|4|APC Environmental Management System (MB:v3.6.9 PF:v2.6.4 PN:apc_hw02_aos_264.bin AF1:v2.6.7 AN1:apc_hw02_ems_267.bin MN:AP9320 HR:4 SN: ZA0604022112 MD:01/20/2006) 1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.318.1.3.8.2 -1.3.6.1.2.1.1.3.0|67|237891673 +1.3.6.1.2.1.1.3.0|67|295462512 1.3.6.1.2.1.1.4.0|4| 1.3.6.1.2.1.1.5.0|4| 1.3.6.1.2.1.1.6.0|4| @@ -60,7 +60,7 @@ 1.3.6.1.4.1.318.1.1.10.3.13.1.1.5.9|2|33 1.3.6.1.4.1.318.1.1.10.3.13.1.1.5.10|2|33 1.3.6.1.4.1.318.1.1.10.3.13.1.1.6.1|2|-1 -1.3.6.1.4.1.318.1.1.10.3.13.1.1.6.2|2|33 +1.3.6.1.4.1.318.1.1.10.3.13.1.1.6.2|2|36 1.3.6.1.4.1.318.1.1.10.3.13.1.1.6.3|2|-1 1.3.6.1.4.1.318.1.1.10.3.13.1.1.6.4|2|-1 1.3.6.1.4.1.318.1.1.10.3.13.1.1.6.5|2|-1 @@ -159,3 +159,51 @@ 1.3.6.1.4.1.318.1.1.10.3.13.1.1.15.8|2|0 1.3.6.1.4.1.318.1.1.10.3.13.1.1.15.9|2|0 1.3.6.1.4.1.318.1.1.10.3.13.1.1.15.10|2|0 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.1.1|2|1 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.1.2|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.1.3|2|3 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.1.4|2|4 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.1.5|2|5 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.1.6|2|6 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.1.7|2|7 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.1.8|2|8 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.2.1|4|Contact 1 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.2.2|4|Contact 2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.2.3|4|Contact 3 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.2.4|4|Contact 4 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.2.5|4|Contact 5 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.2.6|4|Contact 6 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.2.7|4|Contact 7 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.2.8|4|Contact 8 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.1|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.2|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.3|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.4|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.5|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.6|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.7|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.8|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.1|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.2|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.3|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.4|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.5|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.6|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.7|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.8|2|2 +1.3.6.1.4.1.318.1.1.10.3.15.1.1.1.1|2|1 +1.3.6.1.4.1.318.1.1.10.3.15.1.1.1.2|2|2 +1.3.6.1.4.1.318.1.1.10.3.15.1.1.2.1|4|Relay 1 +1.3.6.1.4.1.318.1.1.10.3.15.1.1.2.2|4|Relay 2 +1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.1|2|2 +1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.2|2|2 +1.3.6.1.4.1.318.1.1.10.3.15.1.1.4.1|2|2 +1.3.6.1.4.1.318.1.1.10.3.15.1.1.4.2|2|2 +1.3.6.1.4.1.318.1.1.10.3.16.1.1.1.1|2|1 +1.3.6.1.4.1.318.1.1.10.3.16.1.1.1.2|2|2 +1.3.6.1.4.1.318.1.1.10.3.16.1.1.2.1|4|Outlet 1 +1.3.6.1.4.1.318.1.1.10.3.16.1.1.2.2|4|Outlet 2 +1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.1|2|2 +1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.2|2|2 +1.3.6.1.4.1.318.1.1.10.3.16.1.1.4.1|2|2 +1.3.6.1.4.1.318.1.1.10.3.16.1.1.4.2|2|2 From caf97fd80f47e931f01161b2eb0f8bc78e96ece1 Mon Sep 17 00:00:00 2001 From: axemann Date: Thu, 1 Mar 2018 18:23:30 -0600 Subject: [PATCH 2/7] Fix formatting --- .../discovery/sensors/state/aos-emu2.inc.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/includes/discovery/sensors/state/aos-emu2.inc.php b/includes/discovery/sensors/state/aos-emu2.inc.php index 7dcddf9944e7..3b923cb22a4f 100644 --- a/includes/discovery/sensors/state/aos-emu2.inc.php +++ b/includes/discovery/sensors/state/aos-emu2.inc.php @@ -52,8 +52,7 @@ dbInsert($insert, 'state_translations'); } } - } - elseif (is_array($contacts['emu2_contacts']) && $normalstate == 'normallyOpenEMS') { + } elseif (is_array($contacts['emu2_contacts']) && $normalstate == 'normallyOpenEMS') { $state_name_no = 'emsInputContactNormalState_NO'; $state_index_id = create_state_index($state_name_no); if ($state_index_id !== null) { @@ -76,8 +75,7 @@ if ($normalstate == 'normallyClosedEMS') { discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_nc, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); create_sensor_to_state_index($device, $state_name_nc, $index); - } - elseif ($normalstate == 'normallyOpenEMS') { + } elseif ($normalstate == 'normallyOpenEMS') { discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_no, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); create_sensor_to_state_index($device, $state_name_no, $index); } @@ -112,8 +110,7 @@ dbInsert($insert, 'state_translations'); } } - } - elseif (is_array($relays['emu2_relays']) && $normalstate == 'normallyOpenEMS') { + } elseif (is_array($relays['emu2_relays']) && $normalstate == 'normallyOpenEMS') { $state_name_no = 'emsOutputRelayNormalState_NO'; $state_index_id = create_state_index($state_name_no); if ($state_index_id !== null) { @@ -136,8 +133,7 @@ if ($normalstate == 'normallyClosedEMS') { discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_nc, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); create_sensor_to_state_index($device, $state_name_nc, $index); - } - elseif ($normalstate == 'normallyOpenEMS') { + } elseif ($normalstate == 'normallyOpenEMS') { discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_no, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); create_sensor_to_state_index($device, $state_name_no, $index); } @@ -172,8 +168,7 @@ dbInsert($insert, 'state_translations'); } } - } - elseif (is_array($outlets['emu2_outlets']) && $normalstate == 'normallyOffEMS') { + } elseif (is_array($outlets['emu2_outlets']) && $normalstate == 'normallyOffEMS') { $state_name_off = 'emsOutletNormalState_OFF'; $state_index_id = create_state_index($state_name_off); if ($state_index_id !== null) { @@ -196,8 +191,7 @@ if ($normalstate == 'normallyOnEMS') { discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_on, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); create_sensor_to_state_index($device, $state_name_on, $index); - } - elseif ($normalstate == 'normallyOffEMS') { + } elseif ($normalstate == 'normallyOffEMS') { discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_off, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); create_sensor_to_state_index($device, $state_name_off, $index); } From 82d53c1c2ccb5fe4d2c04a0f678158d257dfdac5 Mon Sep 17 00:00:00 2001 From: laf Date: Fri, 9 Mar 2018 18:33:03 +0000 Subject: [PATCH 3/7] Another attempt at fixing sensors --- tests/module_tables.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/module_tables.yaml b/tests/module_tables.yaml index fd6cdecc8b0e..aae8c153a315 100644 --- a/tests/module_tables.yaml +++ b/tests/module_tables.yaml @@ -38,6 +38,7 @@ sensors: joins: - { left: sensors.sensor_id, right: sensors_to_state_indexes.sensor_id } - { left: sensors_to_state_indexes.state_index_id, right: state_indexes.state_index_id } + order_by: sensors.sensor_class, sensors.sensor_type, sensors.sensor_index state_indexes: excluded_fields: [device_id, sensor_id, state_translation_id, state_index_id, state_lastupdated] joins: From 1910e065bd0b2589c1f6c20a60d19b673736c178 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sat, 17 Mar 2018 13:04:34 -0500 Subject: [PATCH 4/7] Update state mappings and fix json sensor ordering --- .../discovery/sensors/state/aos-emu2.inc.php | 144 +++++------------- tests/data/aos-emu2_ap9320.json | 80 +++++----- 2 files changed, 76 insertions(+), 148 deletions(-) diff --git a/includes/discovery/sensors/state/aos-emu2.inc.php b/includes/discovery/sensors/state/aos-emu2.inc.php index 3b923cb22a4f..2a3a596fe6b4 100644 --- a/includes/discovery/sensors/state/aos-emu2.inc.php +++ b/includes/discovery/sensors/state/aos-emu2.inc.php @@ -34,43 +34,19 @@ $currentstate = $contact['emsInputContactStatusInputContactState']; $normalstate = $contact['emsInputContactStatusInputContactNormalState']; if (is_array($contacts['emu2_contacts']) && $normalstate == 'normallyClosedEMS') { - $state_name_nc = 'emsInputContactNormalState_NC'; - $state_index_id = create_state_index($state_name_nc); - if ($state_index_id !== null) { - $states = array( - array($state_index_id,'Normal',0,1,0) , - array($state_index_id,'Alert',0,2,1) - ); - foreach ($states as $value) { - $insert = array( - 'state_index_id' => $value[0], - 'state_descr' => $value[1], - 'state_draw_graph' => $value[2], - 'state_value' => $value[3], - 'state_generic_value' => $value[4] - ); - dbInsert($insert, 'state_translations'); - } - } + $state_name_nc = 'emsInputContactNormalState_NC'; + $states = array( + array('value' => 1, 'generic' => 0, 'graph' => 0, 'descr' => 'Closed'), + array('value' => 2, 'generic' => 1, 'graph' => 0, 'descr' => 'Open'), + ); + create_state_index($state_name_nc, $states); } elseif (is_array($contacts['emu2_contacts']) && $normalstate == 'normallyOpenEMS') { - $state_name_no = 'emsInputContactNormalState_NO'; - $state_index_id = create_state_index($state_name_no); - if ($state_index_id !== null) { - $states = array( - array($state_index_id,'Normal',0,2,0) , - array($state_index_id,'Alert',0,1,1) - ); - foreach ($states as $value) { - $insert = array( - 'state_index_id' => $value[0], - 'state_descr' => $value[1], - 'state_draw_graph' => $value[2], - 'state_value' => $value[3], - 'state_generic_value' => $value[4] - ); - dbInsert($insert, 'state_translations'); - } - } + $state_name_no = 'emsInputContactNormalState_NO'; + $states = array( + array('value' => 1, 'generic' => 1, 'graph' => 0, 'descr' => 'Closed'), + array('value' => 2, 'generic' => 0, 'graph' => 0, 'descr' => 'Open'), + ); + create_state_index($state_name_no, $states); } if ($normalstate == 'normallyClosedEMS') { discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_nc, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); @@ -92,43 +68,19 @@ $currentstate = $relay['emsOutputRelayStatusOutputRelayState']; $normalstate = $relay['emsOutputRelayStatusOutputRelayNormalState']; if (is_array($relays['emu2_relays']) && $normalstate == 'normallyClosedEMS') { - $state_name_nc = 'emsOutputRelayNormalState_NC'; - $state_index_id = create_state_index($state_name_nc); - if ($state_index_id !== null) { - $states = array( - array($state_index_id,'Normal',0,1,0) , - array($state_index_id,'Alert',0,2,1) - ); - foreach ($states as $value) { - $insert = array( - 'state_index_id' => $value[0], - 'state_descr' => $value[1], - 'state_draw_graph' => $value[2], - 'state_value' => $value[3], - 'state_generic_value' => $value[4] - ); - dbInsert($insert, 'state_translations'); - } - } + $state_name_nc = 'emsOutputRelayNormalState_NC'; + $states = array( + array('value' => 1, 'generic' => 0, 'graph' => 0, 'descr' => 'Closed'), + array('value' => 2, 'generic' => 1, 'graph' => 0, 'descr' => 'Open'), + ); + create_state_index($state_name_nc, $states); } elseif (is_array($relays['emu2_relays']) && $normalstate == 'normallyOpenEMS') { - $state_name_no = 'emsOutputRelayNormalState_NO'; - $state_index_id = create_state_index($state_name_no); - if ($state_index_id !== null) { - $states = array( - array($state_index_id,'Normal',0,2,0) , - array($state_index_id,'Alert',0,1,1) - ); - foreach ($states as $value) { - $insert = array( - 'state_index_id' => $value[0], - 'state_descr' => $value[1], - 'state_draw_graph' => $value[2], - 'state_value' => $value[3], - 'state_generic_value' => $value[4] - ); - dbInsert($insert, 'state_translations'); - } - } + $state_name_no = 'emsOutputRelayNormalState_NO'; + $states = array( + array('value' => 1, 'generic' => 1, 'graph' => 0, 'descr' => 'Closed'), + array('value' => 2, 'generic' => 0, 'graph' => 0, 'descr' => 'Open'), + ); + create_state_index($state_name_no, $states); } if ($normalstate == 'normallyClosedEMS') { discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_nc, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); @@ -150,43 +102,19 @@ $currentstate = $outlet['emsOutletStatusOutletState']; $normalstate = $outlet['emsOutletStatusOutletNormalState']; if (is_array($outlets['emu2_outlets']) && $normalstate == 'normallyOnEMS') { - $state_name_on = 'emsOutletNormalState_ON'; - $state_index_id = create_state_index($state_name_on); - if ($state_index_id !== null) { - $states = array( - array($state_index_id,'On',0,1,0) , - array($state_index_id,'Off',0,2,1) - ); - foreach ($states as $value) { - $insert = array( - 'state_index_id' => $value[0], - 'state_descr' => $value[1], - 'state_draw_graph' => $value[2], - 'state_value' => $value[3], - 'state_generic_value' => $value[4] - ); - dbInsert($insert, 'state_translations'); - } - } + $state_name_on = 'emsOutletNormalState_ON'; + $states = array( + array('value' => 1, 'generic' => 0, 'graph' => 0, 'descr' => 'On'), + array('value' => 2, 'generic' => 1, 'graph' => 0, 'descr' => 'Off'), + ); + create_state_index($state_name_on, $states); } elseif (is_array($outlets['emu2_outlets']) && $normalstate == 'normallyOffEMS') { - $state_name_off = 'emsOutletNormalState_OFF'; - $state_index_id = create_state_index($state_name_off); - if ($state_index_id !== null) { - $states = array( - array($state_index_id,'Off',0,2,0) , - array($state_index_id,'On',0,1,1) - ); - foreach ($states as $value) { - $insert = array( - 'state_index_id' => $value[0], - 'state_descr' => $value[1], - 'state_draw_graph' => $value[2], - 'state_value' => $value[3], - 'state_generic_value' => $value[4] - ); - dbInsert($insert, 'state_translations'); - } - } + $state_name_off = 'emsOutletNormalState_OFF'; + $states = array( + array('value' => 1, 'generic' => 1, 'graph' => 0, 'descr' => 'On'), + array('value' => 2, 'generic' => 0, 'graph' => 0, 'descr' => 'Off'), + ); + create_state_index($state_name_off, $states); } if ($normalstate == 'normallyOnEMS') { discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_on, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); diff --git a/tests/data/aos-emu2_ap9320.json b/tests/data/aos-emu2_ap9320.json index c5096af00a39..0aac9f164749 100644 --- a/tests/data/aos-emu2_ap9320.json +++ b/tests/data/aos-emu2_ap9320.json @@ -251,10 +251,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.1", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.1", "sensor_index": "1", - "sensor_type": "emsOutputRelayNormalState_NO", - "sensor_descr": "Relay 1", + "sensor_type": "emsOutletNormalState_OFF", + "sensor_descr": "Outlet 1", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "0", @@ -268,16 +268,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "emsOutputRelayNormalState_NO" + "state_name": "emsOutletNormalState_OFF" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.2", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.2", "sensor_index": "2", - "sensor_type": "emsOutputRelayNormalState_NO", - "sensor_descr": "Relay 2", + "sensor_type": "emsOutletNormalState_OFF", + "sensor_descr": "Outlet 2", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "0", @@ -291,16 +291,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "emsOutputRelayNormalState_NO" + "state_name": "emsOutletNormalState_OFF" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.1", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.1", "sensor_index": "1", - "sensor_type": "emsOutletNormalState_OFF", - "sensor_descr": "Outlet 1", + "sensor_type": "emsOutputRelayNormalState_NO", + "sensor_descr": "Relay 1", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "0", @@ -314,16 +314,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "emsOutletNormalState_OFF" + "state_name": "emsOutputRelayNormalState_NO" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.2", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.2", "sensor_index": "2", - "sensor_type": "emsOutletNormalState_OFF", - "sensor_descr": "Outlet 2", + "sensor_type": "emsOutputRelayNormalState_NO", + "sensor_descr": "Relay 2", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "0", @@ -337,7 +337,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "emsOutletNormalState_OFF" + "state_name": "emsOutputRelayNormalState_NO" }, { "sensor_deleted": "0", @@ -389,14 +389,14 @@ "state_indexes": [ { "state_name": "emsInputContactNormalState_NO", - "state_descr": "Alert", + "state_descr": "Closed", "state_draw_graph": "0", "state_value": "1", "state_generic_value": "1" }, { "state_name": "emsInputContactNormalState_NO", - "state_descr": "Normal", + "state_descr": "Open", "state_draw_graph": "0", "state_value": "2", "state_generic_value": "0" @@ -417,14 +417,14 @@ }, { "state_name": "emsOutputRelayNormalState_NO", - "state_descr": "Alert", + "state_descr": "Closed", "state_draw_graph": "0", "state_value": "1", "state_generic_value": "1" }, { "state_name": "emsOutputRelayNormalState_NO", - "state_descr": "Normal", + "state_descr": "Open", "state_draw_graph": "0", "state_value": "2", "state_generic_value": "0" @@ -644,10 +644,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.1", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.1", "sensor_index": "1", - "sensor_type": "emsOutputRelayNormalState_NO", - "sensor_descr": "Relay 1", + "sensor_type": "emsOutletNormalState_OFF", + "sensor_descr": "Outlet 1", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -661,16 +661,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": "0", "user_func": null, - "state_name": "emsOutputRelayNormalState_NO" + "state_name": "emsOutletNormalState_OFF" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.2", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.2", "sensor_index": "2", - "sensor_type": "emsOutputRelayNormalState_NO", - "sensor_descr": "Relay 2", + "sensor_type": "emsOutletNormalState_OFF", + "sensor_descr": "Outlet 2", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -684,16 +684,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": "0", "user_func": null, - "state_name": "emsOutputRelayNormalState_NO" + "state_name": "emsOutletNormalState_OFF" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.1", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.1", "sensor_index": "1", - "sensor_type": "emsOutletNormalState_OFF", - "sensor_descr": "Outlet 1", + "sensor_type": "emsOutputRelayNormalState_NO", + "sensor_descr": "Relay 1", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -707,16 +707,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": "0", "user_func": null, - "state_name": "emsOutletNormalState_OFF" + "state_name": "emsOutputRelayNormalState_NO" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.2", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.2", "sensor_index": "2", - "sensor_type": "emsOutletNormalState_OFF", - "sensor_descr": "Outlet 2", + "sensor_type": "emsOutputRelayNormalState_NO", + "sensor_descr": "Relay 2", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -730,7 +730,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": "0", "user_func": null, - "state_name": "emsOutletNormalState_OFF" + "state_name": "emsOutputRelayNormalState_NO" }, { "sensor_deleted": "0", @@ -782,14 +782,14 @@ "state_indexes": [ { "state_name": "emsInputContactNormalState_NO", - "state_descr": "Alert", + "state_descr": "Closed", "state_draw_graph": "0", "state_value": "1", "state_generic_value": "1" }, { "state_name": "emsInputContactNormalState_NO", - "state_descr": "Normal", + "state_descr": "Open", "state_draw_graph": "0", "state_value": "2", "state_generic_value": "0" @@ -810,14 +810,14 @@ }, { "state_name": "emsOutputRelayNormalState_NO", - "state_descr": "Alert", + "state_descr": "Closed", "state_draw_graph": "0", "state_value": "1", "state_generic_value": "1" }, { "state_name": "emsOutputRelayNormalState_NO", - "state_descr": "Normal", + "state_descr": "Open", "state_draw_graph": "0", "state_value": "2", "state_generic_value": "0" From 06f5615cd04372f71ea5c663f6a542903972686e Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sat, 17 Mar 2018 13:19:25 -0500 Subject: [PATCH 5/7] Capture values numerically. Remove extra if/else statement Make test data more interesting. --- .../discovery/sensors/state/aos-emu2.inc.php | 72 ++- tests/data/aos-emu2_ap9320.json | 440 ++---------------- tests/snmpsim/aos-emu2_ap9320.snmprec | 6 +- 3 files changed, 64 insertions(+), 454 deletions(-) diff --git a/includes/discovery/sensors/state/aos-emu2.inc.php b/includes/discovery/sensors/state/aos-emu2.inc.php index 2a3a596fe6b4..9d7d77d7b38e 100644 --- a/includes/discovery/sensors/state/aos-emu2.inc.php +++ b/includes/discovery/sensors/state/aos-emu2.inc.php @@ -25,7 +25,7 @@ // Input Contact discovery -$contacts['emu2_contacts'] = snmpwalk_cache_oid($device, 'emsInputContactStatusEntry', array(), 'PowerNet-MIB'); +$contacts['emu2_contacts'] = snmpwalk_group($device, 'emsInputContactStatusEntry','PowerNet-MIB'); foreach ($contacts['emu2_contacts'] as $id => $contact) { $index = $contact['emsInputContactStatusInputContactIndex']; @@ -33,33 +33,29 @@ $descr = $contact['emsInputContactStatusInputContactName']; $currentstate = $contact['emsInputContactStatusInputContactState']; $normalstate = $contact['emsInputContactStatusInputContactNormalState']; - if (is_array($contacts['emu2_contacts']) && $normalstate == 'normallyClosedEMS') { - $state_name_nc = 'emsInputContactNormalState_NC'; + if (is_array($contacts['emu2_contacts']) && $normalstate == '1') { + $state_name = 'emsInputContactNormalState_NC'; $states = array( array('value' => 1, 'generic' => 0, 'graph' => 0, 'descr' => 'Closed'), array('value' => 2, 'generic' => 1, 'graph' => 0, 'descr' => 'Open'), ); - create_state_index($state_name_nc, $states); - } elseif (is_array($contacts['emu2_contacts']) && $normalstate == 'normallyOpenEMS') { - $state_name_no = 'emsInputContactNormalState_NO'; + create_state_index($state_name, $states); + } elseif (is_array($contacts['emu2_contacts']) && $normalstate == '2') { + $state_name = 'emsInputContactNormalState_NO'; $states = array( array('value' => 1, 'generic' => 1, 'graph' => 0, 'descr' => 'Closed'), array('value' => 2, 'generic' => 0, 'graph' => 0, 'descr' => 'Open'), ); - create_state_index($state_name_no, $states); - } - if ($normalstate == 'normallyClosedEMS') { - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_nc, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); - create_sensor_to_state_index($device, $state_name_nc, $index); - } elseif ($normalstate == 'normallyOpenEMS') { - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_no, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); - create_sensor_to_state_index($device, $state_name_no, $index); + create_state_index($state_name, $states); } + + discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); + create_sensor_to_state_index($device, $state_name, $index); } // Output Relay discovery -$relays['emu2_relays'] = snmpwalk_cache_oid($device, 'emsOutputRelayStatusEntry', array(), 'PowerNet-MIB'); +$relays['emu2_relays'] = snmpwalk_group($device, 'emsOutputRelayStatusEntry', 'PowerNet-MIB'); foreach ($relays['emu2_relays'] as $id => $relay) { $index = $relay['emsOutputRelayStatusOutputRelayIndex']; @@ -67,33 +63,29 @@ $descr = $relay['emsOutputRelayStatusOutputRelayName']; $currentstate = $relay['emsOutputRelayStatusOutputRelayState']; $normalstate = $relay['emsOutputRelayStatusOutputRelayNormalState']; - if (is_array($relays['emu2_relays']) && $normalstate == 'normallyClosedEMS') { - $state_name_nc = 'emsOutputRelayNormalState_NC'; + if (is_array($relays['emu2_relays']) && $normalstate == '1') { + $state_name = 'emsOutputRelayNormalState_NC'; $states = array( array('value' => 1, 'generic' => 0, 'graph' => 0, 'descr' => 'Closed'), array('value' => 2, 'generic' => 1, 'graph' => 0, 'descr' => 'Open'), ); - create_state_index($state_name_nc, $states); - } elseif (is_array($relays['emu2_relays']) && $normalstate == 'normallyOpenEMS') { - $state_name_no = 'emsOutputRelayNormalState_NO'; + create_state_index($state_name, $states); + } elseif (is_array($relays['emu2_relays']) && $normalstate == '2') { + $state_name = 'emsOutputRelayNormalState_NO'; $states = array( array('value' => 1, 'generic' => 1, 'graph' => 0, 'descr' => 'Closed'), array('value' => 2, 'generic' => 0, 'graph' => 0, 'descr' => 'Open'), ); - create_state_index($state_name_no, $states); - } - if ($normalstate == 'normallyClosedEMS') { - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_nc, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); - create_sensor_to_state_index($device, $state_name_nc, $index); - } elseif ($normalstate == 'normallyOpenEMS') { - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_no, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); - create_sensor_to_state_index($device, $state_name_no, $index); + create_state_index($state_name, $states); } + + discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); + create_sensor_to_state_index($device, $state_name, $index); } // Outlet discovery -$outlets['emu2_outlets'] = snmpwalk_cache_oid($device, 'emsOutletStatusEntry', array(), 'PowerNet-MIB'); +$outlets['emu2_outlets'] = snmpwalk_group($device, 'emsOutletStatusEntry', 'PowerNet-MIB'); foreach ($outlets['emu2_outlets'] as $id => $outlet) { $index = $outlet['emsOutletStatusOutletIndex']; @@ -101,26 +93,22 @@ $descr = $outlet['emsOutletStatusOutletName']; $currentstate = $outlet['emsOutletStatusOutletState']; $normalstate = $outlet['emsOutletStatusOutletNormalState']; - if (is_array($outlets['emu2_outlets']) && $normalstate == 'normallyOnEMS') { - $state_name_on = 'emsOutletNormalState_ON'; + if (is_array($outlets['emu2_outlets']) && $normalstate == '1') { + $state_name = 'emsOutletNormalState_ON'; $states = array( array('value' => 1, 'generic' => 0, 'graph' => 0, 'descr' => 'On'), array('value' => 2, 'generic' => 1, 'graph' => 0, 'descr' => 'Off'), ); - create_state_index($state_name_on, $states); - } elseif (is_array($outlets['emu2_outlets']) && $normalstate == 'normallyOffEMS') { - $state_name_off = 'emsOutletNormalState_OFF'; + create_state_index($state_name, $states); + } elseif (is_array($outlets['emu2_outlets']) && $normalstate == '2') { + $state_name = 'emsOutletNormalState_OFF'; $states = array( array('value' => 1, 'generic' => 1, 'graph' => 0, 'descr' => 'On'), array('value' => 2, 'generic' => 0, 'graph' => 0, 'descr' => 'Off'), ); - create_state_index($state_name_off, $states); - } - if ($normalstate == 'normallyOnEMS') { - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_on, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); - create_sensor_to_state_index($device, $state_name_on, $index); - } elseif ($normalstate == 'normallyOffEMS') { - discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name_off, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); - create_sensor_to_state_index($device, $state_name_off, $index); + create_state_index($state_name, $states); } + + discover_sensor($valid['sensor'], 'state', $device, $oid, $index, $state_name, $descr, '1', '1', null, null, null, null, $currentstate, 'snmp', $index); + create_sensor_to_state_index($device, $state_name, $index); } diff --git a/tests/data/aos-emu2_ap9320.json b/tests/data/aos-emu2_ap9320.json index 0aac9f164749..df6ac37050f7 100644 --- a/tests/data/aos-emu2_ap9320.json +++ b/tests/data/aos-emu2_ap9320.json @@ -63,178 +63,17 @@ "user_func": null, "state_name": null }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.1", - "sensor_index": "1", - "sensor_type": "emsInputContactNormalState_NO", - "sensor_descr": "Contact 1", - "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": "1", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "emsInputContactNormalState_NO" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.2", - "sensor_index": "2", - "sensor_type": "emsInputContactNormalState_NO", - "sensor_descr": "Contact 2", - "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": "2", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "emsInputContactNormalState_NO" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.3", - "sensor_index": "3", - "sensor_type": "emsInputContactNormalState_NO", - "sensor_descr": "Contact 3", - "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": "3", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "emsInputContactNormalState_NO" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.4", - "sensor_index": "4", - "sensor_type": "emsInputContactNormalState_NO", - "sensor_descr": "Contact 4", - "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": "4", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "emsInputContactNormalState_NO" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.5", - "sensor_index": "5", - "sensor_type": "emsInputContactNormalState_NO", - "sensor_descr": "Contact 5", - "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": "5", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "emsInputContactNormalState_NO" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.6", - "sensor_index": "6", - "sensor_type": "emsInputContactNormalState_NO", - "sensor_descr": "Contact 6", - "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": "6", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "emsInputContactNormalState_NO" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.7", - "sensor_index": "7", - "sensor_type": "emsInputContactNormalState_NO", - "sensor_descr": "Contact 7", - "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": "7", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "emsInputContactNormalState_NO" - }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.8", "sensor_index": "8", - "sensor_type": "emsInputContactNormalState_NO", + "sensor_type": "emsInputContactNormalState_NC", "sensor_descr": "Contact 8", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "0", + "sensor_current": "1", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -245,216 +84,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "emsInputContactNormalState_NO" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.1", - "sensor_index": "1", - "sensor_type": "emsOutletNormalState_OFF", - "sensor_descr": "Outlet 1", - "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": "1", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "emsOutletNormalState_OFF" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.16.1.1.3.2", - "sensor_index": "2", - "sensor_type": "emsOutletNormalState_OFF", - "sensor_descr": "Outlet 2", - "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": "2", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "emsOutletNormalState_OFF" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.1", - "sensor_index": "1", - "sensor_type": "emsOutputRelayNormalState_NO", - "sensor_descr": "Relay 1", - "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": "1", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "emsOutputRelayNormalState_NO" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.15.1.1.3.2", - "sensor_index": "2", - "sensor_type": "emsOutputRelayNormalState_NO", - "sensor_descr": "Relay 2", - "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": "2", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "emsOutputRelayNormalState_NO" - }, - { - "sensor_deleted": "0", - "sensor_class": "temperature", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.13.1.1.3.1", - "sensor_index": "1", - "sensor_type": "aos-emu2", - "sensor_descr": "Loc Env Probe 1", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "27.22", - "sensor_limit": "60", - "sensor_limit_warn": "29.44", - "sensor_limit_low": "0", - "sensor_limit_low_warn": "0.56", - "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.318.1.1.10.3.13.1.1.3.2", - "sensor_index": "2", - "sensor_type": "aos-emu2", - "sensor_descr": "Loc Env Probe 2", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "23.89", - "sensor_limit": "60", - "sensor_limit_warn": "26.67", - "sensor_limit_low": "0", - "sensor_limit_low_warn": "0.56", - "sensor_alert": "1", - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": null - } - ], - "state_indexes": [ - { - "state_name": "emsInputContactNormalState_NO", - "state_descr": "Closed", - "state_draw_graph": "0", - "state_value": "1", - "state_generic_value": "1" - }, - { - "state_name": "emsInputContactNormalState_NO", - "state_descr": "Open", - "state_draw_graph": "0", - "state_value": "2", - "state_generic_value": "0" - }, - { - "state_name": "emsOutletNormalState_OFF", - "state_descr": "On", - "state_draw_graph": "0", - "state_value": "1", - "state_generic_value": "1" - }, - { - "state_name": "emsOutletNormalState_OFF", - "state_descr": "Off", - "state_draw_graph": "0", - "state_value": "2", - "state_generic_value": "0" - }, - { - "state_name": "emsOutputRelayNormalState_NO", - "state_descr": "Closed", - "state_draw_graph": "0", - "state_value": "1", - "state_generic_value": "1" - }, - { - "state_name": "emsOutputRelayNormalState_NO", - "state_descr": "Open", - "state_draw_graph": "0", - "state_value": "2", - "state_generic_value": "0" - } - ] - }, - "poller": { - "sensors": [ - { - "sensor_deleted": "0", - "sensor_class": "humidity", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.13.1.1.6.2", - "sensor_index": "2", - "sensor_type": "aos-emu2", - "sensor_descr": "Loc Env Probe 2", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "36", - "sensor_limit": "99", - "sensor_limit_warn": "90", - "sensor_limit_low": "0", - "sensor_limit_low_warn": "8", - "sensor_alert": "1", - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": null + "state_name": "emsInputContactNormalState_NC" }, { "sensor_deleted": "0", @@ -475,7 +105,7 @@ "sensor_custom": "No", "entPhysicalIndex": "1", "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": "emsInputContactNormalState_NO" }, @@ -498,7 +128,7 @@ "sensor_custom": "No", "entPhysicalIndex": "2", "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": "emsInputContactNormalState_NO" }, @@ -521,7 +151,7 @@ "sensor_custom": "No", "entPhysicalIndex": "3", "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": "emsInputContactNormalState_NO" }, @@ -544,7 +174,7 @@ "sensor_custom": "No", "entPhysicalIndex": "4", "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": "emsInputContactNormalState_NO" }, @@ -567,7 +197,7 @@ "sensor_custom": "No", "entPhysicalIndex": "5", "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": "emsInputContactNormalState_NO" }, @@ -590,7 +220,7 @@ "sensor_custom": "No", "entPhysicalIndex": "6", "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": "emsInputContactNormalState_NO" }, @@ -604,7 +234,7 @@ "sensor_descr": "Contact 7", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "2", + "sensor_current": "1", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -613,30 +243,7 @@ "sensor_custom": "No", "entPhysicalIndex": "7", "entPhysicalIndex_measured": null, - "sensor_prev": "0", - "user_func": null, - "state_name": "emsInputContactNormalState_NO" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.8", - "sensor_index": "8", - "sensor_type": "emsInputContactNormalState_NO", - "sensor_descr": "Contact 8", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "2", - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": "1", - "sensor_custom": "No", - "entPhysicalIndex": "8", - "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": "emsInputContactNormalState_NO" }, @@ -659,7 +266,7 @@ "sensor_custom": "No", "entPhysicalIndex": "1", "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": "emsOutletNormalState_OFF" }, @@ -682,7 +289,7 @@ "sensor_custom": "No", "entPhysicalIndex": "2", "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": "emsOutletNormalState_OFF" }, @@ -705,7 +312,7 @@ "sensor_custom": "No", "entPhysicalIndex": "1", "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": "emsOutputRelayNormalState_NO" }, @@ -728,7 +335,7 @@ "sensor_custom": "No", "entPhysicalIndex": "2", "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": "emsOutputRelayNormalState_NO" }, @@ -780,6 +387,20 @@ } ], "state_indexes": [ + { + "state_name": "emsInputContactNormalState_NC", + "state_descr": "Closed", + "state_draw_graph": "0", + "state_value": "1", + "state_generic_value": "0" + }, + { + "state_name": "emsInputContactNormalState_NC", + "state_descr": "Open", + "state_draw_graph": "0", + "state_value": "2", + "state_generic_value": "1" + }, { "state_name": "emsInputContactNormalState_NO", "state_descr": "Closed", @@ -823,6 +444,7 @@ "state_generic_value": "0" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/snmpsim/aos-emu2_ap9320.snmprec b/tests/snmpsim/aos-emu2_ap9320.snmprec index 4017f507c91c..e70725f0f957 100644 --- a/tests/snmpsim/aos-emu2_ap9320.snmprec +++ b/tests/snmpsim/aos-emu2_ap9320.snmprec @@ -181,8 +181,8 @@ 1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.4|2|2 1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.5|2|2 1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.6|2|2 -1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.7|2|2 -1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.8|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.7|2|1 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.3.8|2|1 1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.1|2|2 1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.2|2|2 1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.3|2|2 @@ -190,7 +190,7 @@ 1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.5|2|2 1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.6|2|2 1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.7|2|2 -1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.8|2|2 +1.3.6.1.4.1.318.1.1.10.3.14.1.1.4.8|2|1 1.3.6.1.4.1.318.1.1.10.3.15.1.1.1.1|2|1 1.3.6.1.4.1.318.1.1.10.3.15.1.1.1.2|2|2 1.3.6.1.4.1.318.1.1.10.3.15.1.1.2.1|4|Relay 1 From 25002512b07f783500388b2867f901e66d84184e Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sat, 17 Mar 2018 13:22:54 -0500 Subject: [PATCH 6/7] Fix whitespace. --- includes/discovery/sensors/state/aos-emu2.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/discovery/sensors/state/aos-emu2.inc.php b/includes/discovery/sensors/state/aos-emu2.inc.php index 9d7d77d7b38e..ad70933dd1bb 100644 --- a/includes/discovery/sensors/state/aos-emu2.inc.php +++ b/includes/discovery/sensors/state/aos-emu2.inc.php @@ -25,7 +25,7 @@ // Input Contact discovery -$contacts['emu2_contacts'] = snmpwalk_group($device, 'emsInputContactStatusEntry','PowerNet-MIB'); +$contacts['emu2_contacts'] = snmpwalk_group($device, 'emsInputContactStatusEntry', 'PowerNet-MIB'); foreach ($contacts['emu2_contacts'] as $id => $contact) { $index = $contact['emsInputContactStatusInputContactIndex']; From fc335899b80ebcd1c83fac084c55678d72107be2 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Sat, 17 Mar 2018 13:38:49 -0500 Subject: [PATCH 7/7] Update sensors test data for order_by --- tests/data/awplus.json | 792 +++++++++++++-------------- tests/data/drac.json | 450 +++++++-------- tests/data/fusion.json | 146 ++--- tests/data/gaia.json | 32 +- tests/data/netonix_wispswitch.json | 94 ++-- tests/data/pcoweb-rittalchiller.json | 450 +++++++-------- tests/data/procurve.json | 92 ++-- tests/data/routeros.json | 208 +++---- 8 files changed, 1132 insertions(+), 1132 deletions(-) diff --git a/tests/data/awplus.json b/tests/data/awplus.json index 6e2f22e7ec0d..5b2009e8d023 100644 --- a/tests/data/awplus.json +++ b/tests/data/awplus.json @@ -9769,6 +9769,98 @@ "sensors": { "discovery": { "sensors": [ + { + "sensor_deleted": "0", + "sensor_class": "fanspeed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.1.10.1", + "sensor_index": "atEnvMonv2FanIndex.1.10.1", + "sensor_type": "awplus", + "sensor_descr": "Fan: Fan Tray B 1 Int", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "4069", + "sensor_limit": "7324.2", + "sensor_limit_warn": null, + "sensor_limit_low": "3000", + "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": "fanspeed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.1.10.2", + "sensor_index": "atEnvMonv2FanIndex.1.10.2", + "sensor_type": "awplus", + "sensor_descr": "Fan: Fan Tray B 1 Ext", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "3643", + "sensor_limit": "6557.4", + "sensor_limit_warn": null, + "sensor_limit_low": "3000", + "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": "fanspeed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.1.10.3", + "sensor_index": "atEnvMonv2FanIndex.1.10.3", + "sensor_type": "awplus", + "sensor_descr": "Fan: Fan Tray B 2 Int", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "3973", + "sensor_limit": "7151.4", + "sensor_limit_warn": null, + "sensor_limit_low": "3000", + "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": "fanspeed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.1.10.4", + "sensor_index": "atEnvMonv2FanIndex.1.10.4", + "sensor_type": "awplus", + "sensor_descr": "Fan: Fan Tray B 2 Ext", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "3633", + "sensor_limit": "6539.4", + "sensor_limit_warn": null, + "sensor_limit_low": "3000", + "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": "fanspeed", @@ -9865,14 +9957,14 @@ "sensor_deleted": "0", "sensor_class": "fanspeed", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.1.10.1", - "sensor_index": "atEnvMonv2FanIndex.1.10.1", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.2.10.1", + "sensor_index": "atEnvMonv2FanIndex.2.10.1", "sensor_type": "awplus", "sensor_descr": "Fan: Fan Tray B 1 Int", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "4069", - "sensor_limit": "7324.2", + "sensor_current": "4020", + "sensor_limit": "7236", "sensor_limit_warn": null, "sensor_limit_low": "3000", "sensor_limit_low_warn": null, @@ -9888,14 +9980,14 @@ "sensor_deleted": "0", "sensor_class": "fanspeed", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.1.10.2", - "sensor_index": "atEnvMonv2FanIndex.1.10.2", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.2.10.2", + "sensor_index": "atEnvMonv2FanIndex.2.10.2", "sensor_type": "awplus", "sensor_descr": "Fan: Fan Tray B 1 Ext", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3643", - "sensor_limit": "6557.4", + "sensor_current": "3683", + "sensor_limit": "6629.4", "sensor_limit_warn": null, "sensor_limit_low": "3000", "sensor_limit_low_warn": null, @@ -9911,8 +10003,8 @@ "sensor_deleted": "0", "sensor_class": "fanspeed", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.1.10.3", - "sensor_index": "atEnvMonv2FanIndex.1.10.3", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.2.10.3", + "sensor_index": "atEnvMonv2FanIndex.2.10.3", "sensor_type": "awplus", "sensor_descr": "Fan: Fan Tray B 2 Int", "sensor_divisor": "1", @@ -9934,14 +10026,14 @@ "sensor_deleted": "0", "sensor_class": "fanspeed", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.1.10.4", - "sensor_index": "atEnvMonv2FanIndex.1.10.4", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.2.10.4", + "sensor_index": "atEnvMonv2FanIndex.2.10.4", "sensor_type": "awplus", "sensor_descr": "Fan: Fan Tray B 2 Ext", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3633", - "sensor_limit": "6539.4", + "sensor_current": "3534", + "sensor_limit": "6361.2", "sensor_limit_warn": null, "sensor_limit_low": "3000", "sensor_limit_low_warn": null, @@ -10047,18 +10139,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "fanspeed", + "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.2.10.1", - "sensor_index": "atEnvMonv2FanIndex.2.10.1", - "sensor_type": "awplus", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.1.10.1", + "sensor_index": "atEnvMonv2FanIndex.1.10.1", + "sensor_type": "FanState", "sensor_descr": "Fan: Fan Tray B 1 Int", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "4020", - "sensor_limit": "7236", + "sensor_current": "2", + "sensor_limit": null, "sensor_limit_warn": null, - "sensor_limit_low": "3000", + "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -10066,22 +10158,22 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": null + "state_name": "FanState" }, { "sensor_deleted": "0", - "sensor_class": "fanspeed", + "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.2.10.2", - "sensor_index": "atEnvMonv2FanIndex.2.10.2", - "sensor_type": "awplus", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.1.10.2", + "sensor_index": "atEnvMonv2FanIndex.1.10.2", + "sensor_type": "FanState", "sensor_descr": "Fan: Fan Tray B 1 Ext", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3683", - "sensor_limit": "6629.4", + "sensor_current": "2", + "sensor_limit": null, "sensor_limit_warn": null, - "sensor_limit_low": "3000", + "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -10089,22 +10181,22 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": null + "state_name": "FanState" }, { "sensor_deleted": "0", - "sensor_class": "fanspeed", + "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.2.10.3", - "sensor_index": "atEnvMonv2FanIndex.2.10.3", - "sensor_type": "awplus", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.1.10.3", + "sensor_index": "atEnvMonv2FanIndex.1.10.3", + "sensor_type": "FanState", "sensor_descr": "Fan: Fan Tray B 2 Int", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3973", - "sensor_limit": "7151.4", + "sensor_current": "2", + "sensor_limit": null, "sensor_limit_warn": null, - "sensor_limit_low": "3000", + "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -10112,22 +10204,22 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": null + "state_name": "FanState" }, { "sensor_deleted": "0", - "sensor_class": "fanspeed", + "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.5.2.10.4", - "sensor_index": "atEnvMonv2FanIndex.2.10.4", - "sensor_type": "awplus", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.1.10.4", + "sensor_index": "atEnvMonv2FanIndex.1.10.4", + "sensor_type": "FanState", "sensor_descr": "Fan: Fan Tray B 2 Ext", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3534", - "sensor_limit": "6361.2", + "sensor_current": "2", + "sensor_limit": null, "sensor_limit_warn": null, - "sensor_limit_low": "3000", + "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -10135,7 +10227,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": null + "state_name": "FanState" }, { "sensor_deleted": "0", @@ -10233,8 +10325,8 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.1.10.1", - "sensor_index": "atEnvMonv2FanIndex.1.10.1", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.2.10.1", + "sensor_index": "atEnvMonv2FanIndex.2.10.1", "sensor_type": "FanState", "sensor_descr": "Fan: Fan Tray B 1 Int", "sensor_divisor": "1", @@ -10256,8 +10348,8 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.1.10.2", - "sensor_index": "atEnvMonv2FanIndex.1.10.2", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.2.10.2", + "sensor_index": "atEnvMonv2FanIndex.2.10.2", "sensor_type": "FanState", "sensor_descr": "Fan: Fan Tray B 1 Ext", "sensor_divisor": "1", @@ -10279,8 +10371,8 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.1.10.3", - "sensor_index": "atEnvMonv2FanIndex.1.10.3", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.2.10.3", + "sensor_index": "atEnvMonv2FanIndex.2.10.3", "sensor_type": "FanState", "sensor_descr": "Fan: Fan Tray B 2 Int", "sensor_divisor": "1", @@ -10302,8 +10394,8 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.1.10.4", - "sensor_index": "atEnvMonv2FanIndex.1.10.4", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.2.10.4", + "sensor_index": "atEnvMonv2FanIndex.2.10.4", "sensor_type": "FanState", "sensor_descr": "Fan: Fan Tray B 2 Ext", "sensor_divisor": "1", @@ -10417,10 +10509,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.2.10.1", - "sensor_index": "atEnvMonv2FanIndex.2.10.1", - "sensor_type": "FanState", - "sensor_descr": "Fan: Fan Tray B 1 Int", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.1.1.2", + "sensor_index": "atEnvMonv2PsbSensorIndex.1.1.2", + "sensor_type": "PowerSupplyState", + "sensor_descr": "Fan/Temperature Fault", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10434,16 +10526,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "FanState" + "state_name": "PowerSupplyState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.2.10.2", - "sensor_index": "atEnvMonv2FanIndex.2.10.2", - "sensor_type": "FanState", - "sensor_descr": "Fan: Fan Tray B 1 Ext", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.1.1.3", + "sensor_index": "atEnvMonv2PsbSensorIndex.1.1.3", + "sensor_type": "PowerSupplyState", + "sensor_descr": "PSU Power Output", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10457,16 +10549,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "FanState" + "state_name": "PowerSupplyState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.2.10.3", - "sensor_index": "atEnvMonv2FanIndex.2.10.3", - "sensor_type": "FanState", - "sensor_descr": "Fan: Fan Tray B 2 Int", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.1.1.4", + "sensor_index": "atEnvMonv2PsbSensorIndex.1.1.4", + "sensor_type": "PowerSupplyState", + "sensor_descr": "PSU Power Input", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10480,16 +10572,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "FanState" + "state_name": "PowerSupplyState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.1.1.7.2.10.4", - "sensor_index": "atEnvMonv2FanIndex.2.10.4", - "sensor_type": "FanState", - "sensor_descr": "Fan: Fan Tray B 2 Ext", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.2.1.2", + "sensor_index": "atEnvMonv2PsbSensorIndex.2.1.2", + "sensor_type": "PowerSupplyState", + "sensor_descr": "Fan/Temperature Fault", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10503,16 +10595,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "FanState" + "state_name": "PowerSupplyState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.5.1", - "sensor_index": "atEnvMonv2VoltageIndex.1.5.1", - "sensor_type": "VoltageState", - "sensor_descr": "Voltage: 2.5V", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.2.1.3", + "sensor_index": "atEnvMonv2PsbSensorIndex.2.1.3", + "sensor_type": "PowerSupplyState", + "sensor_descr": "PSU Power Output", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10526,62 +10618,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "VoltageState" + "state_name": "PowerSupplyState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.5.2", - "sensor_index": "atEnvMonv2VoltageIndex.1.5.2", - "sensor_type": "VoltageState", - "sensor_descr": "Voltage: Battery", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "2", - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": "1", - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "VoltageState" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.5.3", - "sensor_index": "atEnvMonv2VoltageIndex.1.5.3", - "sensor_type": "VoltageState", - "sensor_descr": "Voltage: 3.3V", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "2", - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": "1", - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "VoltageState" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.5.4", - "sensor_index": "atEnvMonv2VoltageIndex.1.5.4", - "sensor_type": "VoltageState", - "sensor_descr": "Voltage: 12V", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.2.1.4", + "sensor_index": "atEnvMonv2PsbSensorIndex.2.1.4", + "sensor_type": "PowerSupplyState", + "sensor_descr": "PSU Power Input", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10595,16 +10641,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "VoltageState" + "state_name": "PowerSupplyState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.5.5", - "sensor_index": "atEnvMonv2VoltageIndex.1.5.5", - "sensor_type": "VoltageState", - "sensor_descr": "Voltage: 1V", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.10", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.10", + "sensor_type": "TemperatureState", + "sensor_descr": "Temp: Fan Tray B 2", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10618,16 +10664,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "VoltageState" + "state_name": "TemperatureState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.2.5.1", - "sensor_index": "atEnvMonv2VoltageIndex.2.5.1", - "sensor_type": "VoltageState", - "sensor_descr": "Voltage: 2.5V", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.11", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.11", + "sensor_type": "TemperatureState", + "sensor_descr": "Temp: Near Switch", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10641,16 +10687,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "VoltageState" + "state_name": "TemperatureState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.2.5.2", - "sensor_index": "atEnvMonv2VoltageIndex.2.5.2", - "sensor_type": "VoltageState", - "sensor_descr": "Voltage: Battery", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.12", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.12", + "sensor_type": "TemperatureState", + "sensor_descr": "Temp: Front Left", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10664,16 +10710,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "VoltageState" + "state_name": "TemperatureState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.2.5.3", - "sensor_index": "atEnvMonv2VoltageIndex.2.5.3", - "sensor_type": "VoltageState", - "sensor_descr": "Voltage: 3.3V", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.13", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.13", + "sensor_type": "TemperatureState", + "sensor_descr": "Temp: Front Mid", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10687,16 +10733,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "VoltageState" + "state_name": "TemperatureState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.2.5.4", - "sensor_index": "atEnvMonv2VoltageIndex.2.5.4", - "sensor_type": "VoltageState", - "sensor_descr": "Voltage: 12V", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.14", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.14", + "sensor_type": "TemperatureState", + "sensor_descr": "Temp: Front Right", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10710,16 +10756,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "VoltageState" + "state_name": "TemperatureState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.2.5.5", - "sensor_index": "atEnvMonv2VoltageIndex.2.5.5", - "sensor_type": "VoltageState", - "sensor_descr": "Voltage: 1V", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.15", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.15", + "sensor_type": "TemperatureState", + "sensor_descr": "Temp: Console", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10733,7 +10779,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "VoltageState" + "state_name": "TemperatureState" }, { "sensor_deleted": "0", @@ -10831,10 +10877,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.10", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.10", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.6.1", + "sensor_index": "atEnvMonv2TemperatureIndex.1.6.1", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Fan Tray B 2", + "sensor_descr": "Temp: XEM Front", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10854,10 +10900,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.11", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.11", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.6.2", + "sensor_index": "atEnvMonv2TemperatureIndex.1.6.2", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Near Switch", + "sensor_descr": "Temp: XEM Rear", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10877,10 +10923,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.12", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.12", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.7.1", + "sensor_index": "atEnvMonv2TemperatureIndex.1.7.1", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Front Left", + "sensor_descr": "Temp: XEM Front", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10900,10 +10946,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.13", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.13", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.7.2", + "sensor_index": "atEnvMonv2TemperatureIndex.1.7.2", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Front Mid", + "sensor_descr": "Temp: XEM Rear", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10923,10 +10969,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.14", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.14", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.10", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.10", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Front Right", + "sensor_descr": "Temp: Fan Tray B 2", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10946,10 +10992,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.5.15", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.15", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.11", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.11", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Console", + "sensor_descr": "Temp: Near Switch", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10969,10 +11015,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.6.1", - "sensor_index": "atEnvMonv2TemperatureIndex.1.6.1", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.12", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.12", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: XEM Front", + "sensor_descr": "Temp: Front Left", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -10992,10 +11038,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.6.2", - "sensor_index": "atEnvMonv2TemperatureIndex.1.6.2", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.13", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.13", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: XEM Rear", + "sensor_descr": "Temp: Front Mid", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11015,10 +11061,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.7.1", - "sensor_index": "atEnvMonv2TemperatureIndex.1.7.1", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.14", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.14", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: XEM Front", + "sensor_descr": "Temp: Front Right", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11038,10 +11084,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.1.7.2", - "sensor_index": "atEnvMonv2TemperatureIndex.1.7.2", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.15", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.15", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: XEM Rear", + "sensor_descr": "Temp: Console", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11153,10 +11199,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.10", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.10", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.6.1", + "sensor_index": "atEnvMonv2TemperatureIndex.2.6.1", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Fan Tray B 2", + "sensor_descr": "Temp: XEM Front", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11176,10 +11222,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.11", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.11", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.6.2", + "sensor_index": "atEnvMonv2TemperatureIndex.2.6.2", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Near Switch", + "sensor_descr": "Temp: XEM Rear", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11199,10 +11245,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.12", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.12", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.7.1", + "sensor_index": "atEnvMonv2TemperatureIndex.2.7.1", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Front Left", + "sensor_descr": "Temp: XEM Front", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11222,10 +11268,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.13", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.13", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.7.2", + "sensor_index": "atEnvMonv2TemperatureIndex.2.7.2", "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Front Mid", + "sensor_descr": "Temp: XEM Rear", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11245,10 +11291,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.14", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.14", - "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Front Right", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.5.1", + "sensor_index": "atEnvMonv2VoltageIndex.1.5.1", + "sensor_type": "VoltageState", + "sensor_descr": "Voltage: 2.5V", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11262,16 +11308,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "TemperatureState" + "state_name": "VoltageState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.5.15", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.15", - "sensor_type": "TemperatureState", - "sensor_descr": "Temp: Console", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.5.2", + "sensor_index": "atEnvMonv2VoltageIndex.1.5.2", + "sensor_type": "VoltageState", + "sensor_descr": "Voltage: Battery", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11285,16 +11331,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "TemperatureState" + "state_name": "VoltageState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.6.1", - "sensor_index": "atEnvMonv2TemperatureIndex.2.6.1", - "sensor_type": "TemperatureState", - "sensor_descr": "Temp: XEM Front", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.5.3", + "sensor_index": "atEnvMonv2VoltageIndex.1.5.3", + "sensor_type": "VoltageState", + "sensor_descr": "Voltage: 3.3V", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11308,16 +11354,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "TemperatureState" + "state_name": "VoltageState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.6.2", - "sensor_index": "atEnvMonv2TemperatureIndex.2.6.2", - "sensor_type": "TemperatureState", - "sensor_descr": "Temp: XEM Rear", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.5.4", + "sensor_index": "atEnvMonv2VoltageIndex.1.5.4", + "sensor_type": "VoltageState", + "sensor_descr": "Voltage: 12V", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11331,16 +11377,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "TemperatureState" + "state_name": "VoltageState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.7.1", - "sensor_index": "atEnvMonv2TemperatureIndex.2.7.1", - "sensor_type": "TemperatureState", - "sensor_descr": "Temp: XEM Front", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.1.5.5", + "sensor_index": "atEnvMonv2VoltageIndex.1.5.5", + "sensor_type": "VoltageState", + "sensor_descr": "Voltage: 1V", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11354,16 +11400,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "TemperatureState" + "state_name": "VoltageState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.7.2.7.2", - "sensor_index": "atEnvMonv2TemperatureIndex.2.7.2", - "sensor_type": "TemperatureState", - "sensor_descr": "Temp: XEM Rear", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.2.5.1", + "sensor_index": "atEnvMonv2VoltageIndex.2.5.1", + "sensor_type": "VoltageState", + "sensor_descr": "Voltage: 2.5V", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11377,39 +11423,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "TemperatureState" + "state_name": "VoltageState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.1.1.2", - "sensor_index": "atEnvMonv2PsbSensorIndex.1.1.2", - "sensor_type": "PowerSupplyState", - "sensor_descr": "Fan/Temperature Fault", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "2", - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": "1", - "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "PowerSupplyState" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.1.1.3", - "sensor_index": "atEnvMonv2PsbSensorIndex.1.1.3", - "sensor_type": "PowerSupplyState", - "sensor_descr": "PSU Power Output", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.2.5.2", + "sensor_index": "atEnvMonv2VoltageIndex.2.5.2", + "sensor_type": "VoltageState", + "sensor_descr": "Voltage: Battery", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11423,16 +11446,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "PowerSupplyState" + "state_name": "VoltageState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.1.1.4", - "sensor_index": "atEnvMonv2PsbSensorIndex.1.1.4", - "sensor_type": "PowerSupplyState", - "sensor_descr": "PSU Power Input", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.2.5.3", + "sensor_index": "atEnvMonv2VoltageIndex.2.5.3", + "sensor_type": "VoltageState", + "sensor_descr": "Voltage: 3.3V", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11446,16 +11469,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "PowerSupplyState" + "state_name": "VoltageState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.2.1.2", - "sensor_index": "atEnvMonv2PsbSensorIndex.2.1.2", - "sensor_type": "PowerSupplyState", - "sensor_descr": "Fan/Temperature Fault", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.2.5.4", + "sensor_index": "atEnvMonv2VoltageIndex.2.5.4", + "sensor_type": "VoltageState", + "sensor_descr": "Voltage: 12V", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11469,16 +11492,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "PowerSupplyState" + "state_name": "VoltageState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.2.1.3", - "sensor_index": "atEnvMonv2PsbSensorIndex.2.1.3", - "sensor_type": "PowerSupplyState", - "sensor_descr": "PSU Power Output", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.2.1.8.2.5.5", + "sensor_index": "atEnvMonv2VoltageIndex.2.5.5", + "sensor_type": "VoltageState", + "sensor_descr": "Voltage: 1V", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "2", @@ -11492,22 +11515,22 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "PowerSupplyState" + "state_name": "VoltageState" }, { "sensor_deleted": "0", - "sensor_class": "state", + "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.4.2.1.6.2.1.4", - "sensor_index": "atEnvMonv2PsbSensorIndex.2.1.4", - "sensor_type": "PowerSupplyState", - "sensor_descr": "PSU Power Input", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.10", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.10", + "sensor_type": "awplus", + "sensor_descr": "Temp: Fan Tray B 2", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "2", - "sensor_limit": null, + "sensor_current": "29", + "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": null, + "sensor_limit_low": "19", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -11515,16 +11538,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "PowerSupplyState" + "state_name": null }, { "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.6", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.6", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.11", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.11", "sensor_type": "awplus", - "sensor_descr": "Temp: Internal", + "sensor_descr": "Temp: Near Switch", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "30", @@ -11544,16 +11567,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.7", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.7", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.12", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.12", "sensor_type": "awplus", - "sensor_descr": "Temp: Fan Tray A 1", + "sensor_descr": "Temp: Front Left", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "27", + "sensor_current": "28", "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "17", + "sensor_limit_low": "18", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -11567,10 +11590,10 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.8", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.8", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.13", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.13", "sensor_type": "awplus", - "sensor_descr": "Temp: Fan Tray A 2", + "sensor_descr": "Temp: Front Mid", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "26", @@ -11590,10 +11613,10 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.9", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.9", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.14", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.14", "sensor_type": "awplus", - "sensor_descr": "Temp: Fan Tray B 1", + "sensor_descr": "Temp: Front Right", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "27", @@ -11613,16 +11636,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.10", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.10", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.15", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.15", "sensor_type": "awplus", - "sensor_descr": "Temp: Fan Tray B 2", + "sensor_descr": "Temp: Console", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "29", - "sensor_limit": "70", + "sensor_current": "27", + "sensor_limit": "60", "sensor_limit_warn": null, - "sensor_limit_low": "19", + "sensor_limit_low": "17", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -11636,10 +11659,10 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.11", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.11", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.6", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.6", "sensor_type": "awplus", - "sensor_descr": "Temp: Near Switch", + "sensor_descr": "Temp: Internal", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "30", @@ -11659,16 +11682,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.12", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.12", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.7", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.7", "sensor_type": "awplus", - "sensor_descr": "Temp: Front Left", + "sensor_descr": "Temp: Fan Tray A 1", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "28", + "sensor_current": "27", "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "18", + "sensor_limit_low": "17", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -11682,10 +11705,10 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.13", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.13", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.8", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.8", "sensor_type": "awplus", - "sensor_descr": "Temp: Front Mid", + "sensor_descr": "Temp: Fan Tray A 2", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "26", @@ -11705,10 +11728,10 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.14", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.14", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.9", + "sensor_index": "atEnvMonv2TemperatureIndex.1.5.9", "sensor_type": "awplus", - "sensor_descr": "Temp: Front Right", + "sensor_descr": "Temp: Fan Tray B 1", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "27", @@ -11724,29 +11747,6 @@ "user_func": null, "state_name": null }, - { - "sensor_deleted": "0", - "sensor_class": "temperature", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.1.5.15", - "sensor_index": "atEnvMonv2TemperatureIndex.1.5.15", - "sensor_type": "awplus", - "sensor_descr": "Temp: Console", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "27", - "sensor_limit": "60", - "sensor_limit_warn": null, - "sensor_limit_low": "17", - "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", @@ -11843,16 +11843,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.6", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.6", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.10", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.10", "sensor_type": "awplus", - "sensor_descr": "Temp: Internal", + "sensor_descr": "Temp: Fan Tray B 2", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "29", - "sensor_limit": "75", + "sensor_current": "28", + "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "19", + "sensor_limit_low": "18", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -11866,16 +11866,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.7", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.7", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.11", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.11", "sensor_type": "awplus", - "sensor_descr": "Temp: Fan Tray A 1", + "sensor_descr": "Temp: Near Switch", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "27", - "sensor_limit": "70", + "sensor_current": "29", + "sensor_limit": "75", "sensor_limit_warn": null, - "sensor_limit_low": "17", + "sensor_limit_low": "19", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -11889,16 +11889,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.8", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.8", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.12", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.12", "sensor_type": "awplus", - "sensor_descr": "Temp: Fan Tray A 2", + "sensor_descr": "Temp: Front Left", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "26", + "sensor_current": "28", "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "16", + "sensor_limit_low": "18", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -11912,16 +11912,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.9", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.9", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.13", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.13", "sensor_type": "awplus", - "sensor_descr": "Temp: Fan Tray B 1", + "sensor_descr": "Temp: Front Mid", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "27", + "sensor_current": "25", "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "17", + "sensor_limit_low": "15", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -11935,16 +11935,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.10", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.10", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.14", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.14", "sensor_type": "awplus", - "sensor_descr": "Temp: Fan Tray B 2", + "sensor_descr": "Temp: Front Right", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "28", + "sensor_current": "27", "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "18", + "sensor_limit_low": "17", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -11958,16 +11958,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.11", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.11", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.15", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.15", "sensor_type": "awplus", - "sensor_descr": "Temp: Near Switch", + "sensor_descr": "Temp: Console", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "29", - "sensor_limit": "75", + "sensor_current": "26", + "sensor_limit": "60", "sensor_limit_warn": null, - "sensor_limit_low": "19", + "sensor_limit_low": "16", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -11981,16 +11981,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.12", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.12", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.6", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.6", "sensor_type": "awplus", - "sensor_descr": "Temp: Front Left", + "sensor_descr": "Temp: Internal", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "28", - "sensor_limit": "70", + "sensor_current": "29", + "sensor_limit": "75", "sensor_limit_warn": null, - "sensor_limit_low": "18", + "sensor_limit_low": "19", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -12004,16 +12004,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.13", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.13", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.7", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.7", "sensor_type": "awplus", - "sensor_descr": "Temp: Front Mid", + "sensor_descr": "Temp: Fan Tray A 1", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "25", + "sensor_current": "27", "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "15", + "sensor_limit_low": "17", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -12027,16 +12027,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.14", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.14", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.8", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.8", "sensor_type": "awplus", - "sensor_descr": "Temp: Front Right", + "sensor_descr": "Temp: Fan Tray A 2", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "27", + "sensor_current": "26", "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "17", + "sensor_limit_low": "16", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -12050,16 +12050,16 @@ "sensor_deleted": "0", "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.15", - "sensor_index": "atEnvMonv2TemperatureIndex.2.5.15", + "sensor_oid": ".1.3.6.1.4.1.207.8.4.4.3.12.3.1.5.2.5.9", + "sensor_index": "atEnvMonv2TemperatureIndex.2.5.9", "sensor_type": "awplus", - "sensor_descr": "Temp: Console", + "sensor_descr": "Temp: Fan Tray B 1", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "26", - "sensor_limit": "60", + "sensor_current": "27", + "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "16", + "sensor_limit_low": "17", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", diff --git a/tests/data/drac.json b/tests/data/drac.json index e42cee5e142c..fa32a3a4b48f 100644 --- a/tests/data/drac.json +++ b/tests/data/drac.json @@ -25,6 +25,75 @@ "user_func": null, "state_name": null }, + { + "sensor_deleted": "0", + "sensor_class": "fanspeed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10", + "sensor_index": "10", + "sensor_type": "drac", + "sensor_descr": "System Fan5B", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "3720", + "sensor_limit": "6696", + "sensor_limit_warn": null, + "sensor_limit_low": "720", + "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": "fanspeed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11", + "sensor_index": "11", + "sensor_type": "drac", + "sensor_descr": "System Fan6A", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "4560", + "sensor_limit": "8208", + "sensor_limit_warn": null, + "sensor_limit_low": "720", + "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": "fanspeed", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12", + "sensor_index": "12", + "sensor_type": "drac", + "sensor_descr": "System Fan6B", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "3480", + "sensor_limit": "6264", + "sensor_limit_warn": null, + "sensor_limit_low": "720", + "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": "fanspeed", @@ -211,127 +280,127 @@ }, { "sensor_deleted": "0", - "sensor_class": "fanspeed", + "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.10", - "sensor_index": "10", - "sensor_type": "drac", - "sensor_descr": "System Fan5B", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.30.1.5.1.1", + "sensor_index": "1.1", + "sensor_type": "amperageProbeStatus", + "sensor_descr": "PS1 Current 1", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3720", - "sensor_limit": "6696", + "sensor_current": "3", + "sensor_limit": null, "sensor_limit_warn": null, - "sensor_limit_low": "720", + "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": null, + "entPhysicalIndex": "1.1", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": null + "state_name": "amperageProbeStatus" }, { "sensor_deleted": "0", - "sensor_class": "fanspeed", + "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.11", - "sensor_index": "11", - "sensor_type": "drac", - "sensor_descr": "System Fan6A", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.30.1.5.1.2", + "sensor_index": "1.2", + "sensor_type": "amperageProbeStatus", + "sensor_descr": "PS2 Current 2", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "4560", - "sensor_limit": "8208", + "sensor_current": "3", + "sensor_limit": null, "sensor_limit_warn": null, - "sensor_limit_low": "720", + "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": null, + "entPhysicalIndex": "1.2", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": null + "state_name": "amperageProbeStatus" }, { "sensor_deleted": "0", - "sensor_class": "fanspeed", + "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.700.12.1.6.1.12", - "sensor_index": "12", - "sensor_type": "drac", - "sensor_descr": "System Fan6B", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.30.1.5.1.3", + "sensor_index": "1.3", + "sensor_type": "amperageProbeStatus", + "sensor_descr": "System Board Pwr Consumption", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3480", - "sensor_limit": "6264", + "sensor_current": "3", + "sensor_limit": null, "sensor_limit_warn": null, - "sensor_limit_low": "720", + "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": null, + "entPhysicalIndex": "1.3", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": null + "state_name": "amperageProbeStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.5.1.20.140.1.1.4.1", - "sensor_index": "1", - "sensor_type": "virtualDiskState", - "sensor_descr": "Virtual Disk 0", + "sensor_oid": ".1.3.6.1.4.1.674.10892.2.2.1.0", + "sensor_index": "drsGlobalSystemStatus.0", + "sensor_type": "drsGlobalSystemStatus", + "sensor_descr": "Global System Status", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "2", + "sensor_current": "3", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": "1", + "entPhysicalIndex": null, "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "virtualDiskState" + "state_name": "drsGlobalSystemStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.1100.30.1.5.1.1", - "sensor_index": "1.1", - "sensor_type": "processorDeviceStatus", - "sensor_descr": "Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.300.70.1.6.1.1", + "sensor_index": "intrusionReading.1.1", + "sensor_type": "intrusionReading", + "sensor_descr": "Intrusion Reading", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3", + "sensor_current": "1", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": "1.1", + "entPhysicalIndex": null, "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "processorDeviceStatus" + "state_name": "intrusionReading" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.1100.30.1.5.1.2", - "sensor_index": "1.2", - "sensor_type": "processorDeviceStatus", - "sensor_descr": "Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.300.70.1.5.1.1", + "sensor_index": "intrusionStatus.1.1", + "sensor_type": "intrusionStatus", + "sensor_descr": "Intrusion Status", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -341,11 +410,11 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": "1.2", + "entPhysicalIndex": null, "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "processorDeviceStatus" + "state_name": "intrusionStatus" }, { "sensor_deleted": "0", @@ -535,10 +604,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.1", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.1100.30.1.5.1.1", "sensor_index": "1.1", - "sensor_type": "voltageProbeStatus", - "sensor_descr": "CPU1 VCORE PG", + "sensor_type": "processorDeviceStatus", + "sensor_descr": "Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -552,16 +621,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "voltageProbeStatus" + "state_name": "processorDeviceStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.2", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.1100.30.1.5.1.2", "sensor_index": "1.2", - "sensor_type": "voltageProbeStatus", - "sensor_descr": "CPU1 FIVR PG", + "sensor_type": "processorDeviceStatus", + "sensor_descr": "Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -575,39 +644,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "voltageProbeStatus" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.3", - "sensor_index": "1.3", - "sensor_type": "voltageProbeStatus", - "sensor_descr": "CPU2 VCORE PG", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "3", - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": "1", - "sensor_custom": "No", - "entPhysicalIndex": "1.3", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "voltageProbeStatus" + "state_name": "processorDeviceStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.4", - "sensor_index": "1.4", - "sensor_type": "voltageProbeStatus", - "sensor_descr": "CPU2 FIVR PG", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.50.1.5.1.1", + "sensor_index": "1.1", + "sensor_type": "systemBatteryStatus", + "sensor_descr": "System Board CMOS Battery", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -617,20 +663,20 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": "1.4", + "entPhysicalIndex": "1.1", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "voltageProbeStatus" + "state_name": "systemBatteryStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.5", - "sensor_index": "1.5", - "sensor_type": "voltageProbeStatus", - "sensor_descr": "System Board 3.3V PG", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.50.1.5.1.2", + "sensor_index": "1.2", + "sensor_type": "systemBatteryStatus", + "sensor_descr": "PERC1 ROMB Battery", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -640,20 +686,20 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": "1.5", + "entPhysicalIndex": "1.2", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "voltageProbeStatus" + "state_name": "systemBatteryStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.6", - "sensor_index": "1.6", - "sensor_type": "voltageProbeStatus", - "sensor_descr": "System Board 1.5V AUX PG", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.200.10.1.60.1", + "sensor_index": "systemStateIDSDMCardDeviceStatusCombined.1", + "sensor_type": "systemStateIDSDMCardDeviceStatusCombined", + "sensor_descr": "IDSDM Card Device Combined Status", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -663,20 +709,20 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": "1.6", + "entPhysicalIndex": null, "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "voltageProbeStatus" + "state_name": "systemStateIDSDMCardDeviceStatusCombined" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.7", - "sensor_index": "1.7", - "sensor_type": "voltageProbeStatus", - "sensor_descr": "System Board 5V AUX PG", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.200.10.1.58.1", + "sensor_index": "systemStateIDSDMCardUnitStatusCombined.1", + "sensor_type": "systemStateIDSDMCardUnitStatusCombined", + "sensor_descr": "IDSDM Card Unit Combined Status", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -686,43 +732,43 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": "1.7", + "entPhysicalIndex": null, "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "voltageProbeStatus" + "state_name": "systemStateIDSDMCardUnitStatusCombined" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.8", - "sensor_index": "1.8", - "sensor_type": "voltageProbeStatus", - "sensor_descr": "CPU2 M23 VPP PG", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.5.1.20.140.1.1.4.1", + "sensor_index": "1", + "sensor_type": "virtualDiskState", + "sensor_descr": "Virtual Disk 0", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3", + "sensor_current": "2", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": "1.8", + "entPhysicalIndex": "1", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "voltageProbeStatus" + "state_name": "virtualDiskState" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.9", - "sensor_index": "1.9", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.1", + "sensor_index": "1.1", "sensor_type": "voltageProbeStatus", - "sensor_descr": "CPU1 M23 VPP PG", + "sensor_descr": "CPU1 VCORE PG", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -732,7 +778,7 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": "1.9", + "entPhysicalIndex": "1.1", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, @@ -968,6 +1014,29 @@ "user_func": null, "state_name": "voltageProbeStatus" }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.2", + "sensor_index": "1.2", + "sensor_type": "voltageProbeStatus", + "sensor_descr": "CPU1 FIVR PG", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "3", + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "1.2", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": "voltageProbeStatus" + }, { "sensor_deleted": "0", "sensor_class": "state", @@ -1202,56 +1271,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.30.1.5.1.1", - "sensor_index": "1.1", - "sensor_type": "amperageProbeStatus", - "sensor_descr": "PS1 Current 1", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "3", - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": "1", - "sensor_custom": "No", - "entPhysicalIndex": "1.1", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "amperageProbeStatus" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.30.1.5.1.2", - "sensor_index": "1.2", - "sensor_type": "amperageProbeStatus", - "sensor_descr": "PS2 Current 2", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "3", - "sensor_limit": null, - "sensor_limit_warn": null, - "sensor_limit_low": null, - "sensor_limit_low_warn": null, - "sensor_alert": "1", - "sensor_custom": "No", - "entPhysicalIndex": "1.2", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "amperageProbeStatus" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.30.1.5.1.3", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.3", "sensor_index": "1.3", - "sensor_type": "amperageProbeStatus", - "sensor_descr": "System Board Pwr Consumption", + "sensor_type": "voltageProbeStatus", + "sensor_descr": "CPU2 VCORE PG", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -1265,16 +1288,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "amperageProbeStatus" + "state_name": "voltageProbeStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.50.1.5.1.1", - "sensor_index": "1.1", - "sensor_type": "systemBatteryStatus", - "sensor_descr": "System Board CMOS Battery", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.4", + "sensor_index": "1.4", + "sensor_type": "voltageProbeStatus", + "sensor_descr": "CPU2 FIVR PG", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -1284,20 +1307,20 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": "1.1", + "entPhysicalIndex": "1.4", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "systemBatteryStatus" + "state_name": "voltageProbeStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.50.1.5.1.2", - "sensor_index": "1.2", - "sensor_type": "systemBatteryStatus", - "sensor_descr": "PERC1 ROMB Battery", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.5", + "sensor_index": "1.5", + "sensor_type": "voltageProbeStatus", + "sensor_descr": "System Board 3.3V PG", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -1307,20 +1330,20 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": "1.2", + "entPhysicalIndex": "1.5", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "systemBatteryStatus" + "state_name": "voltageProbeStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.2.2.1.0", - "sensor_index": "drsGlobalSystemStatus.0", - "sensor_type": "drsGlobalSystemStatus", - "sensor_descr": "Global System Status", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.6", + "sensor_index": "1.6", + "sensor_type": "voltageProbeStatus", + "sensor_descr": "System Board 1.5V AUX PG", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -1330,20 +1353,20 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": null, + "entPhysicalIndex": "1.6", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "drsGlobalSystemStatus" + "state_name": "voltageProbeStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.200.10.1.58.1", - "sensor_index": "systemStateIDSDMCardUnitStatusCombined.1", - "sensor_type": "systemStateIDSDMCardUnitStatusCombined", - "sensor_descr": "IDSDM Card Unit Combined Status", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.7", + "sensor_index": "1.7", + "sensor_type": "voltageProbeStatus", + "sensor_descr": "System Board 5V AUX PG", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -1353,20 +1376,20 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": null, + "entPhysicalIndex": "1.7", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "systemStateIDSDMCardUnitStatusCombined" + "state_name": "voltageProbeStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.200.10.1.60.1", - "sensor_index": "systemStateIDSDMCardDeviceStatusCombined.1", - "sensor_type": "systemStateIDSDMCardDeviceStatusCombined", - "sensor_descr": "IDSDM Card Device Combined Status", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.8", + "sensor_index": "1.8", + "sensor_type": "voltageProbeStatus", + "sensor_descr": "CPU2 M23 VPP PG", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -1376,20 +1399,20 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": null, + "entPhysicalIndex": "1.8", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "systemStateIDSDMCardDeviceStatusCombined" + "state_name": "voltageProbeStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.300.70.1.5.1.1", - "sensor_index": "intrusionStatus.1.1", - "sensor_type": "intrusionStatus", - "sensor_descr": "Intrusion Status", + "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.600.20.1.5.1.9", + "sensor_index": "1.9", + "sensor_type": "voltageProbeStatus", + "sensor_descr": "CPU1 M23 VPP PG", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "3", @@ -1399,34 +1422,11 @@ "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", - "entPhysicalIndex": null, - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": "intrusionStatus" - }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.674.10892.5.4.300.70.1.6.1.1", - "sensor_index": "intrusionReading.1.1", - "sensor_type": "intrusionReading", - "sensor_descr": "Intrusion Reading", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "1", - "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": "1.9", "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "intrusionReading" + "state_name": "voltageProbeStatus" }, { "sensor_deleted": "0", diff --git a/tests/data/fusion.json b/tests/data/fusion.json index 7f70d6cdc287..2c6dc4c994ef 100644 --- a/tests/data/fusion.json +++ b/tests/data/fusion.json @@ -75,16 +75,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.25", - "sensor_index": "portOpticalMonitoringInfoTxPower.25", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.25", + "sensor_index": "portOpticalMonitoringInfoRxPower.25", "sensor_type": "fusion", - "sensor_descr": "Port 25 - Tx", + "sensor_descr": "Port 25 - Rx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-0.34", - "sensor_limit": "-0.323", + "sensor_current": "-2.88", + "sensor_limit": "-2.736", "sensor_limit_warn": null, - "sensor_limit_low": "-0.357", + "sensor_limit_low": "-3.024", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -98,16 +98,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.26", - "sensor_index": "portOpticalMonitoringInfoTxPower.26", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.26", + "sensor_index": "portOpticalMonitoringInfoRxPower.26", "sensor_type": "fusion", - "sensor_descr": "Port 26 - Tx", + "sensor_descr": "Port 26 - Rx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-1.6", - "sensor_limit": "-1.52", + "sensor_current": "-40", + "sensor_limit": "-38", "sensor_limit_warn": null, - "sensor_limit_low": "-1.68", + "sensor_limit_low": "-42", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -121,16 +121,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.28", - "sensor_index": "portOpticalMonitoringInfoTxPower.28", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.28", + "sensor_index": "portOpticalMonitoringInfoRxPower.28", "sensor_type": "fusion", - "sensor_descr": "The last port - Tx", + "sensor_descr": "The last port - Rx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-0.62", - "sensor_limit": "-0.589", + "sensor_current": "-5.18", + "sensor_limit": "-4.921", "sensor_limit_warn": null, - "sensor_limit_low": "-0.651", + "sensor_limit_low": "-5.439", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -144,16 +144,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.25", - "sensor_index": "portOpticalMonitoringInfoRxPower.25", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.25", + "sensor_index": "portOpticalMonitoringInfoTxPower.25", "sensor_type": "fusion", - "sensor_descr": "Port 25 - Rx", + "sensor_descr": "Port 25 - Tx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-2.88", - "sensor_limit": "-2.736", + "sensor_current": "-0.34", + "sensor_limit": "-0.323", "sensor_limit_warn": null, - "sensor_limit_low": "-3.024", + "sensor_limit_low": "-0.357", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -167,16 +167,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.26", - "sensor_index": "portOpticalMonitoringInfoRxPower.26", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.26", + "sensor_index": "portOpticalMonitoringInfoTxPower.26", "sensor_type": "fusion", - "sensor_descr": "Port 26 - Rx", + "sensor_descr": "Port 26 - Tx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-40", - "sensor_limit": "-38", + "sensor_current": "-1.6", + "sensor_limit": "-1.52", "sensor_limit_warn": null, - "sensor_limit_low": "-42", + "sensor_limit_low": "-1.68", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -190,16 +190,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.28", - "sensor_index": "portOpticalMonitoringInfoRxPower.28", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.28", + "sensor_index": "portOpticalMonitoringInfoTxPower.28", "sensor_type": "fusion", - "sensor_descr": "The last port - Rx", + "sensor_descr": "The last port - Tx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-5.18", - "sensor_limit": "-4.921", + "sensor_current": "-0.62", + "sensor_limit": "-0.589", "sensor_limit_warn": null, - "sensor_limit_low": "-5.439", + "sensor_limit_low": "-0.651", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -643,16 +643,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.25", - "sensor_index": "portOpticalMonitoringInfoTxPower.25", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.25", + "sensor_index": "portOpticalMonitoringInfoRxPower.25", "sensor_type": "fusion", - "sensor_descr": "Port 25 - Tx", + "sensor_descr": "Port 25 - Rx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-0.34", - "sensor_limit": "-0.323", + "sensor_current": "-2.88", + "sensor_limit": "-2.736", "sensor_limit_warn": null, - "sensor_limit_low": "-0.357", + "sensor_limit_low": "-3.024", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -666,16 +666,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.26", - "sensor_index": "portOpticalMonitoringInfoTxPower.26", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.26", + "sensor_index": "portOpticalMonitoringInfoRxPower.26", "sensor_type": "fusion", - "sensor_descr": "Port 26 - Tx", + "sensor_descr": "Port 26 - Rx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-1.6", - "sensor_limit": "-1.52", + "sensor_current": "-40", + "sensor_limit": "-38", "sensor_limit_warn": null, - "sensor_limit_low": "-1.68", + "sensor_limit_low": "-42", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -689,16 +689,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.28", - "sensor_index": "portOpticalMonitoringInfoTxPower.28", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.28", + "sensor_index": "portOpticalMonitoringInfoRxPower.28", "sensor_type": "fusion", - "sensor_descr": "The last port - Tx", + "sensor_descr": "The last port - Rx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-0.62", - "sensor_limit": "-0.589", + "sensor_current": "-5.18", + "sensor_limit": "-4.921", "sensor_limit_warn": null, - "sensor_limit_low": "-0.651", + "sensor_limit_low": "-5.439", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -712,16 +712,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.25", - "sensor_index": "portOpticalMonitoringInfoRxPower.25", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.25", + "sensor_index": "portOpticalMonitoringInfoTxPower.25", "sensor_type": "fusion", - "sensor_descr": "Port 25 - Rx", + "sensor_descr": "Port 25 - Tx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-2.88", - "sensor_limit": "-2.736", + "sensor_current": "-0.34", + "sensor_limit": "-0.323", "sensor_limit_warn": null, - "sensor_limit_low": "-3.024", + "sensor_limit_low": "-0.357", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -735,16 +735,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.26", - "sensor_index": "portOpticalMonitoringInfoRxPower.26", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.26", + "sensor_index": "portOpticalMonitoringInfoTxPower.26", "sensor_type": "fusion", - "sensor_descr": "Port 26 - Rx", + "sensor_descr": "Port 26 - Tx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-40", - "sensor_limit": "-38", + "sensor_current": "-1.6", + "sensor_limit": "-1.52", "sensor_limit_warn": null, - "sensor_limit_low": "-42", + "sensor_limit_low": "-1.68", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -758,16 +758,16 @@ "sensor_deleted": "0", "sensor_class": "dbm", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.6.28", - "sensor_index": "portOpticalMonitoringInfoRxPower.28", + "sensor_oid": ".1.3.6.1.4.1.259.6.10.120.1.2.11.1.5.28", + "sensor_index": "portOpticalMonitoringInfoTxPower.28", "sensor_type": "fusion", - "sensor_descr": "The last port - Rx", + "sensor_descr": "The last port - Tx", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-5.18", - "sensor_limit": "-4.921", + "sensor_current": "-0.62", + "sensor_limit": "-0.589", "sensor_limit_warn": null, - "sensor_limit_low": "-5.439", + "sensor_limit_low": "-0.651", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -1137,4 +1137,4 @@ ] } } -} \ No newline at end of file +} diff --git a/tests/data/gaia.json b/tests/data/gaia.json index dae66e8769c9..cc706762d415 100644 --- a/tests/data/gaia.json +++ b/tests/data/gaia.json @@ -67,10 +67,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.2620.1.6.7.8.1.1.6.1.0", - "sensor_index": "tempertureSensorStatus.1.0", - "sensor_type": "tempertureSensorStatus", - "sensor_descr": "CPU Temp, Temperature Out Of Range", + "sensor_oid": ".1.3.6.1.4.1.2620.1.6.7.8.2.1.6.1.0", + "sensor_index": "fanSpeedSensorStatus.1.0", + "sensor_type": "fanSpeedSensorStatus", + "sensor_descr": "CPU Fan, Fanspeed Out Of Range", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "0", @@ -84,16 +84,16 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "tempertureSensorStatus" + "state_name": "fanSpeedSensorStatus" }, { "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.2620.1.6.7.8.1.1.6.2.0", - "sensor_index": "tempertureSensorStatus.2.0", + "sensor_oid": ".1.3.6.1.4.1.2620.1.6.7.8.1.1.6.1.0", + "sensor_index": "tempertureSensorStatus.1.0", "sensor_type": "tempertureSensorStatus", - "sensor_descr": "Outlet Temp, Temperature Out Of Range", + "sensor_descr": "CPU Temp, Temperature Out Of Range", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "0", @@ -113,10 +113,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.2620.1.6.7.8.1.1.6.3.0", - "sensor_index": "tempertureSensorStatus.3.0", + "sensor_oid": ".1.3.6.1.4.1.2620.1.6.7.8.1.1.6.2.0", + "sensor_index": "tempertureSensorStatus.2.0", "sensor_type": "tempertureSensorStatus", - "sensor_descr": "Intake Temp, Temperature Out Of Range", + "sensor_descr": "Outlet Temp, Temperature Out Of Range", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "0", @@ -136,10 +136,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.2620.1.6.7.8.2.1.6.1.0", - "sensor_index": "fanSpeedSensorStatus.1.0", - "sensor_type": "fanSpeedSensorStatus", - "sensor_descr": "CPU Fan, Fanspeed Out Of Range", + "sensor_oid": ".1.3.6.1.4.1.2620.1.6.7.8.1.1.6.3.0", + "sensor_index": "tempertureSensorStatus.3.0", + "sensor_type": "tempertureSensorStatus", + "sensor_descr": "Intake Temp, Temperature Out Of Range", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "0", @@ -153,7 +153,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, - "state_name": "fanSpeedSensorStatus" + "state_name": "tempertureSensorStatus" }, { "sensor_deleted": "0", diff --git a/tests/data/netonix_wispswitch.json b/tests/data/netonix_wispswitch.json index 84588df24695..780455f36f0d 100644 --- a/tests/data/netonix_wispswitch.json +++ b/tests/data/netonix_wispswitch.json @@ -47,13 +47,13 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.2", - "sensor_index": "2", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.10", + "sensor_index": "10", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 2 PoE", + "sensor_descr": "Port 10 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "5", + "sensor_current": "1", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -70,13 +70,13 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.3", - "sensor_index": "3", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.11", + "sensor_index": "11", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 3 PoE", + "sensor_descr": "Port 11 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "2", + "sensor_current": "1", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -93,13 +93,13 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.4", - "sensor_index": "4", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.12", + "sensor_index": "12", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 4 PoE", + "sensor_descr": "Port 12 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "2", + "sensor_current": "1", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -116,10 +116,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.5", - "sensor_index": "5", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.13", + "sensor_index": "13", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 5 PoE", + "sensor_descr": "Port 13 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "1", @@ -139,10 +139,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.6", - "sensor_index": "6", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.14", + "sensor_index": "14", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 6 PoE", + "sensor_descr": "Port 14 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "1", @@ -162,13 +162,13 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.7", - "sensor_index": "7", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.2", + "sensor_index": "2", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 7 PoE", + "sensor_descr": "Port 2 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "4", + "sensor_current": "5", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -185,13 +185,13 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.8", - "sensor_index": "8", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.3", + "sensor_index": "3", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 8 PoE", + "sensor_descr": "Port 3 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "1", + "sensor_current": "2", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -208,13 +208,13 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.9", - "sensor_index": "9", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.4", + "sensor_index": "4", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 9 PoE", + "sensor_descr": "Port 4 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3", + "sensor_current": "2", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -231,10 +231,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.10", - "sensor_index": "10", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.5", + "sensor_index": "5", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 10 PoE", + "sensor_descr": "Port 5 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "1", @@ -254,10 +254,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.11", - "sensor_index": "11", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.6", + "sensor_index": "6", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 11 PoE", + "sensor_descr": "Port 6 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "1", @@ -277,13 +277,13 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.12", - "sensor_index": "12", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.7", + "sensor_index": "7", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 12 PoE", + "sensor_descr": "Port 7 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "1", + "sensor_current": "4", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -300,10 +300,10 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.13", - "sensor_index": "13", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.8", + "sensor_index": "8", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 13 PoE", + "sensor_descr": "Port 8 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", "sensor_current": "1", @@ -323,13 +323,13 @@ "sensor_deleted": "0", "sensor_class": "state", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.14", - "sensor_index": "14", + "sensor_oid": ".1.3.6.1.4.1.46242.5.1.2.9", + "sensor_index": "9", "sensor_type": "netonixPoeStatus", - "sensor_descr": "Port 14 PoE", + "sensor_descr": "Port 9 PoE", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "1", + "sensor_current": "3", "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, diff --git a/tests/data/pcoweb-rittalchiller.json b/tests/data/pcoweb-rittalchiller.json index a8836aebafd6..d55cfbb04feb 100644 --- a/tests/data/pcoweb-rittalchiller.json +++ b/tests/data/pcoweb-rittalchiller.json @@ -42,18 +42,18 @@ "sensors": [ { "sensor_deleted": "0", - "sensor_class": "current", + "sensor_class": "cooling", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.74.0", - "sensor_index": "amp-value.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.100.0", + "sensor_index": "cooling-capacity.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Current Consumption", - "sensor_divisor": "10", - "sensor_multiplier": "1", - "sensor_current": "1", - "sensor_limit": "1.5", + "sensor_descr": "Free Cooling Capacity", + "sensor_divisor": "1", + "sensor_multiplier": "100", + "sensor_current": "33900", + "sensor_limit": "35595", "sensor_limit_warn": null, - "sensor_limit_low": null, + "sensor_limit_low": "32205", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -65,18 +65,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "humidity", + "sensor_class": "cooling", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.90.0", - "sensor_index": "pp1.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.101.0", + "sensor_index": "freecooling-capacity.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Hydraulic Pump 1 Speed", - "sensor_divisor": "10", - "sensor_multiplier": "1", - "sensor_current": "100", - "sensor_limit": "70", + "sensor_descr": "Compressor Cooling Capacity", + "sensor_divisor": "1", + "sensor_multiplier": "100", + "sensor_current": "0", + "sensor_limit": "0", "sensor_limit_warn": null, - "sensor_limit_low": "30", + "sensor_limit_low": "0", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -88,18 +88,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "humidity", + "sensor_class": "cooling", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.91.0", - "sensor_index": "pp2.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.102.0", + "sensor_index": "total-capacity.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Hydraulic Pump 2 Speed", - "sensor_divisor": "10", - "sensor_multiplier": "1", - "sensor_current": "0", - "sensor_limit": "70", + "sensor_descr": "Total cooling Capacity", + "sensor_divisor": "1", + "sensor_multiplier": "100", + "sensor_current": "33900", + "sensor_limit": "35595", "sensor_limit_warn": null, - "sensor_limit_low": "30", + "sensor_limit_low": "32205", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -111,16 +111,16 @@ }, { "sensor_deleted": "0", - "sensor_class": "power", + "sensor_class": "current", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.103.0", - "sensor_index": "analogObjects.103.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.74.0", + "sensor_index": "amp-value.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Power Consumption", - "sensor_divisor": "1", - "sensor_multiplier": "100", - "sensor_current": "700", - "sensor_limit": "1050", + "sensor_descr": "Current Consumption", + "sensor_divisor": "10", + "sensor_multiplier": "1", + "sensor_current": "1", + "sensor_limit": "1.5", "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, @@ -134,18 +134,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "temperature", + "sensor_class": "eer", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.140.0", - "sensor_index": "analogObjects.140.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.3.120.0", + "sensor_index": "analogObjects.120.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Temperature Ambient", - "sensor_divisor": "10", + "sensor_descr": "Energy Efficiency Ratio", + "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3.6", - "sensor_limit": "23.6", + "sensor_current": "0", + "sensor_limit": null, "sensor_limit_warn": null, - "sensor_limit_low": "-6.4", + "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -157,18 +157,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "temperature", + "sensor_class": "humidity", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.137.0", - "sensor_index": "analogObjects.137.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.90.0", + "sensor_index": "pp1.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Temperature Out", + "sensor_descr": "Hydraulic Pump 1 Speed", "sensor_divisor": "10", "sensor_multiplier": "1", - "sensor_current": "17.9", - "sensor_limit": "37.9", + "sensor_current": "100", + "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "7.9", + "sensor_limit_low": "30", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -180,18 +180,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "temperature", + "sensor_class": "humidity", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.136.0", - "sensor_index": "analogObjects.136.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.91.0", + "sensor_index": "pp2.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Temperature In", + "sensor_descr": "Hydraulic Pump 2 Speed", "sensor_divisor": "10", "sensor_multiplier": "1", - "sensor_current": "18", - "sensor_limit": "38", + "sensor_current": "0", + "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "8", + "sensor_limit_low": "30", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -203,18 +203,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "pressure", + "sensor_class": "power", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.138.0", - "sensor_index": "analogObjects.138.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.103.0", + "sensor_index": "analogObjects.103.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Hydraulic Pressure (Suction)", + "sensor_descr": "Power Consumption", "sensor_divisor": "1", - "sensor_multiplier": "10", - "sensor_current": "160", - "sensor_limit": "168", + "sensor_multiplier": "100", + "sensor_current": "700", + "sensor_limit": "1050", "sensor_limit_warn": null, - "sensor_limit_low": "152", + "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -251,16 +251,16 @@ "sensor_deleted": "0", "sensor_class": "pressure", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.77.0", - "sensor_index": "pressione1.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.138.0", + "sensor_index": "analogObjects.138.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Condensation Pressure 1", + "sensor_descr": "Hydraulic Pressure (Suction)", "sensor_divisor": "1", "sensor_multiplier": "10", - "sensor_current": "700", - "sensor_limit": "735", + "sensor_current": "160", + "sensor_limit": "168", "sensor_limit_warn": null, - "sensor_limit_low": "665", + "sensor_limit_low": "152", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -274,16 +274,16 @@ "sensor_deleted": "0", "sensor_class": "pressure", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.78.0", - "sensor_index": "pressione2.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.77.0", + "sensor_index": "pressione1.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Condensation Pressure 2", + "sensor_descr": "Condensation Pressure 1", "sensor_divisor": "1", "sensor_multiplier": "10", - "sensor_current": "0", - "sensor_limit": "0", + "sensor_current": "700", + "sensor_limit": "735", "sensor_limit_warn": null, - "sensor_limit_low": "0", + "sensor_limit_low": "665", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -295,18 +295,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "cooling", + "sensor_class": "pressure", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.100.0", - "sensor_index": "cooling-capacity.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.78.0", + "sensor_index": "pressione2.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Free Cooling Capacity", + "sensor_descr": "Condensation Pressure 2", "sensor_divisor": "1", - "sensor_multiplier": "100", - "sensor_current": "33900", - "sensor_limit": "35595", + "sensor_multiplier": "10", + "sensor_current": "0", + "sensor_limit": "0", "sensor_limit_warn": null, - "sensor_limit_low": "32205", + "sensor_limit_low": "0", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -318,18 +318,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "cooling", + "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.101.0", - "sensor_index": "freecooling-capacity.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.136.0", + "sensor_index": "analogObjects.136.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Compressor Cooling Capacity", - "sensor_divisor": "1", - "sensor_multiplier": "100", - "sensor_current": "0", - "sensor_limit": "0", + "sensor_descr": "Temperature In", + "sensor_divisor": "10", + "sensor_multiplier": "1", + "sensor_current": "18", + "sensor_limit": "38", "sensor_limit_warn": null, - "sensor_limit_low": "0", + "sensor_limit_low": "8", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -341,18 +341,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "cooling", + "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.102.0", - "sensor_index": "total-capacity.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.137.0", + "sensor_index": "analogObjects.137.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Total cooling Capacity", - "sensor_divisor": "1", - "sensor_multiplier": "100", - "sensor_current": "33900", - "sensor_limit": "35595", + "sensor_descr": "Temperature Out", + "sensor_divisor": "10", + "sensor_multiplier": "1", + "sensor_current": "17.9", + "sensor_limit": "37.9", "sensor_limit_warn": null, - "sensor_limit_low": "32205", + "sensor_limit_low": "7.9", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -364,18 +364,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "eer", + "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.3.120.0", - "sensor_index": "analogObjects.120.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.140.0", + "sensor_index": "analogObjects.140.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Energy Efficiency Ratio", - "sensor_divisor": "1", + "sensor_descr": "Temperature Ambient", + "sensor_divisor": "10", "sensor_multiplier": "1", - "sensor_current": "0", - "sensor_limit": null, + "sensor_current": "3.6", + "sensor_limit": "23.6", "sensor_limit_warn": null, - "sensor_limit_low": null, + "sensor_limit_low": "-6.4", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -415,18 +415,18 @@ "sensors": [ { "sensor_deleted": "0", - "sensor_class": "current", + "sensor_class": "cooling", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.74.0", - "sensor_index": "amp-value.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.100.0", + "sensor_index": "cooling-capacity.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Current Consumption", - "sensor_divisor": "10", - "sensor_multiplier": "1", - "sensor_current": "1", - "sensor_limit": "1.5", + "sensor_descr": "Free Cooling Capacity", + "sensor_divisor": "1", + "sensor_multiplier": "100", + "sensor_current": "33900", + "sensor_limit": "35595", "sensor_limit_warn": null, - "sensor_limit_low": null, + "sensor_limit_low": "32205", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -438,18 +438,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "humidity", + "sensor_class": "cooling", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.90.0", - "sensor_index": "pp1.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.101.0", + "sensor_index": "freecooling-capacity.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Hydraulic Pump 1 Speed", - "sensor_divisor": "10", - "sensor_multiplier": "1", - "sensor_current": "100", - "sensor_limit": "70", + "sensor_descr": "Compressor Cooling Capacity", + "sensor_divisor": "1", + "sensor_multiplier": "100", + "sensor_current": "0", + "sensor_limit": "0", "sensor_limit_warn": null, - "sensor_limit_low": "30", + "sensor_limit_low": "0", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -461,18 +461,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "humidity", + "sensor_class": "cooling", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.91.0", - "sensor_index": "pp2.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.102.0", + "sensor_index": "total-capacity.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Hydraulic Pump 2 Speed", - "sensor_divisor": "10", - "sensor_multiplier": "1", - "sensor_current": "0", - "sensor_limit": "70", + "sensor_descr": "Total cooling Capacity", + "sensor_divisor": "1", + "sensor_multiplier": "100", + "sensor_current": "33900", + "sensor_limit": "35595", "sensor_limit_warn": null, - "sensor_limit_low": "30", + "sensor_limit_low": "32205", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -484,16 +484,16 @@ }, { "sensor_deleted": "0", - "sensor_class": "power", + "sensor_class": "current", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.103.0", - "sensor_index": "analogObjects.103.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.74.0", + "sensor_index": "amp-value.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Power Consumption", - "sensor_divisor": "1", - "sensor_multiplier": "100", - "sensor_current": "700", - "sensor_limit": "1050", + "sensor_descr": "Current Consumption", + "sensor_divisor": "10", + "sensor_multiplier": "1", + "sensor_current": "1", + "sensor_limit": "1.5", "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, @@ -507,41 +507,41 @@ }, { "sensor_deleted": "0", - "sensor_class": "temperature", + "sensor_class": "eer", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.140.0", - "sensor_index": "analogObjects.140.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.3.120.0", + "sensor_index": "analogObjects.120.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Temperature Ambient", - "sensor_divisor": "10", + "sensor_descr": "Energy Efficiency Ratio", + "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "3.6", - "sensor_limit": "23.6", + "sensor_current": "48", + "sensor_limit": null, "sensor_limit_warn": null, - "sensor_limit_low": "-6.4", + "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_prev": null, + "sensor_prev": "0", "user_func": null, "state_name": null }, { "sensor_deleted": "0", - "sensor_class": "temperature", + "sensor_class": "humidity", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.137.0", - "sensor_index": "analogObjects.137.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.90.0", + "sensor_index": "pp1.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Temperature Out", + "sensor_descr": "Hydraulic Pump 1 Speed", "sensor_divisor": "10", "sensor_multiplier": "1", - "sensor_current": "17.9", - "sensor_limit": "37.9", + "sensor_current": "100", + "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "7.9", + "sensor_limit_low": "30", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -553,18 +553,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "temperature", + "sensor_class": "humidity", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.136.0", - "sensor_index": "analogObjects.136.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.91.0", + "sensor_index": "pp2.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Temperature In", + "sensor_descr": "Hydraulic Pump 2 Speed", "sensor_divisor": "10", "sensor_multiplier": "1", - "sensor_current": "18", - "sensor_limit": "38", + "sensor_current": "0", + "sensor_limit": "70", "sensor_limit_warn": null, - "sensor_limit_low": "8", + "sensor_limit_low": "30", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -576,18 +576,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "pressure", + "sensor_class": "power", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.138.0", - "sensor_index": "analogObjects.138.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.103.0", + "sensor_index": "analogObjects.103.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Hydraulic Pressure (Suction)", + "sensor_descr": "Power Consumption", "sensor_divisor": "1", - "sensor_multiplier": "10", - "sensor_current": "160", - "sensor_limit": "168", + "sensor_multiplier": "100", + "sensor_current": "700", + "sensor_limit": "1050", "sensor_limit_warn": null, - "sensor_limit_low": "152", + "sensor_limit_low": null, "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -624,16 +624,16 @@ "sensor_deleted": "0", "sensor_class": "pressure", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.77.0", - "sensor_index": "pressione1.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.138.0", + "sensor_index": "analogObjects.138.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Condensation Pressure 1", + "sensor_descr": "Hydraulic Pressure (Suction)", "sensor_divisor": "1", "sensor_multiplier": "10", - "sensor_current": "700", - "sensor_limit": "735", + "sensor_current": "160", + "sensor_limit": "168", "sensor_limit_warn": null, - "sensor_limit_low": "665", + "sensor_limit_low": "152", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -647,16 +647,16 @@ "sensor_deleted": "0", "sensor_class": "pressure", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.78.0", - "sensor_index": "pressione2.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.77.0", + "sensor_index": "pressione1.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Condensation Pressure 2", + "sensor_descr": "Condensation Pressure 1", "sensor_divisor": "1", "sensor_multiplier": "10", - "sensor_current": "0", - "sensor_limit": "0", + "sensor_current": "700", + "sensor_limit": "735", "sensor_limit_warn": null, - "sensor_limit_low": "0", + "sensor_limit_low": "665", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -668,18 +668,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "cooling", + "sensor_class": "pressure", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.100.0", - "sensor_index": "cooling-capacity.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.78.0", + "sensor_index": "pressione2.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Free Cooling Capacity", + "sensor_descr": "Condensation Pressure 2", "sensor_divisor": "1", - "sensor_multiplier": "100", - "sensor_current": "33900", - "sensor_limit": "35595", + "sensor_multiplier": "10", + "sensor_current": "0", + "sensor_limit": "0", "sensor_limit_warn": null, - "sensor_limit_low": "32205", + "sensor_limit_low": "0", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -691,18 +691,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "cooling", + "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.101.0", - "sensor_index": "freecooling-capacity.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.136.0", + "sensor_index": "analogObjects.136.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Compressor Cooling Capacity", - "sensor_divisor": "1", - "sensor_multiplier": "100", - "sensor_current": "0", - "sensor_limit": "0", + "sensor_descr": "Temperature In", + "sensor_divisor": "10", + "sensor_multiplier": "1", + "sensor_current": "18", + "sensor_limit": "38", "sensor_limit_warn": null, - "sensor_limit_low": "0", + "sensor_limit_low": "8", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -714,18 +714,18 @@ }, { "sensor_deleted": "0", - "sensor_class": "cooling", + "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.102.0", - "sensor_index": "total-capacity.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.137.0", + "sensor_index": "analogObjects.137.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Total cooling Capacity", - "sensor_divisor": "1", - "sensor_multiplier": "100", - "sensor_current": "33900", - "sensor_limit": "35595", + "sensor_descr": "Temperature Out", + "sensor_divisor": "10", + "sensor_multiplier": "1", + "sensor_current": "17.9", + "sensor_limit": "37.9", "sensor_limit_warn": null, - "sensor_limit_low": "32205", + "sensor_limit_low": "7.9", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -737,24 +737,24 @@ }, { "sensor_deleted": "0", - "sensor_class": "eer", + "sensor_class": "temperature", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.9839.2.1.3.120.0", - "sensor_index": "analogObjects.120.0", + "sensor_oid": ".1.3.6.1.4.1.9839.2.1.2.140.0", + "sensor_index": "analogObjects.140.0", "sensor_type": "pcoweb-rittalchiller", - "sensor_descr": "Energy Efficiency Ratio", - "sensor_divisor": "1", + "sensor_descr": "Temperature Ambient", + "sensor_divisor": "10", "sensor_multiplier": "1", - "sensor_current": "48", - "sensor_limit": null, + "sensor_current": "3.6", + "sensor_limit": "23.6", "sensor_limit_warn": null, - "sensor_limit_low": null, + "sensor_limit_low": "-6.4", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_prev": "0", + "sensor_prev": null, "user_func": null, "state_name": null }, @@ -785,4 +785,4 @@ "state_indexes": [] } } -} \ No newline at end of file +} diff --git a/tests/data/procurve.json b/tests/data/procurve.json index 2f2a6ed2a0e2..bf6aa0015cab 100644 --- a/tests/data/procurve.json +++ b/tests/data/procurve.json @@ -20,29 +20,6 @@ "sensors": { "discovery": { "sensors": [ - { - "sensor_deleted": "0", - "sensor_class": "temperature", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.25", - "sensor_index": "25", - "sensor_type": "entity-sensor", - "sensor_descr": "Chassis Temperature", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "20", - "sensor_limit": "40", - "sensor_limit_warn": null, - "sensor_limit_low": "10", - "sensor_limit_low_warn": null, - "sensor_alert": "1", - "sensor_custom": "No", - "entPhysicalIndex": "25", - "entPhysicalIndex_measured": null, - "sensor_prev": null, - "user_func": null, - "state_name": null - }, { "sensor_deleted": "0", "sensor_class": "power", @@ -89,29 +66,6 @@ "user_func": null, "state_name": null }, - { - "sensor_deleted": "0", - "sensor_class": "state", - "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.11.2.14.11.1.2.6.1.4.1", - "sensor_index": "icfTemperatureSensor.1", - "sensor_type": "icfTemperatureSensor", - "sensor_descr": "Chassis Sensor", - "sensor_divisor": "1", - "sensor_multiplier": "1", - "sensor_current": "5", - "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": "icfTemperatureSensor" - }, { "sensor_deleted": "0", "sensor_class": "state", @@ -296,6 +250,52 @@ "user_func": null, "state_name": "hpicfPsState" }, + { + "sensor_deleted": "0", + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.11.2.14.11.1.2.6.1.4.1", + "sensor_index": "icfTemperatureSensor.1", + "sensor_type": "icfTemperatureSensor", + "sensor_descr": "Chassis Sensor", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "5", + "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": "icfTemperatureSensor" + }, + { + "sensor_deleted": "0", + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.25", + "sensor_index": "25", + "sensor_type": "entity-sensor", + "sensor_descr": "Chassis Temperature", + "sensor_divisor": "1", + "sensor_multiplier": "1", + "sensor_current": "20", + "sensor_limit": "40", + "sensor_limit_warn": null, + "sensor_limit_low": "10", + "sensor_limit_low_warn": null, + "sensor_alert": "1", + "sensor_custom": "No", + "entPhysicalIndex": "25", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + }, { "sensor_deleted": "0", "sensor_class": "temperature", diff --git a/tests/data/routeros.json b/tests/data/routeros.json index 1f5b0ec147de..657d1f3ff1f0 100644 --- a/tests/data/routeros.json +++ b/tests/data/routeros.json @@ -2536,16 +2536,16 @@ "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_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 Tx", + "sensor_descr": "sfp1 Rx", "sensor_divisor": "1000", "sensor_multiplier": "1", - "sensor_current": "-4.879", - "sensor_limit": "-4.63505", + "sensor_current": "-5.673", + "sensor_limit": "-5.38935", "sensor_limit_warn": null, - "sensor_limit_low": "-5.12295", + "sensor_limit_low": "-5.95665", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -2559,16 +2559,16 @@ "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_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 Rx", + "sensor_descr": "sfp1 Tx", "sensor_divisor": "1000", "sensor_multiplier": "1", - "sensor_current": "-5.673", - "sensor_limit": "-5.38935", + "sensor_current": "-4.879", + "sensor_limit": "-4.63505", "sensor_limit_warn": null, - "sensor_limit_low": "-5.95665", + "sensor_limit_low": "-5.12295", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -2605,13 +2605,13 @@ "sensor_deleted": "0", "sensor_class": "signal", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.156.92.142.164.164.119.9", - "sensor_index": "9", + "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.244.14.34.43.52.123.1", + "sensor_index": "1", "sensor_type": "routeros", - "sensor_descr": "wlan4 Signal", + "sensor_descr": "wlan1 Signal", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-63", + "sensor_current": "-82", "sensor_limit": "-30", "sensor_limit_warn": null, "sensor_limit_low": "-80", @@ -2628,13 +2628,13 @@ "sensor_deleted": "0", "sensor_class": "signal", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.244.14.34.43.52.123.1", - "sensor_index": "1", + "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.156.92.142.164.164.119.9", + "sensor_index": "9", "sensor_type": "routeros", - "sensor_descr": "wlan1 Signal", + "sensor_descr": "wlan4 Signal", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-82", + "sensor_current": "-63", "sensor_limit": "-30", "sensor_limit_warn": null, "sensor_limit_low": "-80", @@ -2693,6 +2693,29 @@ "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.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": "temperature", @@ -2718,19 +2741,19 @@ }, { "sensor_deleted": "0", - "sensor_class": "temperature", + "sensor_class": "voltage", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.14988.1.1.3.10.0", + "sensor_oid": ".1.3.6.1.4.1.14988.1.1.3.8.0", "sensor_index": "0", "sensor_type": "routeros", - "sensor_descr": "Temperature 0", + "sensor_descr": "Voltage 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_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, @@ -2784,29 +2807,6 @@ "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": [ @@ -2906,16 +2906,16 @@ "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_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 Tx", + "sensor_descr": "sfp1 Rx", "sensor_divisor": "1000", "sensor_multiplier": "1", - "sensor_current": "-4.879", - "sensor_limit": "-4.63505", + "sensor_current": "-5.673", + "sensor_limit": "-5.38935", "sensor_limit_warn": null, - "sensor_limit_low": "-5.12295", + "sensor_limit_low": "-5.95665", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -2929,16 +2929,16 @@ "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_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 Rx", + "sensor_descr": "sfp1 Tx", "sensor_divisor": "1000", "sensor_multiplier": "1", - "sensor_current": "-5.673", - "sensor_limit": "-5.38935", + "sensor_current": "-4.879", + "sensor_limit": "-4.63505", "sensor_limit_warn": null, - "sensor_limit_low": "-5.95665", + "sensor_limit_low": "-5.12295", "sensor_limit_low_warn": null, "sensor_alert": "1", "sensor_custom": "No", @@ -2975,13 +2975,13 @@ "sensor_deleted": "0", "sensor_class": "signal", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.156.92.142.164.164.119.9", - "sensor_index": "9", + "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.244.14.34.43.52.123.1", + "sensor_index": "1", "sensor_type": "routeros", - "sensor_descr": "wlan4 Signal", + "sensor_descr": "wlan1 Signal", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-77", + "sensor_current": "-82", "sensor_limit": "-30", "sensor_limit_warn": null, "sensor_limit_low": "-80", @@ -2990,7 +2990,7 @@ "sensor_custom": "No", "entPhysicalIndex": "", "entPhysicalIndex_measured": "", - "sensor_prev": "-63", + "sensor_prev": null, "user_func": "", "state_name": null }, @@ -2998,13 +2998,13 @@ "sensor_deleted": "0", "sensor_class": "signal", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.244.14.34.43.52.123.1", - "sensor_index": "1", + "sensor_oid": ".1.3.6.1.4.1.14988.1.1.1.2.1.3.156.92.142.164.164.119.9", + "sensor_index": "9", "sensor_type": "routeros", - "sensor_descr": "wlan1 Signal", + "sensor_descr": "wlan4 Signal", "sensor_divisor": "1", "sensor_multiplier": "1", - "sensor_current": "-82", + "sensor_current": "-77", "sensor_limit": "-30", "sensor_limit_warn": null, "sensor_limit_low": "-80", @@ -3013,7 +3013,7 @@ "sensor_custom": "No", "entPhysicalIndex": "", "entPhysicalIndex_measured": "", - "sensor_prev": null, + "sensor_prev": "-63", "user_func": "", "state_name": null }, @@ -3063,6 +3063,29 @@ "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.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": "temperature", @@ -3088,19 +3111,19 @@ }, { "sensor_deleted": "0", - "sensor_class": "temperature", + "sensor_class": "voltage", "poller_type": "snmp", - "sensor_oid": ".1.3.6.1.4.1.14988.1.1.3.10.0", + "sensor_oid": ".1.3.6.1.4.1.14988.1.1.3.8.0", "sensor_index": "0", "sensor_type": "routeros", - "sensor_descr": "Temperature 0", + "sensor_descr": "Voltage 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_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, @@ -3154,29 +3177,6 @@ "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": [