opensourcemirror
/
LibreNMS
mirror of https://github.com/librenms/librenms.git
1
0
Fork 0
Code Releases Activity

Fix ericsson MINI LINK wifi sensors (#10566) 

* Fix Ericsson Mini-link wifi sensors

* Fix Ericsson Mini-link wifi sensors

* Fix Ericsson Mini-link wifi sensors

* Fix Ericsson Mini-link wifi sensors

* Fix Ericsson Mini-link wifi sensors
This commit is contained in:
Martin Zatloukal 2019-09-04 04:57:49 +02:00 committed by Tony Murray
parent 2791a86724
commit a136e5094d
5 changed files with 638 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LibreNMS/OS/Ericsson-ml.php → LibreNMS/OS/EricssonMl.php
View File

@ -35,7 +35,7 @@ use LibreNMS\Interfaces\Discovery\Sensors\WirelessSnrDiscovery;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessRateDiscovery;
use LibreNMS\OS;
class Ericssonml extends OS implements
class EricssonMl extends OS implements
ProcessorDiscovery,
WirelessFrequencyDiscovery,
WirelessPowerDiscovery,
@ -97,7 +97,7 @@ class Ericssonml extends OS implements
{
$oid = '.1.3.6.1.4.1.193.223.2.7.1.1.43.110101'; //PT-RADIOLINK-MIB::actualSnir.0
return array(
new WirelessSensor('snr', $this->getDeviceId(), $oid, 'eric', 1, 'CINR', null, 1, 10),
new WirelessSensor('snr', $this->getDeviceId(), $oid, 'eric', 1, 'CINR', null, 1, 1),
);
}
/**

48
includes/definitions/discovery/ericsson-ml.yaml Normal file
View File

@ -0,0 +1,48 @@
mib: PT-RADIOLINK-MIB
modules:
sensors:
state:
data:
-
oid: actualTxAcmTC
num_oid: '.1.3.6.1.4.1.193.223.2.7.1.1.58.{{ $index }}'
index: actualTxAcmTC
descr: Tx Modulation Rate
state_name: actualTxAcmTC
states:
- { value: 1, generic: 1, graph: 1, descr: 'HalfBpsk' }
- { value: 2, generic: 0, graph: 1, descr: 'HalfBpskLight' }
- { value: 3, generic: 0, graph: 1, descr: 'HalfBpskStrong' }
- { value: 4, generic: 0, graph: 1, descr: 'Bpsk' }
- { value: 5, generic: 0, graph: 1, descr: 'BpskLight' }
- { value: 6, generic: 0, graph: 1, descr: 'BpskStrong' }
- { value: 7, generic: 0, graph: 1, descr: '4Qam' }
- { value: 8, generic: 0, graph: 1, descr: '4QamLight' }
- { value: 9, generic: 0, graph: 1, descr: '4QamStrong' }
- { value: 10, generic: 0, graph: 1, descr: '16Qam' }
- { value: 11, generic: 0, graph: 1, descr: '16QamLight' }
- { value: 12, generic: 1, graph: 1, descr: '16QamStrong' }
- { value: 13, generic: 0, graph: 1, descr: '32Qam' }
- { value: 14, generic: 0, graph: 1, descr: '32QamLight' }
- { value: 15, generic: 0, graph: 1, descr: '32QamStrong' }
- { value: 16, generic: 0, graph: 1, descr: '64Qam' }
- { value: 17, generic: 0, graph: 1, descr: '64QamLight' }
- { value: 18, generic: 0, graph: 1, descr: '64QamStrong' }
- { value: 19, generic: 0, graph: 1, descr: '128Qam' }
- { value: 20, generic: 0, graph: 1, descr: '128QamLight' }
- { value: 21, generic: 0, graph: 1, descr: '128QamStrong' }
- { value: 22, generic: 0, graph: 1, descr: '256Qam' }
- { value: 23, generic: 1, graph: 1, descr: '256QamLight' }
- { value: 24, generic: 0, graph: 1, descr: '256QamStrong' }
- { value: 25, generic: 0, graph: 1, descr: '512Qam' }
- { value: 26, generic: 0, graph: 1, descr: '512QamLight' }
- { value: 27, generic: 0, graph: 1, descr: '512QamStrong' }
- { value: 28, generic: 0, graph: 1, descr: '1024Qam' }
- { value: 29, generic: 0, graph: 1, descr: '1024QamLight' }
- { value: 30, generic: 0, graph: 1, descr: '1024QamStrong' }
- { value: 31, generic: 0, graph: 1, descr: '2048Qam' }
- { value: 32, generic: 0, graph: 1, descr: '2048QamLight' }
- { value: 33, generic: 0, graph: 1, descr: '2048QamStrong' }
- { value: 34, generic: 0, graph: 1, descr: '4096Qam' }
- { value: 35, generic: 0, graph: 1, descr: '4096QamLight' }
- { value: 36, generic: 0, graph: 1, descr: '4096QamStrong' }

37
mibs/ericsson/MINI-LINK-MIB Normal file
View File

@ -0,0 +1,37 @@
MINI-LINK-MIB DEFINITIONS ::= BEGIN
IMPORTS
MODULE-IDENTITY,
enterprises FROM SNMPv2-SMI;
miniLink MODULE-IDENTITY
LAST-UPDATED "201603091230Z"
ORGANIZATION "Ericsson"
CONTACT-INFO
"Anders Ekvall
Postal: Ericsson AB,
E-Mail: anders.ekvall@ericsson.com"
DESCRIPTION
"This is the top MIB for Ericsson MINI-LINK"
REVISION "201603091230Z"
DESCRIPTION
"Validated."
REVISION "201602101230Z"
DESCRIPTION
"The initial version of this MIB module
with OID for mini link types."
::= { ericsson 223 }
-- *************
-- * MINI LINK *
-- *************
ericsson OBJECT IDENTIFIER ::= { enterprises 193 }
END

541
tests/data/ericsson-ml.json
View File

@ -1748,6 +1748,30 @@
"sensors": {
"discovery": {
"sensors": [
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.193.223.2.7.1.1.58.110101",
"sensor_index": "actualTxAcmTC",
"sensor_type": "actualTxAcmTC",
"sensor_descr": "Tx Modulation Rate",
"group": null,
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 16,
"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": "actualTxAcmTC"
},
{
"sensor_deleted": 0,
"sensor_class": "temperature",
@ -1773,8 +1797,523 @@
"state_name": null
}
],
"state_indexes": []
"state_indexes": [
{
"state_name": "actualTxAcmTC",
"state_descr": "HalfBpsk",
"state_draw_graph": 1,
"state_value": 1,
"state_generic_value": 1
},
{
"state_name": "actualTxAcmTC",
"state_descr": "HalfBpskLight",
"state_draw_graph": 1,
"state_value": 2,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "HalfBpskStrong",
"state_draw_graph": 1,
"state_value": 3,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "Bpsk",
"state_draw_graph": 1,
"state_value": 4,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "BpskLight",
"state_draw_graph": 1,
"state_value": 5,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "BpskStrong",
"state_draw_graph": 1,
"state_value": 6,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "4Qam",
"state_draw_graph": 1,
"state_value": 7,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "4QamLight",
"state_draw_graph": 1,
"state_value": 8,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "4QamStrong",
"state_draw_graph": 1,
"state_value": 9,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "16Qam",
"state_draw_graph": 1,
"state_value": 10,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "16QamLight",
"state_draw_graph": 1,
"state_value": 11,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "16QamStrong",
"state_draw_graph": 1,
"state_value": 12,
"state_generic_value": 1
},
{
"state_name": "actualTxAcmTC",
"state_descr": "32Qam",
"state_draw_graph": 1,
"state_value": 13,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "32QamLight",
"state_draw_graph": 1,
"state_value": 14,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "32QamStrong",
"state_draw_graph": 1,
"state_value": 15,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "64Qam",
"state_draw_graph": 1,
"state_value": 16,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "64QamLight",
"state_draw_graph": 1,
"state_value": 17,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "64QamStrong",
"state_draw_graph": 1,
"state_value": 18,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "128Qam",
"state_draw_graph": 1,
"state_value": 19,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "128QamLight",
"state_draw_graph": 1,
"state_value": 20,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "128QamStrong",
"state_draw_graph": 1,
"state_value": 21,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "256Qam",
"state_draw_graph": 1,
"state_value": 22,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "256QamLight",
"state_draw_graph": 1,
"state_value": 23,
"state_generic_value": 1
},
{
"state_name": "actualTxAcmTC",
"state_descr": "256QamStrong",
"state_draw_graph": 1,
"state_value": 24,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "512Qam",
"state_draw_graph": 1,
"state_value": 25,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "512QamLight",
"state_draw_graph": 1,
"state_value": 26,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "512QamStrong",
"state_draw_graph": 1,
"state_value": 27,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "1024Qam",
"state_draw_graph": 1,
"state_value": 28,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "1024QamLight",
"state_draw_graph": 1,
"state_value": 29,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "1024QamStrong",
"state_draw_graph": 1,
"state_value": 30,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "2048Qam",
"state_draw_graph": 1,
"state_value": 31,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "2048QamLight",
"state_draw_graph": 1,
"state_value": 32,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "2048QamStrong",
"state_draw_graph": 1,
"state_value": 33,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "4096Qam",
"state_draw_graph": 1,
"state_value": 34,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "4096QamLight",
"state_draw_graph": 1,
"state_value": 35,
"state_generic_value": 0
},
{
"state_name": "actualTxAcmTC",
"state_descr": "4096QamStrong",
"state_draw_graph": 1,
"state_value": 36,
"state_generic_value": 0
}
]
},
"poller": "matches discovery"
},
"wireless": {
"discovery": {
"wireless_sensors": [
{
"sensor_deleted": 0,
"sensor_class": "rate",
"sensor_index": "1",
"sensor_type": "eric-netBitrate",
"sensor_descr": "Net Bitrate",
"sensor_divisor": 1,
"sensor_multiplier": 1000,
"sensor_aggregator": "sum",
"sensor_current": 2000000000,
"sensor_prev": null,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.46.110101\"]"
},
{
"sensor_deleted": 0,
"sensor_class": "snr",
"sensor_index": "1",
"sensor_type": "eric",
"sensor_descr": "CINR",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_aggregator": "sum",
"sensor_current": 36.7,
"sensor_prev": null,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.43.110101\"]"
},
{
"sensor_deleted": 0,
"sensor_class": "rssi",
"sensor_index": "1",
"sensor_type": "eric",
"sensor_descr": "RSSI",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_aggregator": "sum",
"sensor_current": -40.5,
"sensor_prev": null,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.1.110101\"]"
},
{
"sensor_deleted": 0,
"sensor_class": "power",
"sensor_index": "1",
"sensor_type": "eric-pow-cur",
"sensor_descr": "Tx Power Current",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_aggregator": "sum",
"sensor_current": 16,
"sensor_prev": null,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.2.110101\"]"
},
{
"sensor_deleted": 0,
"sensor_class": "frequency",
"sensor_index": "1",
"sensor_type": "eric-tx",
"sensor_descr": "TX Frequency",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_aggregator": "sum",
"sensor_current": 86000,
"sensor_prev": null,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.10.110101\"]"
},
{
"sensor_deleted": 0,
"sensor_class": "frequency",
"sensor_index": "1",
"sensor_type": "eric-rx",
"sensor_descr": "RX Frequency",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_aggregator": "sum",
"sensor_current": 76000,
"sensor_prev": null,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.13.110101\"]"
}
]
},
"poller": {
"wireless_sensors": [
{
"sensor_deleted": 0,
"sensor_class": "rate",
"sensor_index": "1",
"sensor_type": "eric-netBitrate",
"sensor_descr": "Net Bitrate",
"sensor_divisor": 1,
"sensor_multiplier": 1000,
"sensor_aggregator": "sum",
"sensor_current": 2000000000,
"sensor_prev": 2000000000,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.46.110101\"]"
},
{
"sensor_deleted": 0,
"sensor_class": "snr",
"sensor_index": "1",
"sensor_type": "eric",
"sensor_descr": "CINR",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_aggregator": "sum",
"sensor_current": 36.7,
"sensor_prev": 36.7,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.43.110101\"]"
},
{
"sensor_deleted": 0,
"sensor_class": "rssi",
"sensor_index": "1",
"sensor_type": "eric",
"sensor_descr": "RSSI",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_aggregator": "sum",
"sensor_current": -40.5,
"sensor_prev": -40.5,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.1.110101\"]"
},
{
"sensor_deleted": 0,
"sensor_class": "power",
"sensor_index": "1",
"sensor_type": "eric-pow-cur",
"sensor_descr": "Tx Power Current",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_aggregator": "sum",
"sensor_current": 16,
"sensor_prev": 16,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.2.110101\"]"
},
{
"sensor_deleted": 0,
"sensor_class": "frequency",
"sensor_index": "1",
"sensor_type": "eric-tx",
"sensor_descr": "TX Frequency",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_aggregator": "sum",
"sensor_current": 86000,
"sensor_prev": 86000,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.10.110101\"]"
},
{
"sensor_deleted": 0,
"sensor_class": "frequency",
"sensor_index": "1",
"sensor_type": "eric-rx",
"sensor_descr": "RX Frequency",
"sensor_divisor": 1000,
"sensor_multiplier": 1,
"sensor_aggregator": "sum",
"sensor_current": 76000,
"sensor_prev": 76000,
"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_oids": "[\".1.3.6.1.4.1.193.223.2.7.1.1.13.110101\"]"
}
]
}
}
}

11
tests/snmpsim/ericsson-ml.snmprec
View File

@ -119,6 +119,8 @@
1.3.6.1.2.1.4.20.1.3.169.254.254.2|64|255.255.255.252
1.3.6.1.2.1.4.20.1.3.192.168.1.1|64|255.255.255.0
1.3.6.1.2.1.4.22.1.2.8.10.133.16.233|4x|C88D833A77C6
1.3.6.1.2.1.4.22.1.2.8.10.133.16.234|4x|B869F481EF54
1.3.6.1.2.1.4.22.1.2.8.10.133.16.236|4x|346E9DF5E3D9
1.3.6.1.2.1.4.31.1.1.3.1|65|4381969
1.3.6.1.2.1.4.31.1.1.3.2|65|0
1.3.6.1.2.1.4.31.1.1.4.1|70|4381969
@ -257,6 +259,8 @@
1.3.6.1.2.1.4.34.1.6.2.16.254.128.0.0.0.0.0.0.232.43.243.255.254.228.47.8|2|5
1.3.6.1.2.1.4.34.1.6.2.16.254.128.0.0.0.0.0.0.236.141.234.255.254.219.235.206|2|5
1.3.6.1.2.1.4.35.1.4.8.1.4.10.133.16.233|4x|C88D833A77C6
1.3.6.1.2.1.4.35.1.4.8.1.4.10.133.16.234|4x|B869F481EF54
1.3.6.1.2.1.4.35.1.4.8.1.4.10.133.16.236|4x|346E9DF5E3D9
1.3.6.1.2.1.5.1.0|65|10692
1.3.6.1.2.1.5.2.0|65|0
1.3.6.1.2.1.5.3.0|65|0
@ -545,6 +549,13 @@
1.3.6.1.2.1.47.1.1.1.1.18.70102|4|
1.3.6.1.2.1.47.1.1.1.1.18.80100|4|
1.3.6.1.4.1.193.223.2.4.1.1.2.1|4|43.0 C
1.3.6.1.4.1.193.223.2.7.1.1.1.110101|4|-40.5
1.3.6.1.4.1.193.223.2.7.1.1.2.110101|4|16.0
1.3.6.1.4.1.193.223.2.7.1.1.10.110101|2|86000000
1.3.6.1.4.1.193.223.2.7.1.1.13.110101|2|76000000
1.3.6.1.4.1.193.223.2.7.1.1.43.110101|4|36.7
1.3.6.1.4.1.193.223.2.7.1.1.46.110101|2|2000000
1.3.6.1.4.1.193.223.2.7.1.1.58.110101|2|16
1.3.6.1.4.1.2021.4.3.0|2|0
1.3.6.1.4.1.2021.4.4.0|2|0
1.3.6.1.4.1.2021.4.5.0|2|1030992