diff --git a/html/pages/device/overview/generic/sensor.inc.php b/html/pages/device/overview/generic/sensor.inc.php
index 5ded1906a6..a1adc971ea 100644
--- a/html/pages/device/overview/generic/sensor.inc.php
+++ b/html/pages/device/overview/generic/sensor.inc.php
@@ -101,10 +101,13 @@ if (count($sensors)) {
'.overlib_link($link, ''.$state_translation['0']['state_descr'].'', $overlib_content, $sensor_class).' |
';
} else {
+ $sensor_current = $sensor_class == 'runtime' ? formatUptime($sensor['sensor_current'] * 60, 'short') : $sensor['sensor_current'] . $sensor_unit;
+ $alarmed = ((!is_null($sensor['sensor_limit_low']) && $sensor['sensor_current'] < $sensor['sensor_limit_low']) || (!is_null($sensor['sensor_limit']) && $sensor['sensor_current'] > $sensor['sensor_limit']));
+
echo '
'.overlib_link($link, shorten_interface_type($sensor['sensor_descr']), $overlib_content, $sensor_class).' |
'.overlib_link($link, $sensor_minigraph, $overlib_content, $sensor_class).' |
- '.overlib_link($link, ' $sensor['sensor_limit'] ? "style='color: red'" : '').'>'.$sensor['sensor_current'].$sensor_unit.'', $overlib_content, $sensor_class).' |
+ '.overlib_link($link, ''.$sensor_current.'', $overlib_content, $sensor_class).' |
';
}//end if
}//end foreach
diff --git a/includes/definitions/discovery/valere.yaml b/includes/definitions/discovery/valere.yaml
index 484995a4b0..561ca97315 100644
--- a/includes/definitions/discovery/valere.yaml
+++ b/includes/definitions/discovery/valere.yaml
@@ -16,6 +16,18 @@ modules:
value: vpwrSystemCurrent
num_oid: '.1.3.6.1.4.1.13858.2.3.3.{{ $index }}'
descr: System Current
+ -
+ oid: vpwrSystemIdentTable
+ value: vpwrModuleCurrent
+ num_oid: '.1.3.6.1.4.1.13858.2.1.6.1.4.{{ $index }}'
+ high_limit: vpwrModuleCapacity
+ divisor: 100
+ descr: 'Module {{ $vpwrBayIndex }}.{{ $vpwrModuleIndex }} Current'
+ group: Modules
+ skip_values:
+ - oid: vpwrModuleOID
+ op: '='
+ value: 'vpwrDcPowerLvd'
temperature:
data:
-
@@ -23,27 +35,49 @@ modules:
value: vpwrSystemInternalTemperature
num_oid: '.1.3.6.1.4.1.13858.2.3.5.{{ $index }}'
descr: Internal Temperature
+ -
+ oid: vpwrBatteryTempTable
+ value: vpwrBatteryTemp
+ num_oid: '.1.3.6.1.4.1.13858.7.1.1.1.3.{{ $index }}'
+ descr: vpwrBatteryTempName
+ index: 'battery{{ $index }}'
+ group: Batteries
+ skip_value_lt: -125
state:
data:
-
oid: vpwrSystemParameterGroup
value: vpwrSystemControllerState
num_oid: '.1.3.6.1.4.1.13858.2.3.4.{{ $index }}'
- descr: Controller State
+ descr: Controller Status
state_name: vpwrSystemControllerState
states:
- - { descr: systemControllerStateUnknown, graph: 0, value: 0, generic: 3 }
- - { descr: systemControllerStateNormal, graph: 0, value: 1, generic: 0 }
- - { descr: systemControllerStateChange, graph: 0, value: 2, generic: 1 }
- - { descr: systemControllerStateAlarm, graph: 0, value: 3, generic: 2 }
- - { descr: systemControllerStateMenu, graph: 0, value: 4, generic: 1 }
- - { descr: systemControllerStateIrActive, graph: 0, value: 5, generic: 1 }
+ - { descr: Unknown, graph: 0, value: 0, generic: 3 }
+ - { descr: Normal, graph: 0, value: 1, generic: 0 }
+ - { descr: Change, graph: 0, value: 2, generic: 1 }
+ - { descr: Alarm, graph: 0, value: 3, generic: 2 }
+ - { descr: Menu, graph: 0, value: 4, generic: 1 }
+ - { descr: IrActive, graph: 0, value: 5, generic: 1 }
-
oid: vpwrSystemParameterGroup
value: vpwrSystemTempCompensationState
- num_oid: '.1.3.6.1.4.1.13858.2.3.4.{{ $index }}'
- descr: Temperature Compensation State
+ num_oid: '.1.3.6.1.4.1.13858.2.3.6.{{ $index }}'
+ descr: Temperature Compensation
state_name: vpwrSystemTempCompensationState
states:
- - { descr: systemTempCompInactive, graph: 0, value: 0, generic: 0 }
- - { descr: systemTempCompActive, graph: 0, value: 1, generic: 1 }
+ - { descr: Inactive, graph: 0, value: 0, generic: 0 }
+ - { descr: Active, graph: 0, value: 1, generic: 1 }
+ -
+ oid: vpwrSystemIdentTable
+ value: vpwrModuleOperStatus
+ num_oid: '.1.3.6.1.4.1.13858.2.1.6.1.5.{{ $index }}'
+ descr: "Module {{ $vpwrBayIndex }}.{{ $vpwrModuleIndex }} Status"
+ group: Modules
+ state_name: vpwrModuleOperStatus
+ states:
+ - { descr: Ok, graph: 0, value: 0, generic: 0 }
+ - { descr: Alarm, graph: 0, value: 1, generic: 2 }
+ - { descr: Disabled, graph: 0, value: 2, generic: 3 }
+ - { descr: RingerAOn, graph: 0, value: 3, generic: 1 }
+ - { descr: RingerBOn, graph: 0, value: 4, generic: 1 }
+ - { descr: Unknown, graph: 0, value: 5, generic: 3 }
diff --git a/tests/data/valere.json b/tests/data/valere.json
new file mode 100644
index 0000000000..36064be746
--- /dev/null
+++ b/tests/data/valere.json
@@ -0,0 +1,607 @@
+{
+ "os": {
+ "discovery": {
+ "devices": [
+ {
+ "sysName": "",
+ "sysObjectID": ".1.3.6.1.4.1.13858",
+ "sysDescr": "Sys Description",
+ "sysContact": null,
+ "version": null,
+ "hardware": null,
+ "features": null,
+ "os": "valere",
+ "type": "power",
+ "serial": null,
+ "icon": "eltek.png",
+ "location": null
+ }
+ ]
+ },
+ "poller": {
+ "devices": [
+ {
+ "sysName": "",
+ "sysObjectID": ".1.3.6.1.4.1.13858",
+ "sysDescr": "Sys Description",
+ "sysContact": "",
+ "version": "4.01.40",
+ "hardware": "BC2000",
+ "features": "vpwrDcPowerRectifier, vpwrDcPowerRectifier",
+ "os": "valere",
+ "type": "power",
+ "serial": null,
+ "icon": "eltek.png",
+ "location": ""
+ }
+ ]
+ }
+ },
+ "ports": {
+ "discovery": {
+ "ports": [
+ {
+ "port_descr_type": null,
+ "port_descr_descr": null,
+ "port_descr_circuit": null,
+ "port_descr_speed": null,
+ "port_descr_notes": null,
+ "ifDescr": "Ethernet Interface",
+ "ifName": "Ethernet Interface",
+ "portName": null,
+ "ifIndex": 1,
+ "ifSpeed": null,
+ "ifConnectorPresent": null,
+ "ifPromiscuousMode": null,
+ "ifHighSpeed": null,
+ "ifOperStatus": null,
+ "ifOperStatus_prev": null,
+ "ifAdminStatus": null,
+ "ifAdminStatus_prev": null,
+ "ifDuplex": null,
+ "ifMtu": null,
+ "ifType": "ethernetCsmacd",
+ "ifAlias": "Ethernet Interface",
+ "ifPhysAddress": null,
+ "ifHardType": null,
+ "ifLastChange": 0,
+ "ifVlan": "",
+ "ifTrunk": null,
+ "counter_in": null,
+ "counter_out": null,
+ "ignore": 0,
+ "disabled": 0,
+ "detailed": 0,
+ "deleted": 0,
+ "pagpOperationMode": null,
+ "pagpPortState": null,
+ "pagpPartnerDeviceId": null,
+ "pagpPartnerLearnMethod": null,
+ "pagpPartnerIfIndex": null,
+ "pagpPartnerGroupIfIndex": null,
+ "pagpPartnerDeviceName": null,
+ "pagpEthcOperationMode": null,
+ "pagpDeviceId": null,
+ "pagpGroupIfIndex": null,
+ "ifInUcastPkts": null,
+ "ifInUcastPkts_prev": null,
+ "ifInUcastPkts_delta": null,
+ "ifInUcastPkts_rate": null,
+ "ifOutUcastPkts": null,
+ "ifOutUcastPkts_prev": null,
+ "ifOutUcastPkts_delta": null,
+ "ifOutUcastPkts_rate": null,
+ "ifInErrors": null,
+ "ifInErrors_prev": null,
+ "ifInErrors_delta": null,
+ "ifInErrors_rate": null,
+ "ifOutErrors": null,
+ "ifOutErrors_prev": null,
+ "ifOutErrors_delta": null,
+ "ifOutErrors_rate": null,
+ "ifInOctets": null,
+ "ifInOctets_prev": null,
+ "ifInOctets_delta": null,
+ "ifInOctets_rate": null,
+ "ifOutOctets": null,
+ "ifOutOctets_prev": null,
+ "ifOutOctets_delta": null,
+ "ifOutOctets_rate": null,
+ "poll_prev": null,
+ "ifInNUcastPkts": null,
+ "ifInNUcastPkts_prev": null,
+ "ifInNUcastPkts_delta": null,
+ "ifInNUcastPkts_rate": null,
+ "ifOutNUcastPkts": null,
+ "ifOutNUcastPkts_prev": null,
+ "ifOutNUcastPkts_delta": null,
+ "ifOutNUcastPkts_rate": null,
+ "ifInDiscards": null,
+ "ifInDiscards_prev": null,
+ "ifInDiscards_delta": null,
+ "ifInDiscards_rate": null,
+ "ifOutDiscards": null,
+ "ifOutDiscards_prev": null,
+ "ifOutDiscards_delta": null,
+ "ifOutDiscards_rate": null,
+ "ifInUnknownProtos": null,
+ "ifInUnknownProtos_prev": null,
+ "ifInUnknownProtos_delta": null,
+ "ifInUnknownProtos_rate": null,
+ "ifInBroadcastPkts": null,
+ "ifInBroadcastPkts_prev": null,
+ "ifInBroadcastPkts_delta": null,
+ "ifInBroadcastPkts_rate": null,
+ "ifOutBroadcastPkts": null,
+ "ifOutBroadcastPkts_prev": null,
+ "ifOutBroadcastPkts_delta": null,
+ "ifOutBroadcastPkts_rate": null,
+ "ifInMulticastPkts": null,
+ "ifInMulticastPkts_prev": null,
+ "ifInMulticastPkts_delta": null,
+ "ifInMulticastPkts_rate": null,
+ "ifOutMulticastPkts": null,
+ "ifOutMulticastPkts_prev": null,
+ "ifOutMulticastPkts_delta": null,
+ "ifOutMulticastPkts_rate": null
+ }
+ ]
+ },
+ "poller": {
+ "ports": [
+ {
+ "port_descr_type": null,
+ "port_descr_descr": null,
+ "port_descr_circuit": null,
+ "port_descr_speed": null,
+ "port_descr_notes": null,
+ "ifDescr": "Ethernet Interface",
+ "ifName": "Ethernet Interface",
+ "portName": null,
+ "ifIndex": 1,
+ "ifSpeed": 1000000,
+ "ifConnectorPresent": null,
+ "ifPromiscuousMode": null,
+ "ifHighSpeed": null,
+ "ifOperStatus": "up",
+ "ifOperStatus_prev": null,
+ "ifAdminStatus": "up",
+ "ifAdminStatus_prev": null,
+ "ifDuplex": null,
+ "ifMtu": 1500,
+ "ifType": "ethernetCsmacd",
+ "ifAlias": "Ethernet Interface",
+ "ifPhysAddress": "000a19deedfe",
+ "ifHardType": null,
+ "ifLastChange": 0,
+ "ifVlan": "",
+ "ifTrunk": null,
+ "counter_in": null,
+ "counter_out": null,
+ "ignore": 0,
+ "disabled": 0,
+ "detailed": 0,
+ "deleted": 0,
+ "pagpOperationMode": null,
+ "pagpPortState": null,
+ "pagpPartnerDeviceId": null,
+ "pagpPartnerLearnMethod": null,
+ "pagpPartnerIfIndex": null,
+ "pagpPartnerGroupIfIndex": null,
+ "pagpPartnerDeviceName": null,
+ "pagpEthcOperationMode": null,
+ "pagpDeviceId": null,
+ "pagpGroupIfIndex": null,
+ "ifInUcastPkts": 407891,
+ "ifInUcastPkts_prev": 0,
+ "ifInUcastPkts_delta": null,
+ "ifInUcastPkts_rate": null,
+ "ifOutUcastPkts": 407857,
+ "ifOutUcastPkts_prev": 0,
+ "ifOutUcastPkts_delta": null,
+ "ifOutUcastPkts_rate": null,
+ "ifInErrors": 0,
+ "ifInErrors_prev": 0,
+ "ifInErrors_delta": null,
+ "ifInErrors_rate": null,
+ "ifOutErrors": 0,
+ "ifOutErrors_prev": 0,
+ "ifOutErrors_delta": null,
+ "ifOutErrors_rate": null,
+ "ifInOctets": 0,
+ "ifInOctets_prev": 0,
+ "ifInOctets_delta": null,
+ "ifInOctets_rate": null,
+ "ifOutOctets": 0,
+ "ifOutOctets_prev": 0,
+ "ifOutOctets_delta": null,
+ "ifOutOctets_rate": null,
+ "poll_prev": null,
+ "ifInNUcastPkts": 263731,
+ "ifInNUcastPkts_prev": 0,
+ "ifInNUcastPkts_delta": null,
+ "ifInNUcastPkts_rate": null,
+ "ifOutNUcastPkts": 2,
+ "ifOutNUcastPkts_prev": 0,
+ "ifOutNUcastPkts_delta": null,
+ "ifOutNUcastPkts_rate": null,
+ "ifInDiscards": 0,
+ "ifInDiscards_prev": 0,
+ "ifInDiscards_delta": null,
+ "ifInDiscards_rate": null,
+ "ifOutDiscards": 0,
+ "ifOutDiscards_prev": 0,
+ "ifOutDiscards_delta": null,
+ "ifOutDiscards_rate": null,
+ "ifInUnknownProtos": 1599,
+ "ifInUnknownProtos_prev": 0,
+ "ifInUnknownProtos_delta": null,
+ "ifInUnknownProtos_rate": null,
+ "ifInBroadcastPkts": 0,
+ "ifInBroadcastPkts_prev": 0,
+ "ifInBroadcastPkts_delta": null,
+ "ifInBroadcastPkts_rate": null,
+ "ifOutBroadcastPkts": 0,
+ "ifOutBroadcastPkts_prev": 0,
+ "ifOutBroadcastPkts_delta": null,
+ "ifOutBroadcastPkts_rate": null,
+ "ifInMulticastPkts": 0,
+ "ifInMulticastPkts_prev": 0,
+ "ifInMulticastPkts_delta": null,
+ "ifInMulticastPkts_rate": null,
+ "ifOutMulticastPkts": 0,
+ "ifOutMulticastPkts_prev": 0,
+ "ifOutMulticastPkts_delta": null,
+ "ifOutMulticastPkts_rate": null
+ }
+ ]
+ }
+ },
+ "sensors": {
+ "discovery": {
+ "sensors": [
+ {
+ "sensor_deleted": 0,
+ "sensor_class": "current",
+ "poller_type": "snmp",
+ "sensor_oid": ".1.3.6.1.4.1.13858.2.3.3.0",
+ "sensor_index": "0",
+ "sensor_type": "valere",
+ "sensor_descr": "System Current",
+ "group": "",
+ "sensor_divisor": 1,
+ "sensor_multiplier": 1,
+ "sensor_current": 17,
+ "sensor_limit": 25.5,
+ "sensor_limit_warn": null,
+ "sensor_limit_low": null,
+ "sensor_limit_low_warn": null,
+ "sensor_alert": 1,
+ "sensor_custom": "No",
+ "entPhysicalIndex": null,
+ "entPhysicalIndex_measured": null,
+ "sensor_prev": null,
+ "user_func": null,
+ "state_name": null
+ },
+ {
+ "sensor_deleted": 0,
+ "sensor_class": "current",
+ "poller_type": "snmp",
+ "sensor_oid": ".1.3.6.1.4.1.13858.2.1.6.1.4.1.1",
+ "sensor_index": "1.1",
+ "sensor_type": "valere",
+ "sensor_descr": "Module 1.1 Current",
+ "group": "Modules",
+ "sensor_divisor": 100,
+ "sensor_multiplier": 1,
+ "sensor_current": 9.11,
+ "sensor_limit": 52.5,
+ "sensor_limit_warn": null,
+ "sensor_limit_low": null,
+ "sensor_limit_low_warn": null,
+ "sensor_alert": 1,
+ "sensor_custom": "No",
+ "entPhysicalIndex": null,
+ "entPhysicalIndex_measured": null,
+ "sensor_prev": null,
+ "user_func": null,
+ "state_name": null
+ },
+ {
+ "sensor_deleted": 0,
+ "sensor_class": "current",
+ "poller_type": "snmp",
+ "sensor_oid": ".1.3.6.1.4.1.13858.2.1.6.1.4.1.2",
+ "sensor_index": "1.2",
+ "sensor_type": "valere",
+ "sensor_descr": "Module 1.2 Current",
+ "group": "Modules",
+ "sensor_divisor": 100,
+ "sensor_multiplier": 1,
+ "sensor_current": 9.07,
+ "sensor_limit": 52.5,
+ "sensor_limit_warn": null,
+ "sensor_limit_low": null,
+ "sensor_limit_low_warn": null,
+ "sensor_alert": 1,
+ "sensor_custom": "No",
+ "entPhysicalIndex": null,
+ "entPhysicalIndex_measured": null,
+ "sensor_prev": null,
+ "user_func": null,
+ "state_name": null
+ },
+ {
+ "sensor_deleted": 0,
+ "sensor_class": "state",
+ "poller_type": "snmp",
+ "sensor_oid": ".1.3.6.1.4.1.13858.2.1.6.1.5.1.1",
+ "sensor_index": "1.1",
+ "sensor_type": "vpwrModuleOperStatus",
+ "sensor_descr": "Module 1.1 Status",
+ "group": "Modules",
+ "sensor_divisor": 1,
+ "sensor_multiplier": 1,
+ "sensor_current": 0,
+ "sensor_limit": null,
+ "sensor_limit_warn": null,
+ "sensor_limit_low": null,
+ "sensor_limit_low_warn": null,
+ "sensor_alert": 1,
+ "sensor_custom": "No",
+ "entPhysicalIndex": null,
+ "entPhysicalIndex_measured": null,
+ "sensor_prev": null,
+ "user_func": null,
+ "state_name": "vpwrModuleOperStatus"
+ },
+ {
+ "sensor_deleted": 0,
+ "sensor_class": "state",
+ "poller_type": "snmp",
+ "sensor_oid": ".1.3.6.1.4.1.13858.2.1.6.1.5.1.2",
+ "sensor_index": "1.2",
+ "sensor_type": "vpwrModuleOperStatus",
+ "sensor_descr": "Module 1.2 Status",
+ "group": "Modules",
+ "sensor_divisor": 1,
+ "sensor_multiplier": 1,
+ "sensor_current": 0,
+ "sensor_limit": null,
+ "sensor_limit_warn": null,
+ "sensor_limit_low": null,
+ "sensor_limit_low_warn": null,
+ "sensor_alert": 1,
+ "sensor_custom": "No",
+ "entPhysicalIndex": null,
+ "entPhysicalIndex_measured": null,
+ "sensor_prev": null,
+ "user_func": null,
+ "state_name": "vpwrModuleOperStatus"
+ },
+ {
+ "sensor_deleted": 0,
+ "sensor_class": "state",
+ "poller_type": "snmp",
+ "sensor_oid": ".1.3.6.1.4.1.13858.2.3.4.0",
+ "sensor_index": "0",
+ "sensor_type": "vpwrSystemControllerState",
+ "sensor_descr": "Controller Status",
+ "group": "",
+ "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_measured": null,
+ "sensor_prev": null,
+ "user_func": null,
+ "state_name": "vpwrSystemControllerState"
+ },
+ {
+ "sensor_deleted": 0,
+ "sensor_class": "state",
+ "poller_type": "snmp",
+ "sensor_oid": ".1.3.6.1.4.1.13858.2.3.6.0",
+ "sensor_index": "0",
+ "sensor_type": "vpwrSystemTempCompensationState",
+ "sensor_descr": "Temperature Compensation",
+ "group": "",
+ "sensor_divisor": 1,
+ "sensor_multiplier": 1,
+ "sensor_current": 0,
+ "sensor_limit": null,
+ "sensor_limit_warn": null,
+ "sensor_limit_low": null,
+ "sensor_limit_low_warn": null,
+ "sensor_alert": 1,
+ "sensor_custom": "No",
+ "entPhysicalIndex": null,
+ "entPhysicalIndex_measured": null,
+ "sensor_prev": null,
+ "user_func": null,
+ "state_name": "vpwrSystemTempCompensationState"
+ },
+ {
+ "sensor_deleted": 0,
+ "sensor_class": "temperature",
+ "poller_type": "snmp",
+ "sensor_oid": ".1.3.6.1.4.1.13858.2.3.5.0",
+ "sensor_index": "0",
+ "sensor_type": "valere",
+ "sensor_descr": "Internal Temperature",
+ "group": "",
+ "sensor_divisor": 1,
+ "sensor_multiplier": 1,
+ "sensor_current": 25,
+ "sensor_limit": 45,
+ "sensor_limit_warn": null,
+ "sensor_limit_low": 15,
+ "sensor_limit_low_warn": null,
+ "sensor_alert": 1,
+ "sensor_custom": "No",
+ "entPhysicalIndex": null,
+ "entPhysicalIndex_measured": null,
+ "sensor_prev": null,
+ "user_func": null,
+ "state_name": null
+ },
+ {
+ "sensor_deleted": 0,
+ "sensor_class": "temperature",
+ "poller_type": "snmp",
+ "sensor_oid": ".1.3.6.1.4.1.13858.7.1.1.1.3.0",
+ "sensor_index": "battery0",
+ "sensor_type": "valere",
+ "sensor_descr": "Main Batteries",
+ "group": "Batteries",
+ "sensor_divisor": 1,
+ "sensor_multiplier": 1,
+ "sensor_current": 30,
+ "sensor_limit": 50,
+ "sensor_limit_warn": null,
+ "sensor_limit_low": 20,
+ "sensor_limit_low_warn": null,
+ "sensor_alert": 1,
+ "sensor_custom": "No",
+ "entPhysicalIndex": null,
+ "entPhysicalIndex_measured": null,
+ "sensor_prev": null,
+ "user_func": null,
+ "state_name": null
+ },
+ {
+ "sensor_deleted": 0,
+ "sensor_class": "voltage",
+ "poller_type": "snmp",
+ "sensor_oid": ".1.3.6.1.4.1.13858.2.3.2.0",
+ "sensor_index": "0",
+ "sensor_type": "valere",
+ "sensor_descr": "System Voltage",
+ "group": "",
+ "sensor_divisor": 100,
+ "sensor_multiplier": 1,
+ "sensor_current": 54,
+ "sensor_limit": 62.1,
+ "sensor_limit_warn": null,
+ "sensor_limit_low": 45.9,
+ "sensor_limit_low_warn": null,
+ "sensor_alert": 1,
+ "sensor_custom": "No",
+ "entPhysicalIndex": null,
+ "entPhysicalIndex_measured": null,
+ "sensor_prev": null,
+ "user_func": null,
+ "state_name": null
+ }
+ ],
+ "state_indexes": [
+ {
+ "state_name": "vpwrModuleOperStatus",
+ "state_descr": "Ok",
+ "state_draw_graph": 0,
+ "state_value": 0,
+ "state_generic_value": 0
+ },
+ {
+ "state_name": "vpwrModuleOperStatus",
+ "state_descr": "Alarm",
+ "state_draw_graph": 0,
+ "state_value": 1,
+ "state_generic_value": 2
+ },
+ {
+ "state_name": "vpwrModuleOperStatus",
+ "state_descr": "Disabled",
+ "state_draw_graph": 0,
+ "state_value": 2,
+ "state_generic_value": 3
+ },
+ {
+ "state_name": "vpwrModuleOperStatus",
+ "state_descr": "RingerAOn",
+ "state_draw_graph": 0,
+ "state_value": 3,
+ "state_generic_value": 1
+ },
+ {
+ "state_name": "vpwrModuleOperStatus",
+ "state_descr": "RingerBOn",
+ "state_draw_graph": 0,
+ "state_value": 4,
+ "state_generic_value": 1
+ },
+ {
+ "state_name": "vpwrModuleOperStatus",
+ "state_descr": "Unknown",
+ "state_draw_graph": 0,
+ "state_value": 5,
+ "state_generic_value": 3
+ },
+ {
+ "state_name": "vpwrSystemControllerState",
+ "state_descr": "Unknown",
+ "state_draw_graph": 0,
+ "state_value": 0,
+ "state_generic_value": 3
+ },
+ {
+ "state_name": "vpwrSystemControllerState",
+ "state_descr": "Normal",
+ "state_draw_graph": 0,
+ "state_value": 1,
+ "state_generic_value": 0
+ },
+ {
+ "state_name": "vpwrSystemControllerState",
+ "state_descr": "Change",
+ "state_draw_graph": 0,
+ "state_value": 2,
+ "state_generic_value": 1
+ },
+ {
+ "state_name": "vpwrSystemControllerState",
+ "state_descr": "Alarm",
+ "state_draw_graph": 0,
+ "state_value": 3,
+ "state_generic_value": 2
+ },
+ {
+ "state_name": "vpwrSystemControllerState",
+ "state_descr": "Menu",
+ "state_draw_graph": 0,
+ "state_value": 4,
+ "state_generic_value": 1
+ },
+ {
+ "state_name": "vpwrSystemControllerState",
+ "state_descr": "IrActive",
+ "state_draw_graph": 0,
+ "state_value": 5,
+ "state_generic_value": 1
+ },
+ {
+ "state_name": "vpwrSystemTempCompensationState",
+ "state_descr": "Inactive",
+ "state_draw_graph": 0,
+ "state_value": 0,
+ "state_generic_value": 0
+ },
+ {
+ "state_name": "vpwrSystemTempCompensationState",
+ "state_descr": "Active",
+ "state_draw_graph": 0,
+ "state_value": 1,
+ "state_generic_value": 1
+ }
+ ]
+ },
+ "poller": "matches discovery"
+ }
+}
diff --git a/tests/snmpsim/valere.snmprec b/tests/snmpsim/valere.snmprec
index 4ff2cade56..3c98ad3124 100644
--- a/tests/snmpsim/valere.snmprec
+++ b/tests/snmpsim/valere.snmprec
@@ -1,2 +1,151 @@
1.3.6.1.2.1.1.1.0|4|Sys Description
1.3.6.1.2.1.1.2.0|6|.1.3.6.1.4.1.13858
+1.3.6.1.2.1.1.3.0|67|93824075
+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|
+1.3.6.1.2.1.2.2.1.1.1|2|1
+1.3.6.1.2.1.2.2.1.2.1|4|Ethernet Interface
+1.3.6.1.2.1.2.2.1.3.1|2|6
+1.3.6.1.2.1.2.2.1.4.1|2|1500
+1.3.6.1.2.1.2.2.1.5.1|66|1000000
+1.3.6.1.2.1.2.2.1.6.1|4x|000A19DEEDFE
+1.3.6.1.2.1.2.2.1.7.1|2|1
+1.3.6.1.2.1.2.2.1.8.1|2|1
+1.3.6.1.2.1.2.2.1.9.1|67|0
+1.3.6.1.2.1.2.2.1.10.1|65|0
+1.3.6.1.2.1.2.2.1.11.1|65|407891
+1.3.6.1.2.1.2.2.1.12.1|65|263731
+1.3.6.1.2.1.2.2.1.13.1|65|0
+1.3.6.1.2.1.2.2.1.14.1|65|0
+1.3.6.1.2.1.2.2.1.15.1|65|1599
+1.3.6.1.2.1.2.2.1.16.1|65|0
+1.3.6.1.2.1.2.2.1.17.1|65|407857
+1.3.6.1.2.1.2.2.1.18.1|65|2
+1.3.6.1.2.1.2.2.1.19.1|65|0
+1.3.6.1.2.1.2.2.1.20.1|65|0
+1.3.6.1.2.1.2.2.1.21.1|66|0
+1.3.6.1.2.1.2.2.1.22.1|6|0.0.0
+1.3.6.1.2.1.4.3.0|65|600208
+1.3.6.1.2.1.4.4.0|65|0
+1.3.6.1.2.1.4.5.0|65|4
+1.3.6.1.2.1.4.6.0|65|0
+1.3.6.1.2.1.4.7.0|65|0
+1.3.6.1.2.1.4.8.0|65|0
+1.3.6.1.2.1.4.9.0|65|600203
+1.3.6.1.2.1.4.10.0|65|384421
+1.3.6.1.2.1.4.11.0|65|0
+1.3.6.1.2.1.4.12.0|65|0
+1.3.6.1.2.1.4.14.0|65|0
+1.3.6.1.2.1.4.15.0|65|0
+1.3.6.1.2.1.4.16.0|65|0
+1.3.6.1.2.1.4.17.0|65|0
+1.3.6.1.2.1.4.18.0|65|0
+1.3.6.1.2.1.4.19.0|65|0
+1.3.6.1.2.1.4.20.1.2.172.16.1.241|2|1
+1.3.6.1.2.1.4.20.1.3.172.16.1.241|64|255.255.255.0
+1.3.6.1.2.1.4.22.1.2.1.172.16.1.241|4x|000A19DEEDFE
+1.3.6.1.2.1.5.1.0|65|40813
+1.3.6.1.2.1.5.2.0|65|0
+1.3.6.1.2.1.5.3.0|65|1
+1.3.6.1.2.1.5.4.0|65|0
+1.3.6.1.2.1.5.5.0|65|0
+1.3.6.1.2.1.5.6.0|65|0
+1.3.6.1.2.1.5.7.0|65|0
+1.3.6.1.2.1.5.8.0|65|40812
+1.3.6.1.2.1.5.9.0|65|0
+1.3.6.1.2.1.5.10.0|65|0
+1.3.6.1.2.1.5.11.0|65|0
+1.3.6.1.2.1.5.12.0|65|0
+1.3.6.1.2.1.5.13.0|65|0
+1.3.6.1.2.1.5.14.0|65|40812
+1.3.6.1.2.1.5.15.0|65|0
+1.3.6.1.2.1.5.16.0|65|0
+1.3.6.1.2.1.5.17.0|65|0
+1.3.6.1.2.1.5.18.0|65|0
+1.3.6.1.2.1.5.19.0|65|0
+1.3.6.1.2.1.5.20.0|65|0
+1.3.6.1.2.1.5.21.0|65|0
+1.3.6.1.2.1.5.22.0|65|40812
+1.3.6.1.2.1.5.23.0|65|0
+1.3.6.1.2.1.5.24.0|65|0
+1.3.6.1.2.1.5.25.0|65|0
+1.3.6.1.2.1.5.26.0|65|0
+1.3.6.1.2.1.6.5.0|65|0
+1.3.6.1.2.1.6.6.0|65|2
+1.3.6.1.2.1.6.7.0|65|0
+1.3.6.1.2.1.6.8.0|65|0
+1.3.6.1.2.1.6.9.0|66|0
+1.3.6.1.2.1.6.10.0|65|10
+1.3.6.1.2.1.6.11.0|65|10
+1.3.6.1.2.1.6.12.0|65|0
+1.3.6.1.2.1.6.14.0|65|0
+1.3.6.1.2.1.6.15.0|65|0
+1.3.6.1.2.1.7.1.0|65|559435
+1.3.6.1.2.1.7.2.0|65|215751
+1.3.6.1.2.1.7.3.0|65|0
+1.3.6.1.2.1.7.4.0|65|343655
+1.3.6.1.2.1.11.1.0|65|343641
+1.3.6.1.2.1.11.2.0|65|343612
+1.3.6.1.2.1.11.3.0|65|0
+1.3.6.1.2.1.11.4.0|65|0
+1.3.6.1.2.1.11.5.0|65|0
+1.3.6.1.2.1.11.6.0|65|0
+1.3.6.1.2.1.11.8.0|65|0
+1.3.6.1.2.1.11.9.0|65|0
+1.3.6.1.2.1.11.10.0|65|0
+1.3.6.1.2.1.11.11.0|65|0
+1.3.6.1.2.1.11.12.0|65|0
+1.3.6.1.2.1.11.13.0|65|323806
+1.3.6.1.2.1.11.14.0|65|0
+1.3.6.1.2.1.11.15.0|65|64002
+1.3.6.1.2.1.11.16.0|65|279622
+1.3.6.1.2.1.11.17.0|65|0
+1.3.6.1.2.1.11.18.0|65|0
+1.3.6.1.2.1.11.19.0|65|0
+1.3.6.1.2.1.11.20.0|65|0
+1.3.6.1.2.1.11.21.0|65|38711
+1.3.6.1.2.1.11.22.0|65|0
+1.3.6.1.2.1.11.24.0|65|0
+1.3.6.1.2.1.11.25.0|65|0
+1.3.6.1.2.1.11.26.0|65|0
+1.3.6.1.2.1.11.27.0|65|0
+1.3.6.1.2.1.11.28.0|65|343634
+1.3.6.1.2.1.11.29.0|65|2
+1.3.6.1.2.1.11.30.0|2|2
+1.3.6.1.4.1.13858.2.1.1.0|4|Eltek Valere
+1.3.6.1.4.1.13858.2.1.2.0|4|BC2000
+1.3.6.1.4.1.13858.2.1.3.0|4|4.01.40
+1.3.6.1.4.1.13858.2.1.6.1.1.1.1|2|1
+1.3.6.1.4.1.13858.2.1.6.1.1.1.2|2|1
+1.3.6.1.4.1.13858.2.1.6.1.2.1.1|2|1
+1.3.6.1.4.1.13858.2.1.6.1.2.1.2|2|2
+1.3.6.1.4.1.13858.2.1.6.1.3.1.1|6|1.3.6.1.4.1.13858.3
+1.3.6.1.4.1.13858.2.1.6.1.3.1.2|6|1.3.6.1.4.1.13858.3
+1.3.6.1.4.1.13858.2.1.6.1.4.1.1|2|911
+1.3.6.1.4.1.13858.2.1.6.1.4.1.2|2|907
+1.3.6.1.4.1.13858.2.1.6.1.5.1.1|2|0
+1.3.6.1.4.1.13858.2.1.6.1.5.1.2|2|0
+1.3.6.1.4.1.13858.2.1.6.1.6.1.1|2|5250
+1.3.6.1.4.1.13858.2.1.6.1.6.1.2|2|5250
+1.3.6.1.4.1.13858.2.3.1.0|2|2
+1.3.6.1.4.1.13858.2.3.2.0|2|5400
+1.3.6.1.4.1.13858.2.3.3.0|2|17
+1.3.6.1.4.1.13858.2.3.4.0|2|1
+1.3.6.1.4.1.13858.2.3.5.0|2|25
+1.3.6.1.4.1.13858.2.3.6.0|2|0
+1.3.6.1.4.1.13858.2.3.7.0|2|0
+1.3.6.1.4.1.13858.2.3.8.0|67|713841620
+1.3.6.1.4.1.13858.2.3.9.0|66|8
+1.3.6.1.4.1.13858.7.1.1.1.1.0|2|0
+1.3.6.1.4.1.13858.7.1.1.1.1.1|2|1
+1.3.6.1.4.1.13858.7.1.1.1.1.2|2|2
+1.3.6.1.4.1.13858.7.1.1.1.1.3|2|3
+1.3.6.1.4.1.13858.7.1.1.1.2.0|4|Main Batteries
+1.3.6.1.4.1.13858.7.1.1.1.2.1|4|TProbe 2
+1.3.6.1.4.1.13858.7.1.1.1.2.2|4|TProbe 3
+1.3.6.1.4.1.13858.7.1.1.1.2.3|4|TProbe 4
+1.3.6.1.4.1.13858.7.1.1.1.3.0|2|30
+1.3.6.1.4.1.13858.7.1.1.1.3.1|2|-126
+1.3.6.1.4.1.13858.7.1.1.1.3.2|2|-127
+1.3.6.1.4.1.13858.7.1.1.1.3.3|2|-127