diff --git a/includes/definitions/discovery/apc.yaml b/includes/definitions/discovery/apc.yaml index c994a66463..6752c4a002 100644 --- a/includes/definitions/discovery/apc.yaml +++ b/includes/definitions/discovery/apc.yaml @@ -46,12 +46,23 @@ modules: value: memInputNormalState num_oid: '.1.3.6.1.4.1.318.1.1.10.4.3.4.1.7.{{ $index }}' index: 'memInputNormalState.{{ $index }}' - descr: memInputName + descr: 'Normal state: {{ $memInputName }}' states: - { descr: Closed, graph: 1, value: 1, generic: 0 } - { descr: Open, graph: 1, value: 2, generic: 0 } - { descr: Disabled, graph: 1, value: 3, generic: 0 } - { descr: No State, graph: 1, value: 4, generic: 0 } + - + oid: memInputsStatusTable + state_name: memInputsStatusAlarmStatus + value: memInputsStatusAlarmStatus + num_oid: '.1.3.6.1.4.1.318.1.1.10.4.3.2.1.7.{{ $index }}' + index: 'memInputStatusAlarmState.{{ $index }}' + descr: memInputsStatusInputName + states: + - { descr: Ok, graph: 1, value: 1, generic: 0 } + - { descr: Alarm, graph: 1, value: 2, generic: 1 } + - { descr: Critical, graph: 1, value: 3, generic: 2 } - oid: airIRRP100UnitStatusOperateMode num_oid: '.1.3.6.1.4.1.318.1.1.13.3.3.1.2.2.1.{{ $index }}' diff --git a/tests/data/apc_emu.json b/tests/data/apc_emu.json index d6b01ef53d..10e911c976 100644 --- a/tests/data/apc_emu.json +++ b/tests/data/apc_emu.json @@ -533,6 +533,56 @@ "rrd_type": "GAUGE", "state_name": null }, + { + "sensor_deleted": 0, + "sensor_class": "humidity", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.2.3.1.6.0.5", + "sensor_index": "memSensorsHumidity.0.5", + "sensor_type": "apc", + "sensor_descr": " - ", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": -1, + "sensor_limit": 70, + "sensor_limit_warn": null, + "sensor_limit_low": 30, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "humidity", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.2.3.1.6.0.6", + "sensor_index": "memSensorsHumidity.0.6", + "sensor_type": "apc", + "sensor_descr": " - ", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 38, + "sensor_limit": 70, + "sensor_limit_warn": null, + "sensor_limit_low": 30, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, { "sensor_deleted": 0, "sensor_class": "state", @@ -540,7 +590,7 @@ "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.3.4.1.7.0.1", "sensor_index": "memInputNormalState.0.1", "sensor_type": "memInputNormalState", - "sensor_descr": "NSA Hoofdalarm", + "sensor_descr": "Normal state: NSA Hoofdalarm", "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, @@ -565,7 +615,7 @@ "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.3.4.1.7.0.2", "sensor_index": "memInputNormalState.0.2", "sensor_type": "memInputNormalState", - "sensor_descr": "NSA Vooralarm", + "sensor_descr": "Normal state: NSA Vooralarm", "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, @@ -590,7 +640,7 @@ "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.3.4.1.7.0.3", "sensor_index": "memInputNormalState.0.3", "sensor_type": "memInputNormalState", - "sensor_descr": "NSA In Bedrijf", + "sensor_descr": "Normal state: NSA In Bedrijf", "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, @@ -615,7 +665,7 @@ "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.3.4.1.7.0.4", "sensor_index": "memInputNormalState.0.4", "sensor_type": "memInputNormalState", - "sensor_descr": "Input MM:4", + "sensor_descr": "Normal state: Input MM:4", "group": null, "sensor_divisor": 1, "sensor_multiplier": 1, @@ -633,6 +683,106 @@ "rrd_type": "GAUGE", "state_name": "memInputNormalState" }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.3.2.1.7.0.1", + "sensor_index": "memInputStatusAlarmState.0.1", + "sensor_type": "memInputsStatusAlarmStatus", + "sensor_descr": "Brand storing", + "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": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": "memInputsStatusAlarmStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.3.2.1.7.0.2", + "sensor_index": "memInputStatusAlarmState.0.2", + "sensor_type": "memInputsStatusAlarmStatus", + "sensor_descr": "Brand vooralarm", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": "memInputsStatusAlarmStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.3.2.1.7.0.3", + "sensor_index": "memInputStatusAlarmState.0.3", + "sensor_type": "memInputsStatusAlarmStatus", + "sensor_descr": "Brand alarm", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": "memInputsStatusAlarmStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.3.2.1.7.0.4", + "sensor_index": "memInputStatusAlarmState.0.4", + "sensor_type": "memInputsStatusAlarmStatus", + "sensor_descr": "Brandblus in werking", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": "memInputsStatusAlarmStatus" + }, { "sensor_deleted": 0, "sensor_class": "state", @@ -708,6 +858,56 @@ "rrd_type": "GAUGE", "state_name": "memSensorsAlarmStatus" }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.2.3.1.8.0.5", + "sensor_index": "memSensorsAlarmStatus.0.5", + "sensor_type": "memSensorsAlarmStatus", + "sensor_descr": "memSensorsAlarmStatus", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": "memSensorsAlarmStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.2.3.1.8.0.6", + "sensor_index": "memSensorsAlarmStatus.0.6", + "sensor_type": "memSensorsAlarmStatus", + "sensor_descr": "memSensorsAlarmStatus", + "group": null, + "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, + "rrd_type": "GAUGE", + "state_name": "memSensorsAlarmStatus" + }, { "sensor_deleted": 0, "sensor_class": "state", @@ -783,6 +983,56 @@ "rrd_type": "GAUGE", "state_name": "memSensorsCommStatus" }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.2.3.1.7.0.5", + "sensor_index": "memSensorsCommStatus.0.5", + "sensor_type": "memSensorsCommStatus", + "sensor_descr": "memSensorsCommStatus", + "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": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": "memSensorsCommStatus" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.2.3.1.7.0.6", + "sensor_index": "memSensorsCommStatus.0.6", + "sensor_type": "memSensorsCommStatus", + "sensor_descr": "memSensorsCommStatus", + "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": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": "memSensorsCommStatus" + }, { "sensor_deleted": 0, "sensor_class": "state", @@ -982,6 +1232,56 @@ "user_func": null, "rrd_type": "GAUGE", "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.2.3.1.5.0.5", + "sensor_index": "memSensorsTemperature.0.5", + "sensor_type": "apc", + "sensor_descr": " - ", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 26, + "sensor_limit": 46, + "sensor_limit_warn": null, + "sensor_limit_low": 16, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "rrd_type": "GAUGE", + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.318.1.1.10.4.2.3.1.5.0.6", + "sensor_index": "memSensorsTemperature.0.6", + "sensor_type": "apc", + "sensor_descr": " - ", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 21, + "sensor_limit": 41, + "sensor_limit_warn": null, + "sensor_limit_low": 11, + "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": [ @@ -1013,6 +1313,27 @@ "state_value": 4, "state_generic_value": 0 }, + { + "state_name": "memInputsStatusAlarmStatus", + "state_descr": "Ok", + "state_draw_graph": 1, + "state_value": 1, + "state_generic_value": 0 + }, + { + "state_name": "memInputsStatusAlarmStatus", + "state_descr": "Alarm", + "state_draw_graph": 1, + "state_value": 2, + "state_generic_value": 1 + }, + { + "state_name": "memInputsStatusAlarmStatus", + "state_descr": "Critical", + "state_draw_graph": 1, + "state_value": 3, + "state_generic_value": 2 + }, { "state_name": "memSensorsAlarmStatus", "state_descr": "memNormal", diff --git a/tests/snmpsim/apc_emu.snmprec b/tests/snmpsim/apc_emu.snmprec index 1b38e4d00f..ca138ac105 100644 --- a/tests/snmpsim/apc_emu.snmprec +++ b/tests/snmpsim/apc_emu.snmprec @@ -46,8 +46,10 @@ 1.3.6.1.2.1.2.2.1.22.1|6|0.0 1.3.6.1.2.1.2.2.1.22.2|6|0.0 1.3.6.1.2.1.4.20.1.2.10.10.10.61|2|2 +1.3.6.1.2.1.4.20.1.2.10.100.100.62|2|2 1.3.6.1.2.1.4.20.1.2.127.0.0.1|2|1 1.3.6.1.2.1.4.20.1.3.10.10.10.61|64|255.255.255.0 +1.3.6.1.2.1.4.20.1.3.10.100.100.62|64|255.255.255.0 1.3.6.1.4.1.318.1.1.10.3.1.1.0|4|SCP-EMU 1.3.6.1.4.1.318.1.1.10.3.2.1.1.1.1|2|1 1.3.6.1.4.1.318.1.1.10.3.2.1.1.2.1|4|Relay @@ -268,15 +270,51 @@ 1.3.6.1.4.1.318.1.1.10.4.2.3.1.5.0.1|2|18 1.3.6.1.4.1.318.1.1.10.4.2.3.1.5.0.2|2|26 1.3.6.1.4.1.318.1.1.10.4.2.3.1.5.0.3|2|27 +1.3.6.1.4.1.318.1.1.10.4.2.3.1.5.0.5|2|26 +1.3.6.1.4.1.318.1.1.10.4.2.3.1.5.0.6|2|21 1.3.6.1.4.1.318.1.1.10.4.2.3.1.6.0.1|2|30 1.3.6.1.4.1.318.1.1.10.4.2.3.1.6.0.2|2|-1 1.3.6.1.4.1.318.1.1.10.4.2.3.1.6.0.3|2|-1 +1.3.6.1.4.1.318.1.1.10.4.2.3.1.6.0.5|2|-1 +1.3.6.1.4.1.318.1.1.10.4.2.3.1.6.0.6|2|38 1.3.6.1.4.1.318.1.1.10.4.2.3.1.7.0.1|2|2 1.3.6.1.4.1.318.1.1.10.4.2.3.1.7.0.2|2|2 1.3.6.1.4.1.318.1.1.10.4.2.3.1.7.0.3|2|2 +1.3.6.1.4.1.318.1.1.10.4.2.3.1.7.0.5|2|2 +1.3.6.1.4.1.318.1.1.10.4.2.3.1.7.0.6|2|2 1.3.6.1.4.1.318.1.1.10.4.2.3.1.8.0.1|2|1 1.3.6.1.4.1.318.1.1.10.4.2.3.1.8.0.2|2|1 1.3.6.1.4.1.318.1.1.10.4.2.3.1.8.0.3|2|1 +1.3.6.1.4.1.318.1.1.10.4.2.3.1.8.0.5|2|1 +1.3.6.1.4.1.318.1.1.10.4.2.3.1.8.0.6|2|1 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.1.0.1|2|0 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.1.0.2|2|0 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.1.0.3|2|0 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.1.0.4|2|0 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.2.0.1|2|1 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.2.0.2|2|2 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.2.0.3|2|3 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.2.0.4|2|4 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.3.0.1|4|Brand storing +1.3.6.1.4.1.318.1.1.10.4.3.2.1.3.0.2|4|Brand vooralarm +1.3.6.1.4.1.318.1.1.10.4.3.2.1.3.0.3|4|Brand alarm +1.3.6.1.4.1.318.1.1.10.4.3.2.1.3.0.4|4|Brandblus in werking +1.3.6.1.4.1.318.1.1.10.4.3.2.1.4.0.1|4|SCP +1.3.6.1.4.1.318.1.1.10.4.3.2.1.4.0.2|4|SCP +1.3.6.1.4.1.318.1.1.10.4.3.2.1.4.0.3|4|SCP +1.3.6.1.4.1.318.1.1.10.4.3.2.1.4.0.4|4|DC1 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.5.0.1|2|1 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.5.0.2|2|1 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.5.0.3|2|1 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.5.0.4|2|1 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.7.0.1|2|3 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.7.0.2|2|1 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.7.0.3|2|1 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.7.0.4|2|1 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.8.0.1|2|2 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.8.0.2|2|2 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.8.0.3|2|2 +1.3.6.1.4.1.318.1.1.10.4.3.2.1.8.0.4|2|2 1.3.6.1.4.1.318.1.1.10.4.3.4.1.1.0.1|2|0 1.3.6.1.4.1.318.1.1.10.4.3.4.1.1.0.2|2|0 1.3.6.1.4.1.318.1.1.10.4.3.4.1.1.0.3|2|0