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

Aruba cluster userfriendly read (#11217)

Browse Source 
* Aruba-Instant: Include hostnames as a better identifier for mesh members sensors

* Refresh testdata
This commit is contained in:
Kevin Zink
2020-02-27 22:35:28 +01:00
committed by GitHub
parent c25551ac98
commit 7254f13b26
4 changed files with 307 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/discovery/mempools/aruba-instant.inc.php
View File

@@ -28,6 +28,7 @@ if ($device['os'] === 'aruba-instant') {
$mempool_data = snmpwalk_group($device, 'aiAPSerialNum', 'AI-AP-MIB');
$mempool_data = snmpwalk_group($device, 'aiAPTotalMemory', 'AI-AP-MIB', 1, $mempool_data);
$mempool_data = snmpwalk_group($device, 'aiAPMemoryFree', 'AI-AP-MIB', 1, $mempool_data);
$mempool_data = snmpwalk_group($device, 'aiAPName', 'AI-AP-MIB', 1, $mempool_data);
d_echo('$mempool_data:'.PHP_EOL);
d_echo($mempool_data);
@@ -41,12 +42,13 @@ if ($device['os'] === 'aruba-instant') {
$usage_oid = snmp_translate($combined_oid, 'ALL', 'arubaos', '-On', null);
$descr = $entry['aiAPSerialNum'];
$index = $entry['aiAPSerialNum'];
$descr = $entry['aiAPName'] . ' [' . $entry['aiAPSerialNum'] . ']';
$total = $entry['aiAPTotalMemory'];
$free = $entry['aiAPMemoryFree'];
$used = $total - $free;
$perc = ($used / $total * 100);
discover_mempool($valid_mempool, $device, $descr, 'aruba-instant', $descr, '1', null, null);
discover_mempool($valid_mempool, $device, $index, 'aruba-instant', $descr, '1', null, null);
} //end foreach
} // end if

7
includes/discovery/sensors/state/aruba-instant.inc.php
View File

@@ -26,6 +26,7 @@ $ai_mib = 'AI-AP-MIB';
$oids = snmpwalk_group($device, 'aiAPSerialNum', $ai_mib);
$oids = snmpwalk_group($device, 'aiAPStatus', $ai_mib, 1, $oids);
$oids = snmpwalk_group($device, 'aiRadioStatus', $ai_mib, 1, $oids);
$oids = snmpwalk_group($device, 'aiAPName', $ai_mib, 1, $oids);
if (!empty($oids)) {
$ap_state_name = 'aiAPStatus';
@@ -50,8 +51,8 @@ if (!empty($oids)) {
$ap_state_index = implode('.', array_map('hexdec', explode(':', $ap_index)));
$combined_oid = implode('.', [$ai_mib.'::'.'aiAPStatus', $ap_state_index]);
$ap_state_oid = snmp_translate($combined_oid, 'ALL', 'arubaos', '-On', null);
discover_sensor($valid['sensor'], 'state', $device, $ap_state_oid, $ap_state_index, $ap_state_name, $ap_entry['aiAPSerialNum'], '1', '1', null, null, null, null, $ap_entry[$ap_state_name], 'snmp', null, null, null, 'Cluster APs');
$ap_descr = $ap_entry['aiAPName'] . ' (' . $ap_entry['aiAPSerialNum'] . ')';
discover_sensor($valid['sensor'], 'state', $device, $ap_state_oid, $ap_state_index, $ap_state_name, $ap_entry['aiAPSerialNum'], '1', '1', null, null, null, null, $ap_descr, 'snmp', null, null, null, 'Cluster APs');
//Create Sensor To State Index
create_sensor_to_state_index($device, $ap_state_name, $ap_state_index);
@@ -61,7 +62,7 @@ if (!empty($oids)) {
$combined_oid = implode('.', [$ai_mib.'::'.'aiRadioStatus', $radio_state_index]);
$radio_state_oid = snmp_translate($combined_oid, 'ALL', 'arubaos', '-On', null);
discover_sensor($valid['sensor'], 'state', $device, $radio_state_oid, $radio_state_index, $radio_state_name, $ap_entry['aiAPSerialNum'].' Radio '.$radio_index, '1', '1', null, null, null, null, $radio_status, 'snmp', null, null, null, 'Cluster Radios');
discover_sensor($valid['sensor'], 'state', $device, $radio_state_oid, $radio_state_index, $radio_state_name, $ap_descr.' Radio '.$radio_index, '1', '1', null, null, null, null, $radio_status, 'snmp', null, null, null, 'Cluster Radios');
//Create Sensor To State Index
create_sensor_to_state_index($device, $radio_state_name, $radio_state_index);

117
tests/data/aruba-instant.json
View File

@@ -2604,7 +2604,7 @@
"hrDeviceIndex": null,
"mempool_type": "aruba-instant",
"mempool_precision": 1,
"mempool_descr": "CNBJHMV0WN",
"mempool_descr": "instant-ap-src-1 [CNBJHMV0WN]",
"mempool_perc": 0,
"mempool_used": 0,
"mempool_free": 0,
@@ -2624,7 +2624,7 @@
"hrDeviceIndex": null,
"mempool_type": "aruba-instant",
"mempool_precision": 1,
"mempool_descr": "CNBJHMV0WN",
"mempool_descr": "instant-ap-src-1 [CNBJHMV0WN]",
"mempool_perc": 34,
"mempool_used": 177905664,
"mempool_free": 349196288,
@@ -2651,7 +2651,7 @@
"group": "Cluster APs",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
"sensor_current": 0,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
@@ -2671,7 +2671,7 @@
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.112.58.14.201.194.70.0",
"sensor_index": "112.58.14.201.194.70.0",
"sensor_type": "aiRadioStatus",
"sensor_descr": "CNBJHMV0WN Radio 0",
"sensor_descr": "instant-ap-src-1 (CNBJHMV0WN) Radio 0",
"group": "Cluster Radios",
"sensor_divisor": 1,
"sensor_multiplier": 1,
@@ -2695,7 +2695,7 @@
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.112.58.14.201.194.70.1",
"sensor_index": "112.58.14.201.194.70.1",
"sensor_type": "aiRadioStatus",
"sensor_descr": "CNBJHMV0WN Radio 1",
"sensor_descr": "instant-ap-src-1 (CNBJHMV0WN) Radio 1",
"group": "Cluster Radios",
"sensor_divisor": 1,
"sensor_multiplier": 1,
@@ -2744,6 +2744,111 @@
}
]
},
"poller": "matches discovery"
"poller": {
"sensors": [
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.1.1.11.112.58.14.201.194.70",
"sensor_index": "112.58.14.201.194.70",
"sensor_type": "aiAPStatus",
"sensor_descr": "CNBJHMV0WN",
"group": "Cluster APs",
"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": 0,
"user_func": null,
"state_name": "aiAPStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.112.58.14.201.194.70.0",
"sensor_index": "112.58.14.201.194.70.0",
"sensor_type": "aiRadioStatus",
"sensor_descr": "instant-ap-src-1 (CNBJHMV0WN) Radio 0",
"group": "Cluster Radios",
"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": "aiRadioStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.112.58.14.201.194.70.1",
"sensor_index": "112.58.14.201.194.70.1",
"sensor_type": "aiRadioStatus",
"sensor_descr": "instant-ap-src-1 (CNBJHMV0WN) Radio 1",
"group": "Cluster Radios",
"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": "aiRadioStatus"
}
],
"state_indexes": [
{
"state_name": "aiAPStatus",
"state_descr": "up",
"state_draw_graph": 0,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "aiAPStatus",
"state_descr": "down",
"state_draw_graph": 0,
"state_value": 2,
"state_generic_value": 2
},
{
"state_name": "aiRadioStatus",
"state_descr": "up",
"state_draw_graph": 0,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "aiRadioStatus",
"state_descr": "down",
"state_draw_graph": 0,
"state_value": 2,
"state_generic_value": 3
}
]
}
}
}

199
tests/data/aruba-instant_105.json
View File

@@ -1135,7 +1135,7 @@
"hrDeviceIndex": null,
"mempool_type": "aruba-instant",
"mempool_precision": 1,
"mempool_descr": "BT0489813",
"mempool_descr": "24:de:c6:c3:50:a4 [BT0489813]",
"mempool_perc": 0,
"mempool_used": 0,
"mempool_free": 0,
@@ -1151,7 +1151,7 @@
"hrDeviceIndex": null,
"mempool_type": "aruba-instant",
"mempool_precision": 1,
"mempool_descr": "BT0490379",
"mempool_descr": "24:de:c6:c3:52:da [BT0490379]",
"mempool_perc": 0,
"mempool_used": 0,
"mempool_free": 0,
@@ -1171,7 +1171,7 @@
"hrDeviceIndex": null,
"mempool_type": "aruba-instant",
"mempool_precision": 1,
"mempool_descr": "BT0489813",
"mempool_descr": "24:de:c6:c3:50:a4 [BT0489813]",
"mempool_perc": 60,
"mempool_used": 77750272,
"mempool_free": 50995200,
@@ -1187,7 +1187,7 @@
"hrDeviceIndex": null,
"mempool_type": "aruba-instant",
"mempool_precision": 1,
"mempool_descr": "BT0490379",
"mempool_descr": "24:de:c6:c3:52:da [BT0490379]",
"mempool_perc": 60,
"mempool_used": 77750272,
"mempool_free": 50995200,
@@ -1214,7 +1214,7 @@
"group": "Cluster APs",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
"sensor_current": 24,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
@@ -1238,7 +1238,7 @@
"group": "Cluster APs",
"sensor_divisor": 1,
"sensor_multiplier": 1,
"sensor_current": 1,
"sensor_current": 24,
"sensor_limit": null,
"sensor_limit_warn": null,
"sensor_limit_low": null,
@@ -1258,7 +1258,7 @@
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.36.222.198.195.80.164.0",
"sensor_index": "36.222.198.195.80.164.0",
"sensor_type": "aiRadioStatus",
"sensor_descr": "BT0489813 Radio 0",
"sensor_descr": "24:de:c6:c3:50:a4 (BT0489813) Radio 0",
"group": "Cluster Radios",
"sensor_divisor": 1,
"sensor_multiplier": 1,
@@ -1282,7 +1282,7 @@
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.36.222.198.195.80.164.1",
"sensor_index": "36.222.198.195.80.164.1",
"sensor_type": "aiRadioStatus",
"sensor_descr": "BT0489813 Radio 1",
"sensor_descr": "24:de:c6:c3:50:a4 (BT0489813) Radio 1",
"group": "Cluster Radios",
"sensor_divisor": 1,
"sensor_multiplier": 1,
@@ -1306,7 +1306,7 @@
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.36.222.198.195.82.218.0",
"sensor_index": "36.222.198.195.82.218.0",
"sensor_type": "aiRadioStatus",
"sensor_descr": "BT0490379 Radio 0",
"sensor_descr": "24:de:c6:c3:52:da (BT0490379) Radio 0",
"group": "Cluster Radios",
"sensor_divisor": 1,
"sensor_multiplier": 1,
@@ -1330,7 +1330,7 @@
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.36.222.198.195.82.218.1",
"sensor_index": "36.222.198.195.82.218.1",
"sensor_type": "aiRadioStatus",
"sensor_descr": "BT0490379 Radio 1",
"sensor_descr": "24:de:c6:c3:52:da (BT0490379) Radio 1",
"group": "Cluster Radios",
"sensor_divisor": 1,
"sensor_multiplier": 1,
@@ -1379,7 +1379,184 @@
}
]
},
"poller": "matches discovery"
"poller": {
"sensors": [
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.1.1.11.36.222.198.195.80.164",
"sensor_index": "36.222.198.195.80.164",
"sensor_type": "aiAPStatus",
"sensor_descr": "BT0489813",
"group": "Cluster APs",
"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": 24,
"user_func": null,
"state_name": "aiAPStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.1.1.11.36.222.198.195.82.218",
"sensor_index": "36.222.198.195.82.218",
"sensor_type": "aiAPStatus",
"sensor_descr": "BT0490379",
"group": "Cluster APs",
"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": 24,
"user_func": null,
"state_name": "aiAPStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.36.222.198.195.80.164.0",
"sensor_index": "36.222.198.195.80.164.0",
"sensor_type": "aiRadioStatus",
"sensor_descr": "24:de:c6:c3:50:a4 (BT0489813) Radio 0",
"group": "Cluster Radios",
"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": "aiRadioStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.36.222.198.195.80.164.1",
"sensor_index": "36.222.198.195.80.164.1",
"sensor_type": "aiRadioStatus",
"sensor_descr": "24:de:c6:c3:50:a4 (BT0489813) Radio 1",
"group": "Cluster Radios",
"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": "aiRadioStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.36.222.198.195.82.218.0",
"sensor_index": "36.222.198.195.82.218.0",
"sensor_type": "aiRadioStatus",
"sensor_descr": "24:de:c6:c3:52:da (BT0490379) Radio 0",
"group": "Cluster Radios",
"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": "aiRadioStatus"
},
{
"sensor_deleted": 0,
"sensor_class": "state",
"poller_type": "snmp",
"sensor_oid": ".1.3.6.1.4.1.14823.2.3.3.1.2.2.1.20.36.222.198.195.82.218.1",
"sensor_index": "36.222.198.195.82.218.1",
"sensor_type": "aiRadioStatus",
"sensor_descr": "24:de:c6:c3:52:da (BT0490379) Radio 1",
"group": "Cluster Radios",
"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": "aiRadioStatus"
}
],
"state_indexes": [
{
"state_name": "aiAPStatus",
"state_descr": "up",
"state_draw_graph": 0,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "aiAPStatus",
"state_descr": "down",
"state_draw_graph": 0,
"state_value": 2,
"state_generic_value": 2
},
{
"state_name": "aiRadioStatus",
"state_descr": "up",
"state_draw_graph": 0,
"state_value": 1,
"state_generic_value": 0
},
{
"state_name": "aiRadioStatus",
"state_descr": "down",
"state_draw_graph": 0,
"state_value": 2,
"state_generic_value": 3
}
]
}
},
"wireless": {
"discovery": {