mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TAIT-Infra93 - Fix state + skip_values for Battery (#14541)

Browse Source
This commit is contained in:
O Palivan
2022-10-30 11:13:41 +01:00
committed by GitHub
parent 4b65dc41d2
commit 437322f8cb
2 changed files with 13 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
includes/definitions/discovery/tait-infra93.yaml
View File

@@ -44,7 +44,7 @@ modules:
index: 'healthNetworkConnLogChan1State.{{ $index }}' index: 'healthNetworkConnLogChan1State.{{ $index }}'
state_name: healthNetworkConnLogChan1State state_name: healthNetworkConnLogChan1State
states: states:
- { descr: inactive, graph: 1, value: 0, generic: 1 } - { descr: inactive, graph: 1, value: 0, generic: 3 }
- { descr: idle, graph: 1, value: 1, generic: 3 } - { descr: idle, graph: 1, value: 1, generic: 3 }
- { descr: traffic, graph: 1, value: 2, generic: 0 } - { descr: traffic, graph: 1, value: 2, generic: 0 }
- { descr: control, graph: 1, value: 3, generic: 0 } - { descr: control, graph: 1, value: 3, generic: 0 }
@@ -60,7 +60,7 @@ modules:
index: 'healthNetworkConnLogChan2State.{{ $index }}' index: 'healthNetworkConnLogChan2State.{{ $index }}'
state_name: healthNetworkConnLogChan2State state_name: healthNetworkConnLogChan2State
states: states:
- { descr: inactive, graph: 1, value: 0, generic: 1 } - { descr: inactive, graph: 1, value: 0, generic: 3 }
- { descr: idle, graph: 1, value: 1, generic: 3 } - { descr: idle, graph: 1, value: 1, generic: 3 }
- { descr: traffic, graph: 1, value: 2, generic: 0 } - { descr: traffic, graph: 1, value: 2, generic: 0 }
- { descr: control, graph: 1, value: 3, generic: 0 } - { descr: control, graph: 1, value: 3, generic: 0 }
@@ -115,6 +115,11 @@ modules:
- { descr: bad, graph: 1, value: 0, generic: 1 } - { descr: bad, graph: 1, value: 0, generic: 1 }
- { descr: good, graph: 1, value: 1, generic: 0 } - { descr: good, graph: 1, value: 1, generic: 0 }
- { descr: not fitted, graph: 1, value: 2, generic: 3 } - { descr: not fitted, graph: 1, value: 2, generic: 3 }
skip_values:
-
oid: pmuStateBusConnect
op: '='
value: '2'
- -
oid: pmuState oid: pmuState
value: pmuStateBusConnect value: pmuStateBusConnect
@@ -137,11 +142,11 @@ modules:
states: states:
- { descr: unconnected, graph: 1, value: 0, generic: 1 } - { descr: unconnected, graph: 1, value: 0, generic: 1 }
- { descr: deprecatedUnconnected, graph: 1, value: 1, generic: 1 } - { descr: deprecatedUnconnected, graph: 1, value: 1, generic: 1 }
- { descr: standby, graph: 1, value: 2, generic: 1 } - { descr: standby, graph: 1, value: 2, generic: 3 }
- { descr: dmr-aligned, graph: 1, value: 3, generic: 0 } - { descr: dmr-aligned, graph: 1, value: 3, generic: 0 }
- { descr: dmr-offset, graph: 1, value: 4, generic: 3 } - { descr: dmr-offset, graph: 1, value: 4, generic: 3 }
- { descr: dmr-two-slot-data, graph: 1, value: 5, generic: 0 } - { descr: dmr-two-slot-data, graph: 1, value: 5, generic: 0 }
- { descr: dmr-hibernate, graph: 1, value: 6, generic: 1 } - { descr: dmr-hibernate, graph: 1, value: 6, generic: 3 }
- { descr: analogue, graph: 1, value: 7, generic: 3 } - { descr: analogue, graph: 1, value: 7, generic: 3 }
- { descr: test-mode, graph: 1, value: 8, generic: 3 } - { descr: test-mode, graph: 1, value: 8, generic: 3 }
- { descr: dmr-tier2-aligned, graph: 1, value: 9, generic: 0 } - { descr: dmr-tier2-aligned, graph: 1, value: 9, generic: 0 }

54
tests/data/tait-infra93_tb9300.json
View File

@@ -2040,31 +2040,6 @@
"rrd_type": "GAUGE", "rrd_type": "GAUGE",
"state_name": "pmuStateAuxOutState" "state_name": "pmuStateAuxOutState"
}, },
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.3570.2.2.2.1.2.4.2.2.0",
"sensor_index": "pmuStateBatteryInState.0",
"sensor_type": "pmuStateBatteryInState",
"sensor_descr": "PMU DC power input state",
"group": "PMUState",
"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": "pmuStateBatteryInState"
},
{ {
"sensor_deleted": 0, "sensor_deleted": 0,
"sensor_class": "state", "sensor_class": "state",
@@ -3214,7 +3189,7 @@
"state_descr": "inactive", "state_descr": "inactive",
"state_draw_graph": 1, "state_draw_graph": 1,
"state_value": 0, "state_value": 0,
"state_generic_value": 1 "state_generic_value": 3
}, },
{ {
"state_name": "healthNetworkConnLogChan1State", "state_name": "healthNetworkConnLogChan1State",
@@ -3263,7 +3238,7 @@
"state_descr": "inactive", "state_descr": "inactive",
"state_draw_graph": 1, "state_draw_graph": 1,
"state_value": 0, "state_value": 0,
"state_generic_value": 1 "state_generic_value": 3
}, },
{ {
"state_name": "healthNetworkConnLogChan2State", "state_name": "healthNetworkConnLogChan2State",
@@ -3347,7 +3322,7 @@
"state_descr": "standby", "state_descr": "standby",
"state_draw_graph": 1, "state_draw_graph": 1,
"state_value": 2, "state_value": 2,
"state_generic_value": 1 "state_generic_value": 3
}, },
{ {
"state_name": "linkInfoCtrlProtocolStatus", "state_name": "linkInfoCtrlProtocolStatus",
@@ -3375,7 +3350,7 @@
"state_descr": "dmr-hibernate", "state_descr": "dmr-hibernate",
"state_draw_graph": 1, "state_draw_graph": 1,
"state_value": 6, "state_value": 6,
"state_generic_value": 1 "state_generic_value": 3
}, },
{ {
"state_name": "linkInfoCtrlProtocolStatus", "state_name": "linkInfoCtrlProtocolStatus",
@@ -4231,27 +4206,6 @@
"state_value": 2, "state_value": 2,
"state_generic_value": 3 "state_generic_value": 3
}, },
{
"state_name": "pmuStateBatteryInState",
"state_descr": "bad",
"state_draw_graph": 1,
"state_value": 0,
"state_generic_value": 1
},
{
"state_name": "pmuStateBatteryInState",
"state_descr": "good",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "pmuStateBatteryInState",
"state_descr": "not fitted",
"state_draw_graph": 1,
"state_value": 2,
"state_generic_value": 3
},
{ {
"state_name": "pmuStateBusConnect", "state_name": "pmuStateBusConnect",
"state_descr": "connected", "state_descr": "connected",