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

Fixed raisecom fan speed sensor limits (#10930)

Browse Source 
* fix sensor limits
* add test data
This commit is contained in:
Vitali Kari
2019-12-12 20:54:30 +01:00
committed by PipoCanaja
parent 9734434de3
commit d22558157d
3 changed files with 126 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
includes/definitions/discovery/raisecom.yaml
View File

@@ -18,6 +18,8 @@ modules:
num_oid: '.1.3.6.1.4.1.8886.1.1.5.2.2.1.2.{{ $index }}'
snmp_flags: ['-OeQUs', '-Pu'] # workaround for underscores in mib
descr: 'Fan {{ $index }} Speed'
low_limit: 0
high_limit: 10000
voltage:
data:
-
@@ -60,4 +62,4 @@ modules:
states:
- { descr: offline, graph: 0, value: 1, generic: 2 }
- { descr: online, graph: 0, value: 2, generic: 0 }
- { descr: power-on, graph: 0, value: 3, generic: 1 }
- { descr: power-on, graph: 0, value: 3, generic: 0 }

106
tests/data/raisecom.json
View File

@@ -84,9 +84,9 @@
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 7440,
"sensor_limit": 13392,
"sensor_limit": 10000,
"sensor_limit_warn": null,
"sensor_limit_low": 5952,
"sensor_limit_low": 0,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -108,9 +108,57 @@
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 7620,
"sensor_limit": 13716,
"sensor_limit": 10000,
"sensor_limit_warn": null,
"sensor_limit_low": 6096,
"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,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "fanspeed",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.8886.1.1.5.2.2.1.2.3",
"sensor_index": "3",
"sensor_type": "raisecom",
"sensor_descr": "Fan 3 Speed",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 7800,
"sensor_limit": 10000,
"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,
"state_name": null
},
{
"sensor_deleted": 0,
"sensor_class": "fanspeed",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.8886.1.1.5.2.2.1.2.4",
"sensor_index": "4",
"sensor_type": "raisecom",
"sensor_descr": "Fan 4 Speed",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 7920,
"sensor_limit": 10000,
"sensor_limit_warn": null,
"sensor_limit_low": 0,
"sensor_limit_low_warn": null,
"sensor_alert": 1,
"sensor_custom": "No",
@@ -192,6 +240,54 @@
"user_func": null,
"state_name": "raisecomFanMonitorStateTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.8886.1.1.5.2.2.1.3.3",
"sensor_index": "3",
"sensor_type": "raisecomFanMonitorStateTable",
"sensor_descr": "Fan 3 State",
"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,
"state_name": "raisecomFanMonitorStateTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.8886.1.1.5.2.2.1.3.4",
"sensor_index": "4",
"sensor_type": "raisecomFanMonitorStateTable",
"sensor_descr": "Fan 4 State",
"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,
"state_name": "raisecomFanMonitorStateTable"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
@@ -471,7 +567,7 @@
"state_descr": "power-on",
"state_draw_graph": 0,
"state_value": 3,
"state_generic_value": 1
"state_generic_value": 0
}
]
},

22
tests/snmpsim/raisecom.snmprec
View File

@@ -18,8 +18,12 @@
1.3.6.1.4.1.8886.1.1.4.3.1.1.3.6|2|1750
1.3.6.1.4.1.8886.1.1.5.2.2.1.2.1|66|7440
1.3.6.1.4.1.8886.1.1.5.2.2.1.2.2|66|7620
1.3.6.1.4.1.8886.1.1.5.2.2.1.2.3|66|7800
1.3.6.1.4.1.8886.1.1.5.2.2.1.2.4|66|7920
1.3.6.1.4.1.8886.1.1.5.2.2.1.3.1|2|1
1.3.6.1.4.1.8886.1.1.5.2.2.1.3.2|2|1
1.3.6.1.4.1.8886.1.1.5.2.2.1.3.3|2|1
1.3.6.1.4.1.8886.1.1.5.2.2.1.3.4|2|1
1.3.6.1.4.1.8886.1.2.1.3.0|2|3
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082471937.1|2|36000
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082471937.3|2|-2840
@@ -27,6 +31,24 @@
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082471938.1|2|31039
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082471938.3|2|-3098
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082471938.4|2|-40000
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476033.1|2|38117
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476033.3|2|-3027
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476033.4|2|-920
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476034.1|2|37617
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476034.3|2|-4012
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476034.4|2|-5606
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476036.1|2|35500
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476036.3|2|-3054
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476036.4|2|-4012
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476039.1|2|33070
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476039.3|2|-2915
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476039.4|2|-40000
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476080.1|2|34429
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476080.3|2|-3178
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476080.4|2|-3089
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476084.1|2|34546
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476084.3|2|-3080
1.3.6.1.4.1.8886.1.18.2.2.1.1.2.2082476084.4|2|-3555
1.3.6.1.4.1.8886.1.24.2.1.1.2.1|4|
1.3.6.1.4.1.8886.1.24.2.1.1.2.2|4|
1.3.6.1.4.1.8886.1.24.2.1.1.3.1|2|2