diff --git a/includes/definitions/discovery/snr-erd.yaml b/includes/definitions/discovery/snr-erd.yaml index 1d87600a3f..2ef9c724b7 100644 --- a/includes/definitions/discovery/snr-erd.yaml +++ b/includes/definitions/discovery/snr-erd.yaml @@ -8,13 +8,14 @@ modules: - diAlarmName - doName - doDeviceName + - rsshtpName sensors: temperature: data: - - oid: sysTemperature - num_oid: '.1.3.6.1.4.1.40418.7.100.1.8.1.10.{{ $index }}' - descr: 'Temperature {{ $index }}' + oid: rsshtpTemp + num_oid: '.1.3.6.1.4.1.40418.2.6.1.30.1.1.3.{{ $index }}' + descr: '{{ $rsshtpName }} {{ $index }}' state: data: - @@ -39,3 +40,15 @@ modules: - { descr: Off, graph: 1, value: 0, generic: 1 } - { descr: On, graph: 1, value: 1, generic: 0 } - { descr: Reload, graph: 1, value: 2, generic: 2 } + humidity: + data: + - + oid: rsshtpHum + num_oid: '.1.3.6.1.4.1.40418.2.6.1.30.1.1.4.{{ $index }}' + descr: '{{ $rsshtpName }} {{ $index }}' + pressure: + data: + - + oid: rsshtpPssr + num_oid: '.1.3.6.1.4.1.40418.2.6.1.30.1.1.6.{{ $index }}' + descr: '{{ $rsshtpName }} {{ $index }}' diff --git a/tests/data/snr-erd.json b/tests/data/snr-erd.json index eca74a465d..c7ed11b387 100644 --- a/tests/data/snr-erd.json +++ b/tests/data/snr-erd.json @@ -298,6 +298,54 @@ "sensors": { "discovery": { "sensors": [ + { + "sensor_deleted": 0, + "sensor_class": "humidity", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.40418.2.6.1.30.1.1.4.2186281172", + "sensor_index": "2186281172", + "sensor_type": "snr-erd", + "sensor_descr": "RSsensor-H/T/P 2186281172", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 37, + "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, + "state_name": null + }, + { + "sensor_deleted": 0, + "sensor_class": "pressure", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.40418.2.6.1.30.1.1.6.2186281172", + "sensor_index": "2186281172", + "sensor_type": "snr-erd", + "sensor_descr": "RSsensor-H/T/P 2186281172", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 748, + "sensor_limit": 785.4, + "sensor_limit_warn": null, + "sensor_limit_low": 710.6, + "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", @@ -441,6 +489,102 @@ "sensor_prev": null, "user_func": null, "state_name": "doTable" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.40418.2.6.2.2.1.3.1.3", + "sensor_index": "doState.1.3", + "sensor_type": "doTable", + "sensor_descr": "DO2 Power-Kerro-olt", + "group": "Ports DO", + "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": "doTable" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.40418.2.6.2.2.1.3.1.4", + "sensor_index": "doState.1.4", + "sensor_type": "doTable", + "sensor_descr": "DO3 Power-Kerro-as", + "group": "Ports DO", + "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": "doTable" + }, + { + "sensor_deleted": 0, + "sensor_class": "state", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.40418.2.6.2.2.1.3.1.5", + "sensor_index": "doState.1.5", + "sensor_type": "doTable", + "sensor_descr": "DO4 Power-Kerro-PDU", + "group": "Ports DO", + "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": "doTable" + }, + { + "sensor_deleted": 0, + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.40418.2.6.1.30.1.1.3.2186281172", + "sensor_index": "2186281172", + "sensor_type": "snr-erd", + "sensor_descr": "RSsensor-H/T/P 2186281172", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 27, + "sensor_limit": 47, + "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 } ], "state_indexes": [ diff --git a/tests/snmpsim/snr-erd.snmprec b/tests/snmpsim/snr-erd.snmprec index a4da8aefaf..dfd7d1496e 100644 --- a/tests/snmpsim/snr-erd.snmprec +++ b/tests/snmpsim/snr-erd.snmprec @@ -42,7 +42,9 @@ 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.10.200.8.243|2|1 1.3.6.1.2.1.4.20.1.2.10.200.8.244|2|1 +1.3.6.1.2.1.4.20.1.3.10.200.8.243|64|255.255.255.0 1.3.6.1.2.1.4.20.1.3.10.200.8.244|64|255.255.255.0 1.3.6.1.2.1.4.21.1.1.0.0.0.0|64|0.0.0.0 1.3.6.1.2.1.4.21.1.1.10.200.8.0|64|10.200.8.0 @@ -108,6 +110,7 @@ 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.6.18.0|70|0 +1.3.6.1.2.1.6.19.1.7.1.4.10.200.8.243.80.1.4.185.108.210.186.59521|2|11 1.3.6.1.2.1.6.20.1.4.1.4.0.0.0.0.35|66|0 1.3.6.1.2.1.7.1.0|65|2082 1.3.6.1.2.1.7.2.0|65|0 @@ -144,6 +147,10 @@ 1.3.6.1.2.1.11.31.0|65|0 1.3.6.1.2.1.11.32.0|65|0 1.3.6.1.2.1.33.1.1.2.0|4| +1.3.6.1.4.1.40418.2.6.1.30.1.1.2.2186281172|4|RSsensor-H/T/P +1.3.6.1.4.1.40418.2.6.1.30.1.1.3.2186281172|2|27 +1.3.6.1.4.1.40418.2.6.1.30.1.1.4.2186281172|2|37 +1.3.6.1.4.1.40418.2.6.1.30.1.1.6.2186281172|2|748 1.3.6.1.4.1.40418.2.6.2.1.1.1.1.2|4|DI2 1.3.6.1.4.1.40418.2.6.2.1.1.1.1.3|4|DI3 1.3.6.1.4.1.40418.2.6.2.1.1.1.1.4|4|DI4 @@ -162,9 +169,21 @@ 1.3.6.1.4.1.40418.2.6.2.1.1.4.1.5|65|0 1.3.6.1.4.1.40418.2.6.2.2.1.1.1.1|4|Relay 1.3.6.1.4.1.40418.2.6.2.2.1.1.1.2|4|DO1 +1.3.6.1.4.1.40418.2.6.2.2.1.1.1.3|4|DO2 +1.3.6.1.4.1.40418.2.6.2.2.1.1.1.4|4|DO3 +1.3.6.1.4.1.40418.2.6.2.2.1.1.1.5|4|DO4 1.3.6.1.4.1.40418.2.6.2.2.1.2.1.1|4| 1.3.6.1.4.1.40418.2.6.2.2.1.2.1.2|4|Rozetka-test +1.3.6.1.4.1.40418.2.6.2.2.1.2.1.3|4|Power-Kerro-olt +1.3.6.1.4.1.40418.2.6.2.2.1.2.1.4|4|Power-Kerro-as +1.3.6.1.4.1.40418.2.6.2.2.1.2.1.5|4|Power-Kerro-PDU 1.3.6.1.4.1.40418.2.6.2.2.1.3.1.1|2|0 1.3.6.1.4.1.40418.2.6.2.2.1.3.1.2|2|1 +1.3.6.1.4.1.40418.2.6.2.2.1.3.1.3|2|1 +1.3.6.1.4.1.40418.2.6.2.2.1.3.1.4|2|1 +1.3.6.1.4.1.40418.2.6.2.2.1.3.1.5|2|1 1.3.6.1.4.1.40418.2.6.2.2.1.4.1.1|2|3 1.3.6.1.4.1.40418.2.6.2.2.1.4.1.2|2|10 +1.3.6.1.4.1.40418.2.6.2.2.1.4.1.3|2|3 +1.3.6.1.4.1.40418.2.6.2.2.1.4.1.4|2|3 +1.3.6.1.4.1.40418.2.6.2.2.1.4.1.5|2|3