diff --git a/includes/discovery/sensors/current/rfc1628.inc.php b/includes/discovery/sensors/current/rfc1628.inc.php index d50b2cbc7a..749deff462 100644 --- a/includes/discovery/sensors/current/rfc1628.inc.php +++ b/includes/discovery/sensors/current/rfc1628.inc.php @@ -1,5 +1,7 @@ $data) { $data['upsOutputCurrent'] = $data['upsOutputCurrent'][0]; $oid .= '.0'; } + $data['upsOutputCurrent'] = Number::cast($data['upsOutputCurrent']); discover_sensor( $valid['sensor'], @@ -69,6 +72,7 @@ foreach ($input_current as $index => $data) { $data['upsInputCurrent'] = $data['upsInputCurrent'][0]; $oid .= '.0'; } + $data['upsInputCurrent'] = Number::cast($data['upsInputCurrent']); discover_sensor( $valid['sensor'], @@ -100,6 +104,7 @@ foreach ($bypass_current as $index => $data) { $data['upsBypassCurrent'] = $data['upsBypassCurrent'][0]; $oid .= '.0'; } + $data['upsBypassCurrent'] = Number::cast($data['upsBypassCurrent']); discover_sensor( $valid['sensor'], diff --git a/includes/discovery/sensors/frequency/rfc1628.inc.php b/includes/discovery/sensors/frequency/rfc1628.inc.php index eb9491ecd2..ea766f1c0c 100644 --- a/includes/discovery/sensors/frequency/rfc1628.inc.php +++ b/includes/discovery/sensors/frequency/rfc1628.inc.php @@ -1,5 +1,7 @@ $data) { $data['upsInputFrequency'] = $data['upsInputFrequency'][0]; $freq_oid .= '.0'; } + $data['upsInputFrequency'] = Number::cast($data['upsInputFrequency']); discover_sensor( $valid['sensor'], diff --git a/includes/discovery/sensors/load/rfc1628.inc.php b/includes/discovery/sensors/load/rfc1628.inc.php index b9dfb50259..14b4db452f 100644 --- a/includes/discovery/sensors/load/rfc1628.inc.php +++ b/includes/discovery/sensors/load/rfc1628.inc.php @@ -1,5 +1,7 @@ $data) { if (count($load_data) > 1) { $descr .= " $index"; } + $value = Number::cast($value); discover_sensor( $valid['sensor'], diff --git a/includes/discovery/sensors/voltage/rfc1628.inc.php b/includes/discovery/sensors/voltage/rfc1628.inc.php index e87f9b8a3a..d90d422fcb 100644 --- a/includes/discovery/sensors/voltage/rfc1628.inc.php +++ b/includes/discovery/sensors/voltage/rfc1628.inc.php @@ -1,5 +1,7 @@ $data) { $upsOutputVoltage_value = $data['upsOutputVoltage'][0]; $volt_oid .= '.0'; } + $upsOutputVoltage_value = Number::cast($upsOutputVoltage_value); discover_sensor( $valid['sensor'], @@ -74,6 +77,7 @@ foreach ($input_volts as $index => $data) { $upsInputVoltage_value = $data['upsInputVoltage'][0]; $volt_oid .= '.0'; } + $upsInputVoltage_value = Number::cast($upsInputVoltage_value); discover_sensor( $valid['sensor'], @@ -105,6 +109,7 @@ foreach ($bypass_volts as $index => $data) { $data['upsBypassVoltage'] = $data['upsBypassVoltage'][0]; $volt_oid .= '.0'; } + $data['upsBypassVoltage'] = Number::cast($data['upsBypassVoltage']); discover_sensor( $valid['sensor'], diff --git a/tests/data/deltaups_rfc1628string.json b/tests/data/deltaups_rfc1628string.json new file mode 100644 index 0000000000..03ebffe04c --- /dev/null +++ b/tests/data/deltaups_rfc1628string.json @@ -0,0 +1,1138 @@ +{ + "sensors": { + "discovery": { + "sensors": [ + { + "sensor_deleted": 0, + "sensor_class": "charge", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.2.4.0", + "sensor_index": "500", + "sensor_type": "rfc1628", + "sensor_descr": "Battery charge remaining", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 29, + "sensor_limit": 101, + "sensor_limit_warn": null, + "sensor_limit_low": 15, + "sensor_limit_low_warn": 50, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "current", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.3.1", + "sensor_index": "1", + "sensor_type": "rfc1628", + "sensor_descr": "Output Phase 1", + "group": null, + "sensor_divisor": 10, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "current", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.4.1", + "sensor_index": "101", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 1", + "group": null, + "sensor_divisor": 10, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "current", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.4.2", + "sensor_index": "102", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 2", + "group": null, + "sensor_divisor": 10, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "current", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.4.3", + "sensor_index": "103", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 3", + "group": null, + "sensor_divisor": 10, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "current", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.3.2", + "sensor_index": "2", + "sensor_type": "rfc1628", + "sensor_descr": "Output Phase 2", + "group": null, + "sensor_divisor": 10, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "current", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.5.3.1.3.1", + "sensor_index": "201", + "sensor_type": "rfc1628", + "sensor_descr": "Bypass Phase 1", + "group": null, + "sensor_divisor": 10, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "current", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.5.3.1.3.2", + "sensor_index": "202", + "sensor_type": "rfc1628", + "sensor_descr": "Bypass Phase 2", + "group": null, + "sensor_divisor": 10, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "current", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.5.3.1.3.3", + "sensor_index": "203", + "sensor_type": "rfc1628", + "sensor_descr": "Bypass Phase 3", + "group": null, + "sensor_divisor": 10, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "current", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.3.3", + "sensor_index": "3", + "sensor_type": "rfc1628", + "sensor_descr": "Output Phase 3", + "group": null, + "sensor_divisor": 10, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "frequency", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.2.1", + "sensor_index": "3.2.0.1", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 1", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 50, + "sensor_limit": 52.5, + "sensor_limit_warn": null, + "sensor_limit_low": 47.5, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "frequency", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.2.2", + "sensor_index": "3.2.0.2", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 2", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 0, + "sensor_limit": 0, + "sensor_limit_warn": null, + "sensor_limit_low": 0, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "frequency", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.2.3", + "sensor_index": "3.2.0.3", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 3", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 0, + "sensor_limit": 0, + "sensor_limit_warn": null, + "sensor_limit_low": 0, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "frequency", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.2.0", + "sensor_index": "4.2.0", + "sensor_type": "rfc1628", + "sensor_descr": "Output", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 50, + "sensor_limit": 52.5, + "sensor_limit_warn": null, + "sensor_limit_low": 47.5, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "frequency", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.5.1.0", + "sensor_index": "5.1.0", + "sensor_type": "rfc1628", + "sensor_descr": "Bypass", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 50, + "sensor_limit": 52.5, + "sensor_limit_warn": null, + "sensor_limit_low": 47.5, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "load", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.5.1", + "sensor_index": "501", + "sensor_type": "rfc1628", + "sensor_descr": "Percentage load 1", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 8, + "sensor_limit": 80, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "load", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.5.2", + "sensor_index": "502", + "sensor_type": "rfc1628", + "sensor_descr": "Percentage load 2", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "sensor_limit": 80, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "load", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.5.3", + "sensor_index": "503", + "sensor_type": "rfc1628", + "sensor_descr": "Percentage load 3", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "sensor_limit": 80, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "power", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.5.1", + "sensor_index": "101", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 1", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "power", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.5.2", + "sensor_index": "102", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 2", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "power", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.5.3", + "sensor_index": "103", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 3", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "power", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.5.3.1.4.1", + "sensor_index": "201", + "sensor_type": "rfc1628", + "sensor_descr": "Bypass Phase 1", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "power", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.5.3.1.4.2", + "sensor_index": "202", + "sensor_type": "rfc1628", + "sensor_descr": "Bypass Phase 2", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "power", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.5.3.1.4.3", + "sensor_index": "203", + "sensor_type": "rfc1628", + "sensor_descr": "Bypass Phase 3", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "power", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.4.1", + "sensor_index": "301", + "sensor_type": "rfc1628", + "sensor_descr": "Output Phase 1", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 122, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "power", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.4.2", + "sensor_index": "302", + "sensor_type": "rfc1628", + "sensor_descr": "Output Phase 2", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "power", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.4.3", + "sensor_index": "303", + "sensor_type": "rfc1628", + "sensor_descr": "Output Phase 3", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "runtime", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.2.2.0", + "sensor_index": "100", + "sensor_type": "rfc1628", + "sensor_descr": "Time on battery", + "group": null, + "sensor_divisor": 60, + "sensor_multiplier": 1, + "sensor_current": 0, + "sensor_limit": 2, + "sensor_limit_warn": 1, + "sensor_limit_low": 0, + "sensor_limit_low_warn": 0, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "runtime", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.2.3.0", + "sensor_index": "200", + "sensor_type": "rfc1628", + "sensor_descr": "Estimated battery time remaining", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 338, + "sensor_limit": 10000, + "sensor_limit_warn": null, + "sensor_limit_low": 5, + "sensor_limit_low_warn": 10, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.2.1.0", + "sensor_index": "0", + "sensor_type": "upsBatteryStatusState", + "sensor_descr": "Battery Status", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 2, + "sensor_limit": null, + "sensor_limit_warn": null, + "sensor_limit_low": null, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": "0", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": "upsBatteryStatusState" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.1.0", + "sensor_index": "0", + "sensor_type": "upsOutputSourceState", + "sensor_descr": "Output Source", + "group": null, + "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": "0", + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": "upsOutputSourceState" + }, + { + "sensor_deleted": 0, + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.2.7.0", + "sensor_index": "0", + "sensor_type": "rfc1628", + "sensor_descr": "Battery", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 14, + "sensor_limit": 34, + "sensor_limit_warn": null, + "sensor_limit_low": 4, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "voltage", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.2.1", + "sensor_index": "1", + "sensor_type": "rfc1628", + "sensor_descr": "Output Phase 1", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 2300, + "sensor_limit": 2645, + "sensor_limit_warn": null, + "sensor_limit_low": 1955, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "voltage", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.2.5.0", + "sensor_index": "1.2.5.0", + "sensor_type": "rfc1628", + "sensor_descr": "Battery", + "group": null, + "sensor_divisor": 10, + "sensor_multiplier": 1, + "sensor_current": 55.4, + "sensor_limit": 63.71, + "sensor_limit_warn": null, + "sensor_limit_low": 47.09, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "voltage", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.3.1", + "sensor_index": "101", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 1", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 2360, + "sensor_limit": 2714, + "sensor_limit_warn": null, + "sensor_limit_low": 2006, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "voltage", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.3.2", + "sensor_index": "102", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 2", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "sensor_limit": 0, + "sensor_limit_warn": null, + "sensor_limit_low": 0, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "voltage", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.3.3.1.3.3", + "sensor_index": "103", + "sensor_type": "rfc1628", + "sensor_descr": "Input Phase 3", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "sensor_limit": 0, + "sensor_limit_warn": null, + "sensor_limit_low": 0, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "voltage", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.2.2", + "sensor_index": "2", + "sensor_type": "rfc1628", + "sensor_descr": "Output Phase 2", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "sensor_limit": 0, + "sensor_limit_warn": null, + "sensor_limit_low": 0, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "voltage", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.5.3.1.2.1", + "sensor_index": "201", + "sensor_type": "rfc1628", + "sensor_descr": "Bypass Phase 1", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 2350, + "sensor_limit": 2702.5, + "sensor_limit_warn": null, + "sensor_limit_low": 1997.5, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "voltage", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.5.3.1.2.2", + "sensor_index": "202", + "sensor_type": "rfc1628", + "sensor_descr": "Bypass Phase 2", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "sensor_limit": 0, + "sensor_limit_warn": null, + "sensor_limit_low": 0, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "voltage", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.5.3.1.2.3", + "sensor_index": "203", + "sensor_type": "rfc1628", + "sensor_descr": "Bypass Phase 3", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "sensor_limit": 0, + "sensor_limit_warn": null, + "sensor_limit_low": 0, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "voltage", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.2.1.33.1.4.4.1.2.3", + "sensor_index": "3", + "sensor_type": "rfc1628", + "sensor_descr": "Output Phase 3", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 0, + "sensor_limit": 0, + "sensor_limit_warn": null, + "sensor_limit_low": 0, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + } + ], + "state_indexes": [ + { + "state_name": "upsBatteryStatusState", + "state_descr": "Unknown", + "state_draw_graph": 0, + "state_value": 1, + "state_generic_value": 3 + }, + { + "state_name": "upsBatteryStatusState", + "state_descr": "Normal", + "state_draw_graph": 0, + "state_value": 2, + "state_generic_value": 0 + }, + { + "state_name": "upsBatteryStatusState", + "state_descr": "Low", + "state_draw_graph": 0, + "state_value": 3, + "state_generic_value": 2 + }, + { + "state_name": "upsBatteryStatusState", + "state_descr": "Depleted", + "state_draw_graph": 0, + "state_value": 4, + "state_generic_value": 2 + }, + { + "state_name": "upsOutputSourceState", + "state_descr": "Other", + "state_draw_graph": 0, + "state_value": 1, + "state_generic_value": 3 + }, + { + "state_name": "upsOutputSourceState", + "state_descr": "None", + "state_draw_graph": 0, + "state_value": 2, + "state_generic_value": 3 + }, + { + "state_name": "upsOutputSourceState", + "state_descr": "Normal", + "state_draw_graph": 0, + "state_value": 3, + "state_generic_value": 0 + }, + { + "state_name": "upsOutputSourceState", + "state_descr": "Bypass", + "state_draw_graph": 0, + "state_value": 4, + "state_generic_value": 1 + }, + { + "state_name": "upsOutputSourceState", + "state_descr": "Battery", + "state_draw_graph": 0, + "state_value": 5, + "state_generic_value": 2 + }, + { + "state_name": "upsOutputSourceState", + "state_descr": "Booster", + "state_draw_graph": 0, + "state_value": 6, + "state_generic_value": 2 + }, + { + "state_name": "upsOutputSourceState", + "state_descr": "Reducer", + "state_draw_graph": 0, + "state_value": 7, + "state_generic_value": 2 + } + ] + }, + "poller": "matches discovery" + } +} diff --git a/tests/snmpsim/deltaups_rfc1628string.snmprec b/tests/snmpsim/deltaups_rfc1628string.snmprec new file mode 100644 index 0000000000..506b693b3c --- /dev/null +++ b/tests/snmpsim/deltaups_rfc1628string.snmprec @@ -0,0 +1,46 @@ +1.3.6.1.2.1.1.1.0|4|Mini-SNMP +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.2254.2.5 +1.3.6.1.2.1.1.5.0|4| +1.3.6.1.2.1.33.1.2.1.0|2|2 +1.3.6.1.2.1.33.1.2.2.0|2|0 +1.3.6.1.2.1.33.1.2.3.0|2|338 +1.3.6.1.2.1.33.1.2.4.0|2|29 +1.3.6.1.2.1.33.1.2.5.0|2|554 +1.3.6.1.2.1.33.1.2.6.0|5| +1.3.6.1.2.1.33.1.2.7.0|2|14 +1.3.6.1.2.1.33.1.3.3.1.2.1|2|500 +1.3.6.1.2.1.33.1.3.3.1.2.2|5| +1.3.6.1.2.1.33.1.3.3.1.2.3|5| +1.3.6.1.2.1.33.1.3.3.1.3.1|2|2360 +1.3.6.1.2.1.33.1.3.3.1.3.2|5| +1.3.6.1.2.1.33.1.3.3.1.3.3|5| +1.3.6.1.2.1.33.1.3.3.1.4.1|5| +1.3.6.1.2.1.33.1.3.3.1.4.2|5| +1.3.6.1.2.1.33.1.3.3.1.4.3|5| +1.3.6.1.2.1.33.1.3.3.1.5.1|5| +1.3.6.1.2.1.33.1.3.3.1.5.2|5| +1.3.6.1.2.1.33.1.3.3.1.5.3|5| +1.3.6.1.2.1.33.1.4.1.0|2|3 +1.3.6.1.2.1.33.1.4.2.0|2|500 +1.3.6.1.2.1.33.1.4.4.1.2.1|2|2300 +1.3.6.1.2.1.33.1.4.4.1.2.2|5| +1.3.6.1.2.1.33.1.4.4.1.2.3|5| +1.3.6.1.2.1.33.1.4.4.1.3.1|2|0 +1.3.6.1.2.1.33.1.4.4.1.3.2|5| +1.3.6.1.2.1.33.1.4.4.1.3.3|5| +1.3.6.1.2.1.33.1.4.4.1.4.1|2|122 +1.3.6.1.2.1.33.1.4.4.1.4.2|5| +1.3.6.1.2.1.33.1.4.4.1.4.3|5| +1.3.6.1.2.1.33.1.4.4.1.5.1|2|8 +1.3.6.1.2.1.33.1.4.4.1.5.2|5| +1.3.6.1.2.1.33.1.4.4.1.5.3|5| +1.3.6.1.2.1.33.1.5.1.0|2|500 +1.3.6.1.2.1.33.1.5.3.1.2.1|2|2350 +1.3.6.1.2.1.33.1.5.3.1.2.2|5| +1.3.6.1.2.1.33.1.5.3.1.2.3|5| +1.3.6.1.2.1.33.1.5.3.1.3.1|2|0 +1.3.6.1.2.1.33.1.5.3.1.3.2|5| +1.3.6.1.2.1.33.1.5.3.1.3.3|5| +1.3.6.1.2.1.33.1.5.3.1.4.1|2|0 +1.3.6.1.2.1.33.1.5.3.1.4.2|5| +1.3.6.1.2.1.33.1.5.3.1.4.3|5|