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

refactor: Wifi cleanup (#7607)

Browse Source 
* refactor: remove duplicated data collection in old wifi module
Still a bit more work before we can fully remove it

* remove unused graphs
update overview graphs for some wireless os
This commit is contained in:
Tony Murray
2017-11-02 21:07:58 +00:00
committed by Neil Lathwood
co-authored by Neil Lathwood
parent d9df643927
commit 4dd56bc72e
43 changed files with 65 additions and 1036 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LibreNMS/OS/Unifi.php
+10
View File
@@ -273,6 +273,7 @@ class Unifi extends OS implements
}
$util_oids = snmpwalk_cache_oid($this->getDevice(), 'unifiRadioCuSelfRx', $util_oids, 'UBNT-UniFi-MIB');
$util_oids = snmpwalk_cache_oid($this->getDevice(), 'unifiRadioCuSelfTx', $util_oids, 'UBNT-UniFi-MIB');
$util_oids = snmpwalk_cache_oid($this->getDevice(), 'unifiRadioOtherBss', $util_oids, 'UBNT-UniFi-MIB');
$radio_names = $this->getCacheByIndex('unifiRadioRadio', 'UBNT-UniFi-MIB');
$sensors = array();
@@ -304,6 +305,15 @@ class Unifi extends OS implements
"Self Tx Util ($name)",
$util_oids[$index]['unifiRadioCuSelfTx']
);
$sensors[] = new WirelessSensor(
'utilization',
$this->getDeviceId(),
'.1.3.6.1.4.1.41112.1.6.1.1.1.9.' . $index,
'unifi-other',
$index,
"Other BSS Util ($name)",
$util_oids[$index]['unifiRadioOtherBss']
);
}
return $sensors;
LibreNMS/OS/XirrusAos.php
+26
View File
@@ -29,6 +29,8 @@ use LibreNMS\Device\WirelessSensor;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessClientsDiscovery;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessFrequencyDiscovery;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessNoiseFloorDiscovery;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessRateDiscovery;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessRssiDiscovery;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessSnrDiscovery;
use LibreNMS\Interfaces\Discovery\Sensors\WirelessUtilizationDiscovery;
use LibreNMS\Interfaces\Polling\Sensors\WirelessFrequencyPolling;
@@ -40,6 +42,8 @@ class XirrusAos extends OS implements
WirelessFrequencyPolling,
WirelessNoiseFloorDiscovery,
WirelessUtilizationDiscovery,
WirelessRateDiscovery,
WirelessRssiDiscovery,
WirelessSnrDiscovery
{
@@ -89,6 +93,28 @@ class XirrusAos extends OS implements
return $this->discoverSensor('noise-floor', 'realtimeMonitorNoiseFloor', '.1.3.6.1.4.1.21013.1.2.24.7.1.10.');
}
/**
* Discover wireless rate. This is in bps. Type is rate.
* Returns an array of LibreNMS\Device\Sensor objects that have been discovered
*
* @return array
*/
public function discoverWirelessRate()
{
return $this->discoverSensor('rate', 'realtimeMonitorAverageDataRate', '.1.3.6.1.4.1.21013.1.2.24.7.1.7.');
}
/**
* Discover wireless RSSI (Received Signal Strength Indicator). This is in dBm. Type is rssi.
* Returns an array of LibreNMS\Device\Sensor objects that have been discovered
*
* @return array
*/
public function discoverWirelessRssi()
{
return $this->discoverSensor('rssi', 'realtimeMonitorAverageRSSI', '.1.3.6.1.4.1.21013.1.2.24.7.1.8.');
}
/**
* Discover wireless SNR. This is in dB. Type is snr.
* Formula: SNR = Signal or Rx Power - Noise Floor
doc/Developing/os/Initial-Detection.md
-1
View File
@@ -68,7 +68,6 @@ mib_dir:
```yaml
poller_modules:
wifi: 1
cisco-ace-serverfarms: 0
cisco-ace-loadbalancer: 0
```
html/includes/graphs/device/saf_modemCapacity.inc.php
-23
View File
@@ -1,23 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'saf-modem-radio');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= ' COMMENT:" Now Min Max\r" ';
$rrd_options .= ' DEF:modemACMCapacity='.$rrdfilename.':modemACMCapacity:AVERAGE ';
$rrd_options .= ' DEF:modemTotalCapacity='.$rrdfilename.':modemTotalCapacity:AVERAGE ';
$rrd_options .= ' CDEF:acmCapacityMbps=modemACMCapacity,1000,* ';
$rrd_options .= ' CDEF:capacityMbps=modemTotalCapacity,1000,* ';
$rrd_options .= ' LINE1:acmCapacityMbps#00CC00:"ACM Total Capacity\l" ';
$rrd_options .= ' COMMENT:\u ';
$rrd_options .= ' GPRINT:acmCapacityMbps:LAST:"%0.2lf %sbps" ';
$rrd_options .= ' GPRINT:acmCapacityMbps:MIN:"%0.2lf %sbps" ';
$rrd_options .= ' GPRINT:acmCapacityMbps:MAX:"%0.2lf %sbps\r" ';
$rrd_options .= ' LINE1:capacityMbps#CC0000:"Total Capacity\l" ';
$rrd_options .= ' COMMENT:\u ';
$rrd_options .= ' GPRINT:capacityMbps:LAST:"%0.2lf %sbps" ';
$rrd_options .= ' GPRINT:capacityMbps:MIN:"%0.2lf %sbps" ';
$rrd_options .= ' GPRINT:capacityMbps:MAX:"%0.2lf %sbps\r" ';
}
html/includes/graphs/device/saf_modemRadialMSE.inc.php
-16
View File
@@ -1,16 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'saf-modem-radio');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= ' COMMENT:" Now Min Max\r" ';
$rrd_options .= ' DEF:modemRadialMSE='.$rrdfilename.':modemRadialMSE:AVERAGE ';
$rrd_options .= ' CDEF:dividedMSE=modemRadialMSE,10,/ ';
$rrd_options .= ' LINE1:dividedMSE#CC0000:"Radial MSE\l" ';
$rrd_options .= ' COMMENT:\u ';
$rrd_options .= ' GPRINT:dividedMSE:LAST:"%3.2lf dB" ';
$rrd_options .= ' GPRINT:dividedMSE:MIN:"%3.2lf dB" ';
$rrd_options .= ' GPRINT:dividedMSE:MAX:"%3.2lf dB\r" ';
}
html/includes/graphs/device/saf_radioRxLevel.inc.php
-15
View File
@@ -1,15 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'saf-modem-radio');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= ' COMMENT:" Now Min Max\r" ';
$rrd_options .= ' DEF:radioRxLevel='.$rrdfilename.':radioRxLevel:AVERAGE ';
$rrd_options .= ' LINE1:radioRxLevel#CC0000:"RX Level\l" ';
$rrd_options .= ' COMMENT:\u ';
$rrd_options .= ' GPRINT:radioRxLevel:LAST:"%3.2lf dBm" ';
$rrd_options .= ' GPRINT:radioRxLevel:MIN:"%3.2lf dBm" ';
$rrd_options .= ' GPRINT:radioRxLevel:MAX:"%3.2lf dBm\r" ';
}
html/includes/graphs/device/saf_radioTxPower.inc.php
-15
View File
@@ -1,15 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'saf-modem-radio');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= ' COMMENT:" Now Min Max\r" ';
$rrd_options .= ' DEF:radioTxPower='.$rrdfilename.':radioTxPower:AVERAGE ';
$rrd_options .= ' LINE1:radioTxPower#CC0000:"TX Power\l" ';
$rrd_options .= ' COMMENT:\u ';
$rrd_options .= ' GPRINT:radioTxPower:LAST:"%3.2lf dBm" ';
$rrd_options .= ' GPRINT:radioTxPower:MIN:"%3.2lf dBm" ';
$rrd_options .= ' GPRINT:radioTxPower:MAX:"%3.2lf dBm\r" ';
}
html/includes/graphs/device/siklu_rfAverageCinr.inc.php
-14
View File
@@ -1,14 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'siklu-wireless');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'db Now Min Max\\n'";
$rrd_options .= ' DEF:rfAverageCinr='.$rrdfilename.':rfAverageCinr:AVERAGE ';
$rrd_options .= " LINE1:rfAverageCinr#CC0000:'CINR ' ";
$rrd_options .= ' GPRINT:rfAverageCinr:LAST:%3.2lf ';
$rrd_options .= ' GPRINT:rfAverageCinr:MIN:%3.2lf ';
$rrd_options .= ' GPRINT:rfAverageCinr:MAX:%3.2lf\\\l ';
}
html/includes/graphs/device/siklu_rfAverageRssi.inc.php
-14
View File
@@ -1,14 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'siklu-wireless');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dbm Now Min Max\\n'";
$rrd_options .= ' DEF:rfAverageRssi='.$rrdfilename.':rfAverageRssi:AVERAGE ';
$rrd_options .= " LINE1:rfAverageRssi#CC0000:'RSSI ' ";
$rrd_options .= ' GPRINT:rfAverageRssi:LAST:%3.2lf ';
$rrd_options .= ' GPRINT:rfAverageRssi:MIN:%3.2lf ';
$rrd_options .= ' GPRINT:rfAverageRssi:MAX:%3.2lf\\\l ';
}
html/includes/graphs/device/siklu_rfOperationalFrequency.inc.php
-14
View File
@@ -1,14 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$rrdfilename = rrd_name($device['hostname'], 'siklu-wireless');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Hz Now Min Max\\n'";
$rrd_options .= ' DEF:rfOperFreq='.$rrdfilename.':rfOperFreq:AVERAGE ';
$rrd_options .= " LINE1:rfOperFreq#CC0000:'GHz ' ";
$rrd_options .= ' GPRINT:rfOperFreq:LAST:%3.2lf ';
$rrd_options .= ' GPRINT:rfOperFreq:MIN:%3.2lf ';
$rrd_options .= ' GPRINT:rfOperFreq:MAX:%3.2lf\\\l ';
}
html/includes/graphs/device/ubnt_airmax_AirMaxCapacity.inc.php
-18
View File
@@ -1,18 +0,0 @@
<?php
$scale_min = 0;
$scale_max = 100;
require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:' Now Min Max\\n'";
$rrd_options .= ' DEF:AirMaxCapacity='.$rrdfilename.':AirMaxCapacity:AVERAGE ';
$rrd_options .= " LINE1:AirMaxCapacity#CC0000:'Percent ' ";
$rrd_options .= ' GPRINT:AirMaxCapacity:LAST:%3.0lf ';
$rrd_options .= ' GPRINT:AirMaxCapacity:MIN:%3.0lf ';
$rrd_options .= ' GPRINT:AirMaxCapacity:MAX:%3.0lf\\\l ';
}
html/includes/graphs/device/ubnt_airmax_AirMaxQuality.inc.php
-18
View File
@@ -1,18 +0,0 @@
<?php
$scale_min = 0;
$scale_max = 100;
require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:' Now Min Max\\n'";
$rrd_options .= ' DEF:AirMaxQuality='.$rrdfilename.':AirMaxQuality:AVERAGE ';
$rrd_options .= " LINE1:AirMaxQuality#CC0000:'Percent ' ";
$rrd_options .= ' GPRINT:AirMaxQuality:LAST:%3.0lf ';
$rrd_options .= ' GPRINT:AirMaxQuality:MIN:%3.0lf ';
$rrd_options .= ' GPRINT:AirMaxQuality:MAX:%3.0lf\\\l ';
}
html/includes/graphs/device/ubnt_airmax_RadioDistance.inc.php
-15
View File
@@ -1,15 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Metres Now Min Max\\n'";
$rrd_options .= ' DEF:RadioDistance='.$rrdfilename.':RadioDistance:AVERAGE ';
$rrd_options .= " LINE1:RadioDistance#CC0000:'Distance ' ";
$rrd_options .= ' GPRINT:RadioDistance:LAST:%3.2lf%s ';
$rrd_options .= ' GPRINT:RadioDistance:MIN:%3.2lf%s ';
$rrd_options .= ' GPRINT:RadioDistance:MAX:%3.2lf%s\\\l ';
}
html/includes/graphs/device/ubnt_airmax_RadioFreq.inc.php
-16
View File
@@ -1,16 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E ';
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:' Now Min Max\\n'";
$rrd_options .= ' DEF:RadioFreq='.$rrdfilename.':RadioFreq:AVERAGE ';
$rrd_options .= " LINE1:RadioFreq#CC0000:'Frequency ' ";
$rrd_options .= ' GPRINT:RadioFreq:LAST:%3.2lf%s ';
$rrd_options .= ' GPRINT:RadioFreq:MIN:%3.2lf%s ';
$rrd_options .= ' GPRINT:RadioFreq:MAX:%3.2lf%s\\\l ';
}
html/includes/graphs/device/ubnt_airmax_RadioRssi_0.inc.php
-15
View File
@@ -1,15 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dbm Now Min Max\\n'";
$rrd_options .= ' DEF:RadioRssi_0='.$rrdfilename.':RadioRssi_0:AVERAGE ';
$rrd_options .= " LINE1:RadioRssi_0#CC0000:'RSSI ' ";
$rrd_options .= ' GPRINT:RadioRssi_0:LAST:%3.2lf ';
$rrd_options .= ' GPRINT:RadioRssi_0:MIN:%3.2lf ';
$rrd_options .= ' GPRINT:RadioRssi_0:MAX:%3.2lf\\\l ';
}
html/includes/graphs/device/ubnt_airmax_RadioRssi_1.inc.php
-15
View File
@@ -1,15 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dbm Now Min Max\\n'";
$rrd_options .= ' DEF:RadioRssi_1='.$rrdfilename.':RadioRssi_1:AVERAGE ';
$rrd_options .= " LINE1:RadioRssi_1#00FF00:'RSSI ' ";
$rrd_options .= ' GPRINT:RadioRssi_1:LAST:%3.2lf ';
$rrd_options .= ' GPRINT:RadioRssi_1:MIN:%3.2lf ';
$rrd_options .= ' GPRINT:RadioRssi_1:MAX:%3.2lf\\\l ';
}
html/includes/graphs/device/ubnt_airmax_RadioTxPower.inc.php
-19
View File
@@ -1,19 +0,0 @@
<?php
$scale_min = 0;
$scale_max = 50;
require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E ';
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dbm Now Min Max\\n'";
$rrd_options .= ' DEF:RadioTxPower='.$rrdfilename.':RadioTxPower:AVERAGE ';
$rrd_options .= " LINE1:RadioTxPower#CC0000:'Tx Power ' ";
$rrd_options .= ' GPRINT:RadioTxPower:LAST:%3.2lf ';
$rrd_options .= ' GPRINT:RadioTxPower:MIN:%3.2lf ';
$rrd_options .= ' GPRINT:RadioTxPower:MAX:%3.2lf\\\l ';
}
html/includes/graphs/device/ubnt_airmax_WlStatCcq.inc.php
-19
View File
@@ -1,19 +0,0 @@
<?php
$scale_min = 0;
$scale_max = 100;
require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E ';
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'Percent Now Min Max\\n'";
$rrd_options .= ' DEF:WlStatCcq='.$rrdfilename.':WlStatCcq:AVERAGE ';
$rrd_options .= " LINE1:WlStatCcq#CC0000:'CCQ ' ";
$rrd_options .= ' GPRINT:WlStatCcq:LAST:%3.2lf ';
$rrd_options .= ' GPRINT:WlStatCcq:MIN:%3.2lf ';
$rrd_options .= ' GPRINT:WlStatCcq:MAX:%3.2lf\\\l ';
}
html/includes/graphs/device/ubnt_airmax_WlStatNoiseFloor.inc.php
-18
View File
@@ -1,18 +0,0 @@
<?php
$scale_min = -110;
$scale_max = -50;
require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dbm Now Min Max\\n'";
$rrd_options .= ' DEF:WlStatNoiseFloor='.$rrdfilename.':WlStatNoiseFloor:AVERAGE ';
$rrd_options .= " LINE1:WlStatNoiseFloor#CC0000:'Noise ' ";
$rrd_options .= ' GPRINT:WlStatNoiseFloor:LAST:%3.2lf ';
$rrd_options .= ' GPRINT:WlStatNoiseFloor:MIN:%3.2lf ';
$rrd_options .= ' GPRINT:WlStatNoiseFloor:MAX:%3.2lf\\\l ';
}
html/includes/graphs/device/ubnt_airmax_WlStatRssi.inc.php
-15
View File
@@ -1,15 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dbm Now Min Max\\n'";
$rrd_options .= ' DEF:WlStatRssi='.$rrdfilename.':WlStatRssi:AVERAGE ';
$rrd_options .= " LINE1:WlStatRssi#CC0000:'RSSI ' ";
$rrd_options .= ' GPRINT:WlStatRssi:LAST:%3.2lf ';
$rrd_options .= ' GPRINT:WlStatRssi:MIN:%3.2lf ';
$rrd_options .= ' GPRINT:WlStatRssi:MAX:%3.2lf\\\l ';
}
html/includes/graphs/device/ubnt_airmax_WlStatRxRate.inc.php
-16
View File
@@ -1,16 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'mbps Now Min Max\\n'";
$rrd_options .= ' DEF:WlStatRxRate='.$rrdfilename.':WlStatRxRate:AVERAGE ';
$rrd_options .= ' CDEF:WlStatRxRateC=WlStatRxRate,1000,/ ';
$rrd_options .= " LINE1:WlStatRxRateC#00FF00:'Rx Rate ' ";
$rrd_options .= ' GPRINT:WlStatRxRateC:LAST:%0.2lf%s ';
$rrd_options .= ' GPRINT:WlStatRxRateC:MIN:%0.2lf%s ';
$rrd_options .= ' GPRINT:WlStatRxRateC:MAX:%0.2lf%s\\\l ';
}
html/includes/graphs/device/ubnt_airmax_WlStatSignal.inc.php
-19
View File
@@ -1,19 +0,0 @@
<?php
$scale_min = -100;
$scale_max = -20;
require 'includes/graphs/common.inc.php';
//$rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'dbm Now Min Max\\n'";
$rrd_options .= " DEF:WlStatSignal=".$rrdfilename.":WlStatSignal:AVERAGE ";
$rrd_options .= " LINE1:WlStatSignal#CC0000:'Signal ' ";
$rrd_options .= " GPRINT:WlStatSignal:LAST:%3.2lf ";
$rrd_options .= " GPRINT:WlStatSignal:MIN:%3.2lf ";
$rrd_options .= " GPRINT:WlStatSignal:MAX:%3.2lf\\\l ";
}
html/includes/graphs/device/ubnt_airmax_WlStatStaCount.inc.php
-16
View File
@@ -1,16 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$rrd_options .= ' -l 0 -E ';
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:' Now Min Max\\n'";
$rrd_options .= ' DEF:WlStatStaCount='.$rrdfilename.':WlStatStaCount:AVERAGE ';
$rrd_options .= " LINE1:WlStatStaCount#CC0000:'Stations ' ";
$rrd_options .= ' GPRINT:WlStatStaCount:LAST:%3.0lf ';
$rrd_options .= ' GPRINT:WlStatStaCount:MIN:%3.0lf ';
$rrd_options .= ' GPRINT:WlStatStaCount:MAX:%3.0lf\\\l ';
}
html/includes/graphs/device/ubnt_airmax_WlStatTxRate.inc.php
-16
View File
@@ -1,16 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
// $rrd_options .= " -l 0 -E ";
$rrdfilename = rrd_name($device['hostname'], 'ubnt-airmax-mib');
if (rrdtool_check_rrd_exists($rrdfilename)) {
$rrd_options .= " COMMENT:'mbps Now Min Max\\n'";
$rrd_options .= ' DEF:WlStatTxRate='.$rrdfilename.':WlStatTxRate:AVERAGE ';
$rrd_options .= ' CDEF:WlStatTxRateC=WlStatTxRate,1000,/ ';
$rrd_options .= " LINE1:WlStatTxRateC#CC0000:'Tx Rate ' ";
$rrd_options .= ' GPRINT:WlStatTxRateC:LAST:%0.2lf%s ';
$rrd_options .= ' GPRINT:WlStatTxRateC:MIN:%0.2lf%s ';
$rrd_options .= ' GPRINT:WlStatTxRateC:MAX:%0.2lf%s\\\l ';
}
html/includes/graphs/device/ubnt_unifi_RadioCu_0.inc.php
-35
View File
@@ -1,35 +0,0 @@
<?php
$rrd_filename = rrd_name($device['hostname'], 'ubnt-unifi-mib');
$colours = 'mixed';
$unit_text = '% used';
$scale_min = '0';
$scale_max = '100';
$rigid = true;
$print_total = true;
$simple_rrd = true;
if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_list = array(
array(
'ds' => 'Radio0OtherBss',
'filename' => $rrd_filename,
'descr' => 'Radio0 Others',
),
array(
'ds' => 'Radio0CuSelfRx',
'filename' => $rrd_filename,
'descr' => 'Radio0 RX',
),
array(
'ds' => 'Radio0CuSelfTx',
'filename' => $rrd_filename,
'descr' => 'Radio0 TX',
),
);
} else {
echo "file missing: $rrd_filename";
}
require 'includes/graphs/generic_multi.inc.php';
html/includes/graphs/device/ubnt_unifi_RadioCu_1.inc.php
-35
View File
@@ -1,35 +0,0 @@
<?php
$rrd_filename = rrd_name($device['hostname'], 'ubnt-unifi-mib');
$colours = 'mixed';
$unit_text = '% used';
$scale_min = '0';
$scale_max = '100';
$rigid = true;
$print_total = true;
$simple_rrd = true;
if (rrdtool_check_rrd_exists($rrd_filename)) {
$rrd_list = array(
array(
'ds' => 'Radio1OtherBss',
'filename' => $rrd_filename,
'descr' => 'Radio1 Others',
),
array(
'ds' => 'Radio1CuSelfRx',
'filename' => $rrd_filename,
'descr' => 'Radio1 RX',
),
array(
'ds' => 'Radio1CuSelfTx',
'filename' => $rrd_filename,
'descr' => 'Radio1 TX',
),
);
} else {
echo "file missing: $rrd_filename";
}
require 'includes/graphs/generic_multi.inc.php';
html/includes/graphs/device/xirrus_dataRates.inc.php
-44
View File
@@ -1,44 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$pallette = array(
1 => 'FF0000',
2 => '0000FF',
3 => '00FF00',
4 => 'FF00FF',
5 => '000000',
6 => 'FFFF00',
7 => 'C0C0C0',
8 => '800000',
9 => '808000',
10 => '008000',
11 => '00FFFF',
12 => '008080',
13 => '000080',
14 => '800080',
15 => 'FF69B4',
16 => '006400'
);
$rrd_options .= ' -l 0 -E ';
$rrd_options .= " COMMENT:'Average Data Rate Cur Min Max\\n'";
$radioId=1;
foreach (glob(rrd_name($device['hostname'], 'xirrus_stats-', '*.rrd')) as $rrd) {
// get radio name
preg_match("/xirrus_stats-iap([0-9]{1,2}).rrd/", $rrd, $out);
list(,$radioId)=$out;
// build graph
$color=$pallette[$radioId];
$descr = "iap$radioId ";
$rrd_options .= " DEF:rate$radioId=$rrd:dataRate:AVERAGE";
$rrd_options .= " LINE2:rate$radioId#".$color.":'".$descr."'";
$rrd_options .= " GPRINT:rate$radioId:LAST:'%5.0lf'";
$rrd_options .= " GPRINT:rate$radioId:MIN:'%5.0lf'";
$rrd_options .= " GPRINT:rate$radioId:MAX:'%5.0lf'\\l";
$radioId++;
}//end foreach
html/includes/graphs/device/xirrus_noiseFloor.inc.php
-44
View File
@@ -1,44 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$pallette = array(
1 => 'FF0000',
2 => '0000FF',
3 => '00FF00',
4 => 'FF00FF',
5 => '000000',
6 => 'FFFF00',
7 => 'C0C0C0',
8 => '800000',
9 => '808000',
10 => '008000',
11 => '00FFFF',
12 => '008080',
13 => '000080',
14 => '800080',
15 => 'FF69B4',
16 => '006400'
);
$rrd_options .= ' -E ';
$rrd_options .= " COMMENT:'Noisefloor Cur Min Max\\n'";
$radioId=1;
foreach (glob(rrd_name($device['hostname'], 'xirrus_stats-', '*.rrd')) as $rrd) {
// get radio name
preg_match("/xirrus_stats-iap([0-9]{1,2}).rrd/", $rrd, $out);
list(,$radioId)=$out;
// build graph
$color=$pallette[$radioId];
$descr = "iap$radioId ";
$rrd_options .= " DEF:noise$radioId=$rrd:noiseFloor:AVERAGE";
$rrd_options .= " LINE2:noise$radioId#".$color.":'".$descr."'";
$rrd_options .= " GPRINT:noise$radioId:LAST:'%5.0lf'";
$rrd_options .= " GPRINT:noise$radioId:MIN:'%5.0lf'";
$rrd_options .= " GPRINT:noise$radioId:MAX:'%5.0lf'\\l";
$radioId++;
}//end foreach
html/includes/graphs/device/xirrus_rssi.inc.php
-44
View File
@@ -1,44 +0,0 @@
<?php
require 'includes/graphs/common.inc.php';
$pallette = array(
1 => 'FF0000',
2 => '0000FF',
3 => '00FF00',
4 => 'FF00FF',
5 => '000000',
6 => 'FFFF00',
7 => 'C0C0C0',
8 => '800000',
9 => '808000',
10 => '008000',
11 => '00FFFF',
12 => '008080',
13 => '000080',
14 => '800080',
15 => 'FF69B4',
16 => '006400'
);
$rrd_options .= ' -E ';
$rrd_options .= " COMMENT:'Signal RSSI Cur Min Max\\n'";
$radioId=1;
foreach (glob(rrd_name($device['hostname'], 'xirrus_stats-', '*.rrd')) as $rrd) {
// get radio name
preg_match("/xirrus_stats-iap([0-9]{1,2}).rrd/", $rrd, $out);
list(,$radioId)=$out;
// build graph
$color=$pallette[$radioId];
$descr = "iap$radioId ";
$rrd_options .= " DEF:rssi$radioId=$rrd:rssi:AVERAGE";
$rrd_options .= " LINE2:rssi$radioId#".$color.":'".$descr."'";
$rrd_options .= " GPRINT:rssi$radioId:LAST:'%5.0lf'";
$rrd_options .= " GPRINT:rssi$radioId:MIN:'%5.0lf'";
$rrd_options .= " GPRINT:rssi$radioId:MAX:'%5.0lf'\\l";
$radioId++;
}//end foreach
includes/definitions.inc.php
-107
View File
@@ -20,62 +20,6 @@ $config['os_group'][$os_group]['over'][0]['text'] = 'Processor Usage';
$config['os_group'][$os_group]['over'][1]['graph'] = 'device_ucd_memory';
$config['os_group'][$os_group]['over'][1]['text'] = 'Memory Usage';
// Device - Wireless - AirMAX
$config['graph_types']['device']['ubnt_airmax_WlStatStaCount']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_WlStatStaCount']['order'] = '0';
$config['graph_types']['device']['ubnt_airmax_WlStatStaCount']['descr'] = 'Wireless Clients';
$config['graph_types']['device']['ubnt_airmax_RadioDistance']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_RadioDistance']['order'] = '1';
$config['graph_types']['device']['ubnt_airmax_RadioDistance']['descr'] = 'Radio Distance';
$config['graph_types']['device']['ubnt_airmax_RadioFreq']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_RadioFreq']['order'] = '2';
$config['graph_types']['device']['ubnt_airmax_RadioFreq']['descr'] = 'Radio Frequency';
$config['graph_types']['device']['ubnt_airmax_RadioTxPower']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_RadioTxPower']['order'] = '3';
$config['graph_types']['device']['ubnt_airmax_RadioTxPower']['descr'] = 'Radio Tx Power';
$config['graph_types']['device']['ubnt_airmax_RadioRssi_0']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_RadioRssi_0']['order'] = '4';
$config['graph_types']['device']['ubnt_airmax_RadioRssi_0']['descr'] = 'Radio Rssi Chain 0';
$config['graph_types']['device']['ubnt_airmax_RadioRssi_1']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_RadioRssi_1']['order'] = '5';
$config['graph_types']['device']['ubnt_airmax_RadioRssi_1']['descr'] = 'Radio Rssi Chain 1';
$config['graph_types']['device']['ubnt_airmax_WlStatSignal']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_WlStatSignal']['order'] = '6';
$config['graph_types']['device']['ubnt_airmax_WlStatSignal']['descr'] = 'Radio Signal';
$config['graph_types']['device']['ubnt_airmax_WlStatRssi']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_WlStatRssi']['order'] = '7';
$config['graph_types']['device']['ubnt_airmax_WlStatRssi']['descr'] = 'Radio Overall RSSI';
$config['graph_types']['device']['ubnt_airmax_WlStatCcq']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_WlStatCcq']['order'] = '8';
$config['graph_types']['device']['ubnt_airmax_WlStatCcq']['descr'] = 'Radio CCQ';
$config['graph_types']['device']['ubnt_airmax_WlStatNoiseFloor']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_WlStatNoiseFloor']['order'] = '10';
$config['graph_types']['device']['ubnt_airmax_WlStatNoiseFloor']['descr'] = 'Radio Noise Floor';
$config['graph_types']['device']['ubnt_airmax_WlStatTxRate']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_WlStatTxRate']['order'] = '11';
$config['graph_types']['device']['ubnt_airmax_WlStatTxRate']['descr'] = 'Radio Tx Rate';
$config['graph_types']['device']['ubnt_airmax_WlStatRxRate']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_WlStatRxRate']['order'] = '12';
$config['graph_types']['device']['ubnt_airmax_WlStatRxRate']['descr'] = 'Radio Rx Rate';
$config['graph_types']['device']['ubnt_airmax_AirMaxQuality']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_AirMaxQuality']['order'] = '13';
$config['graph_types']['device']['ubnt_airmax_AirMaxQuality']['descr'] = 'AirMax Quality';
$config['graph_types']['device']['ubnt_airmax_AirMaxCapacity']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_airmax_AirMaxCapacity']['order'] = '14';
$config['graph_types']['device']['ubnt_airmax_AirMaxCapacity']['descr'] = 'AirMax Capacity';
// Device - AirFIBER
$config['graph_types']['device']['ubnt_airfiber_RadioFreqs']['section'] = 'wireless';
@@ -118,28 +62,7 @@ $config['graph_types']['device']['ubnt_airfiber_RxPower']['section'] = 'wireless
$config['graph_types']['device']['ubnt_airfiber_RxPower']['order'] = '8';
$config['graph_types']['device']['ubnt_airfiber_RxPower']['descr'] = 'Radio Rx Power';
// Unifi Support
$config['graph_types']['device']['ubnt_unifi_RadioCu_0']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_unifi_RadioCu_0']['order'] = '0';
$config['graph_types']['device']['ubnt_unifi_RadioCu_0']['descr'] = 'Radio0 Capacity Used';
$config['graph_types']['device']['ubnt_unifi_RadioCu_1']['section'] = 'wireless';
$config['graph_types']['device']['ubnt_unifi_RadioCu_1']['order'] = '1';
$config['graph_types']['device']['ubnt_unifi_RadioCu_1']['descr'] = 'Radio1 Capacity Used';
// Siklu support
$config['graph_types']['device']['siklu_rfAverageRssi']['section'] = 'wireless';
$config['graph_types']['device']['siklu_rfAverageRssi']['order'] = '0';
$config['graph_types']['device']['siklu_rfAverageRssi']['descr'] = 'Radio Average RSSI';
$config['graph_types']['device']['siklu_rfAverageCinr']['section'] = 'wireless';
$config['graph_types']['device']['siklu_rfAverageCinr']['order'] = '1';
$config['graph_types']['device']['siklu_rfAverageCinr']['descr'] = 'Radio Average CINR';
$config['graph_types']['device']['siklu_rfOperationalFrequency']['section'] = 'wireless';
$config['graph_types']['device']['siklu_rfOperationalFrequency']['order'] = '2';
$config['graph_types']['device']['siklu_rfOperationalFrequency']['descr'] = 'Operational Frequency';
$config['graph_types']['device']['siklu_rfinterfacePkts']['section'] = 'wireless';
$config['graph_types']['device']['siklu_rfinterfacePkts']['order'] = '3';
$config['graph_types']['device']['siklu_rfinterfacePkts']['descr'] = 'Packets';
@@ -156,23 +79,6 @@ $config['graph_types']['device']['siklu_rfinterfaceOtherOctets']['section'] = 'w
$config['graph_types']['device']['siklu_rfinterfaceOtherOctets']['order'] = '6';
$config['graph_types']['device']['siklu_rfinterfaceOtherOctets']['descr'] = 'Other Octets';
// SAF support
$config['graph_types']['device']['saf_radioRxLevel']['section'] = 'wireless';
$config['graph_types']['device']['saf_radioRxLevel']['order'] = '0';
$config['graph_types']['device']['saf_radioRxLevel']['descr'] = 'RX Level';
$config['graph_types']['device']['saf_radioTxPower']['section'] = 'wireless';
$config['graph_types']['device']['saf_radioTxPower']['order'] = '1';
$config['graph_types']['device']['saf_radioTxPower']['descr'] = 'TX Power';
$config['graph_types']['device']['saf_modemRadialMSE']['section'] = 'wireless';
$config['graph_types']['device']['saf_modemRadialMSE']['order'] = '2';
$config['graph_types']['device']['saf_modemRadialMSE']['descr'] = 'Radial MSE';
$config['graph_types']['device']['saf_modemCapacity']['section'] = 'wireless';
$config['graph_types']['device']['saf_modemCapacity']['order'] = '3';
$config['graph_types']['device']['saf_modemCapacity']['descr'] = 'Capacity';
// Ceragon Ceraos support
$config['graph_types']['device']['ceraos_RxLevel']['section'] = 'wireless';
$config['graph_types']['device']['ceraos_RxLevel']['order'] = '0';
@@ -343,10 +249,6 @@ $config['graph_types']['device']['cambium-epmp-frameUtilization']['section'] = '
$config['graph_types']['device']['ccambium-epmp-frameUtilization']['order'] = '7';
$config['graph_types']['device']['cambium-epmp-frameUtilization']['descr'] = 'Frame Utilization';
$config['graph_types']['device']['wifi_clients']['section'] = 'wireless';
$config['graph_types']['device']['wifi_clients']['order'] = '0';
$config['graph_types']['device']['wifi_clients']['descr'] = 'Wireless Clients';
$config['graph_types']['device']['agent']['section'] = 'poller';
$config['graph_types']['device']['agent']['order'] = '0';
$config['graph_types']['device']['agent']['descr'] = 'Agent Execution Time';
@@ -584,15 +486,6 @@ $config['graph_types']['device']['cisco_wwan_mnc']['section'] = 'wireless';
$config['graph_types']['device']['cisco_wwan_mnc']['order'] = '1';
$config['graph_types']['device']['cisco_wwan_mnc']['descr'] = 'MNC';
$config['graph_types']['device']['xirrus_rssi']['section'] = 'wireless';
$config['graph_types']['device']['xirrus_rssi']['order'] = '0';
$config['graph_types']['device']['xirrus_rssi']['descr'] = 'Signal Rssi';
$config['graph_types']['device']['xirrus_dataRates']['section'] = 'wireless';
$config['graph_types']['device']['xirrus_dataRates']['order'] = '0';
$config['graph_types']['device']['xirrus_dataRates']['descr'] = 'Average DataRates';
$config['graph_types']['device']['xirrus_noiseFloor']['section'] = 'wireless';
$config['graph_types']['device']['xirrus_noiseFloor']['order'] = '0';
$config['graph_types']['device']['xirrus_noiseFloor']['descr'] = 'Noise Floor';
$config['graph_types']['device']['xirrus_stations']['section'] = 'wireless';
$config['graph_types']['device']['xirrus_stations']['order'] = '0';
$config['graph_types']['device']['xirrus_stations']['descr'] = 'Associated Stations';
includes/definitions/airos-af.yaml
+3 -2
View File
@@ -5,7 +5,8 @@ icon: ubiquiti
nobulk: 1
group: ubnt
over:
- { graph: device_bits }
- { graph: device_processor }
- { graph: device_bits, text: 'Device Traffic' }
- { graph: device_wireless_rate, text: 'Wireless Rate' }
- { graph: device_processor, text: 'CPU Usage' }
poller_modules:
wifi: 1
includes/definitions/airos.yaml
+3 -2
View File
@@ -5,5 +5,6 @@ icon: ubiquiti
nobulk: 1
group: ubnt
over:
- { graph: device_bits }
- { graph: device_processor }
- { graph: device_bits, text: 'Device Traffic' }
- { graph: device_wireless_clients, text: 'Connected Clients' }
- { graph: device_wireless_ccq, text: 'Connection Quality' }
includes/definitions/saf.yaml
+1 -3
View File
@@ -4,10 +4,8 @@ type: wireless
icon: saf
over:
- { graph: device_bits, text: Traffic }
- { graph: device_saf_radioRxLevel, text: 'Rx Level' }
- { graph: device_wireless_power, text: 'Power Levels' }
- { graph: device_ping_perf, text: 'Ping Times' }
discovery:
- sysObjectId:
- .1.3.6.1.4.1.7571.100.1.1.5
poller_modules:
wifi: 1
includes/definitions/siklu.yaml
+2
View File
@@ -4,6 +4,8 @@ type: wireless
icon: siklu
over:
- { graph: device_bits, text: Traffic }
- { graph: device_wireless_rssi, text: RSSI }
- { graph: device_wireless_snr, text: CINR }
poller_modules:
wifi: 1
discovery:
includes/definitions/unifi.yaml
+2 -2
View File
@@ -6,5 +6,5 @@ nobulk: 1
group: ubnt
over:
- { graph: device_bits, text: 'Device Traffic' }
- { graph: device_processor, text: 'Processor Usage' }
- { graph: device_mempool, text: 'Memory Usage' }
- { graph: device_wireless_clients, text: 'Connected Clients' }
- { graph: device_wireless_ccq, text: 'Connection Quality' }
includes/definitions/xirrus_aos.yaml
+1 -1
View File
@@ -5,7 +5,7 @@ icon: xirrus
over:
- { graph: device_bits, text: 'Device Traffic' }
- { graph: device_xirrus_stations, text: 'Wifi Clients' }
- { graph: device_xirrus_rssi, text: 'Signal RSSI' }
- { graph: device_wireless_rssi, text: 'Signal RSSI' }
discovery:
- sysDescr:
- Xirrus
includes/polling/mib/saf-mib.inc.php
-47
View File
@@ -1,47 +0,0 @@
<?php
echo ' SAF Tehnika ';
$mib_oids = array(
'radioRxLevel' => array(
'local',
'radioRxLevel',
'RX Power',
'GAUGE',
),
'radioTxPower' => array(
'local',
'radioTxPower',
'TX Power',
'GAUGE',
),
'modemRadialMSE' => array(
'local',
'modemRadialMSE',
'Radial MSE',
'GAUGE',
),
'modemACMtotalCapacity' => array(
'local',
'modemACMCapacity',
'ACM Capacity',
'GAUGE',
),
'modemTotalCapacity' => array(
'local',
'modemTotalCapacity',
'Capacity',
'GAUGE',
),
);
$mib_graphs = array(
'saf_radioRxLevel',
'saf_radioTxPower',
'saf_modemRadialMSE',
'saf_modemCapacity',
);
unset($graph, $oids, $oid);
poll_mib_def($device, 'SAF-IPRADIO:saf-modem-radio', 'saf', $mib_oids, $mib_graphs, $graphs);
includes/polling/mib/siklu-mib.inc.php
-31
View File
@@ -2,37 +2,6 @@
echo ' Siklu Wireless ';
$mib_oids = array(
'rfAverageRssi' => array(
'1',
'rfAverageRssi',
'Signal Strength',
'GAUGE',
),
'rfAverageCinr' => array(
'1',
'rfAverageCinr',
'Signal to noise ratio',
'GAUGE',
),
'rfOperationalFrequency' => array(
'1',
'rfOperFreq',
'Operational Frequency',
'GAUGE',
),
);
$mib_graphs = array(
'siklu_rfAverageRssi',
'siklu_rfAverageCinr',
'siklu_rfOperationalFrequency',
);
unset($graph, $oids, $oid);
poll_mib_def($device, 'RADIO-BRIDGE-MIB:siklu-wireless', 'siklu', $mib_oids, $mib_graphs, $graphs);
// Poll interface statistics
$mib_oids = array(
'rfInPkts' => array(
includes/polling/mib/ubnt-airfiber-mib.inc.php
+1 -29
View File
@@ -59,6 +59,7 @@ $mib_oids = array(
'Radio 1 Temp',
'GAUGE',
),
// above here is duplicated in wireless
'txOctetsOK' => array(
'1',
'txOctetsOK',
@@ -208,32 +209,3 @@ $mib_graphs = array(
unset($graph, $oids, $oid);
poll_mib_def($device, 'UBNT-AirFIBER-MIB:UBNT', 'ubiquiti', $mib_oids, $mib_graphs, $graphs);
echo ' UBNT-AirFIBER-MIB Rx levels ';
// $mib_oids (oidindex,dsname,dsdescription,dstype)
$mib_oids = array(
'rxPower0' => array(
'1',
'rxPower0',
'Rx Chain0 Power',
'GAUGE',
),
'rxPower1' => array(
'1',
'rxPower1',
'Rx Chain1 Power',
'GAUGE',
),
);
$mib_graphs = array(
'ubnt_airfiber_RxPower',
);
unset($graph, $oids, $oid);
poll_mib_def($device, 'UBNT-AirFIBER-MIB:UBNT', 'ubiquiti', $mib_oids, $mib_graphs, $graphs, 'ubnt-airfibre-mib-rx');
// EOF
includes/polling/mib/ubnt-airmax-mib.inc.php
-140
View File
@@ -1,140 +0,0 @@
<?php
/*
* @copyright (C) 2015 Mark Gibbons
*/
// Polling of Airmax MIB AP for Ubiquiti Airmax Radios
//
// UBNT-AirMAX-MIB::ubntRadioDistance
echo ' UBNT-AirMAX-MIB ';
// Check If It Is A Device that supports latest Airmax MIB By Trying To Read Frequency
// if (substr($device['version'],0,3) == "5.6")
if (is_numeric(snmp_get($device, 'ubntRadioFreq.1', '-OUqnv', 'UBNT-AirMAX-MIB'))) {
// $mib_oids (oidindex,dsname,dsdescription,dstype)
$mib_oids = array(
'ubntRadioFreq' => array(
'1',
'RadioFreq',
'Frequency',
'GAUGE',
),
'ubntRadioTxPower' => array(
'1',
'RadioTxPower',
'Tx Power',
'GAUGE',
),
'ubntRadioDistance' => array(
'1',
'RadioDistance',
'Distance',
'GAUGE',
),
'ubntRadioRssi.1.1' => array(
'',
'RadioRssi_0',
'RSSI Chain 0',
'GAUGE',
),
'ubntRadioRssi.1.2' => array(
'',
'RadioRssi_1',
'RSSI Chain 1',
'GAUGE',
),
'ubntWlStatSignal' => array(
'1',
'WlStatSignal',
'Signal',
'GAUGE',
),
'ubntWlStatRssi' => array(
'1',
'WlStatRssi',
'Overall RSSI',
'GAUGE',
),
'ubntWlStatCcq' => array(
'1',
'WlStatCcq',
'Transmit CCQ',
'GAUGE',
),
'ubntWlStatNoiseFloor' => array(
'1',
'WlStatNoiseFloor',
'Noise Floor',
'GAUGE',
),
'ubntWlStatTxRate' => array(
'1',
'WlStatTxRate',
'Tx Rate',
'GAUGE',
),
'ubntWlStatRxRate' => array(
'1',
'WlStatRxRate',
'Rx Rate',
'GAUGE',
),
'ubntWlStatStaCount' => array(
'1',
'WlStatStaCount',
'Sta Count',
'GAUGE',
),
'ubntAirMaxQuality' => array(
'1',
'AirMaxQuality',
'AirMax Quality',
'GAUGE',
),
'ubntAirMaxCapacity' => array(
'1',
'AirMaxCapacity',
'AirMax Capacity',
'GAUGE',
),
);
$mib_graphs = array();
// Build Graph List Array
if (1 == 1) {
// Is It An AP
if (stristr(snmp_get($device, 'ubntRadioMode.1', '-OUqnv', 'UBNT-AirMAX-MIB'), 'ap')) {
// Yes - Add Station Count Graph
array_push($mib_graphs, 'ubnt_airmax_WlStatStaCount');
}
// Add Common Graphs
array_push(
$mib_graphs,
'ubnt_airmax_RadioFreq',
'ubnt_airmax_RadioTxPower',
'ubnt_airmax_RadioDistance',
'ubnt_airmax_RadioRssi_0',
'ubnt_airmax_RadioRssi_1',
'ubnt_airmax_WlStatSignal',
'ubnt_airmax_WlStatRssi',
'ubnt_airmax_WlStatCcq',
'ubnt_airmax_WlStatNoiseFloor',
'ubnt_airmax_WlStatTxRate',
'ubnt_airmax_WlStatRxRate'
);
// Is Airmax Enabled?
if (snmp_get($device, 'ubntAirMaxEnabled.1', '-OUqnv', 'UBNT-AirMAX-MIB') == 'true') {
// Check To See If It Is An AC Device - Returns Airmax Capacity of 0
if (snmp_get($device, 'ubntAirMaxCapacity.1', '-OUqnv', 'UBNT-AirMAX-MIB') != 0) {
// No - Not AC - add AirMax Graphs
array_push($mib_graphs, 'ubnt_airmax_AirMaxQuality', 'ubnt_airmax_AirMaxCapacity');
}
}
}//end if
unset($graph, $oids, $oid);
poll_mib_def($device, 'UBNT-AirMAX-MIB:UBNT', 'ubiquiti', $mib_oids, $mib_graphs, $graphs);
}//end if
includes/polling/mib/ubnt-unifi-mib.inc.php
-69
View File
@@ -1,69 +0,0 @@
<?php
// Polling of UniFi MIB AP for Ubiquiti Unifi Radios
// based on Airfiber MIB work of Mark Gibbons
// UBNT-UniFi-MIB
echo 'UBNT-UniFi-MIB ';
// $mib_oids (oidindex,dsname,dsdescription,dstype)
$mib_oids = array(
'unifiRadioCuTotal.0' => array(
'',
'Radio0CuTotal',
'Radio0 Channel Utilized',
'GAUGE',
),
'unifiRadioCuTotal.1' => array(
'',
'Radio1CuTotal',
'Radio1 Channel Utilized',
'GAUGE',
),
'unifiRadioCuSelfRx.0' => array(
'',
'Radio0CuSelfRx',
'Radio0 Channel Utilized Rx',
'GAUGE',
),
'unifiRadioCuSelfRx.1' => array(
'',
'Radio1CuSelfRx',
'Radio1 Channel Utilized Rx',
'GAUGE',
),
'unifiRadioCuSelfTx.0' => array(
'',
'Radio0CuSelfTx',
'Radio0 Channel Utilized Tx',
'GAUGE',
),
'unifiRadioCuSelfTx.1' => array(
'',
'Radio1CuSelfTx',
'Radio1 Channel Utilized Tx',
'GAUGE',
),
'unifiRadioOtherBss.0' => array(
'',
'Radio0OtherBss',
'Radio0 Channel Utilized by Others',
'GAUGE',
),
'unifiRadioOtherBss.1' => array(
'',
'Radio1OtherBss',
'Radio1 Channel Utilized by Others',
'GAUGE',
),
);
$mib_graphs = array(
'ubnt_unifi_RadioCu_0',
'ubnt_unifi_RadioCu_1',
);
unset($graph, $oids, $oid);
poll_mib_def($device, 'UBNT-UniFi-MIB:UBNT', 'ubiquiti', $mib_oids, $mib_graphs, $graphs);
// EOF
includes/polling/wifi.inc.php
+14 -24
View File
@@ -1,27 +1,17 @@
<?php
if ($device['type'] == 'network' || $device['type'] == 'firewall' || $device['type'] == 'wireless') {
if ($device['os'] == 'airos') {
echo 'It Is Airos' . PHP_EOL;
include 'includes/polling/mib/ubnt-airmax-mib.inc.php';
} elseif ($device['os'] == 'airos-af') {
echo 'It Is AirFIBER' . PHP_EOL;
include 'includes/polling/mib/ubnt-airfiber-mib.inc.php';
} elseif ($device['os'] == 'ceraos') {
echo 'It is Ceragon CeroOS' . PHP_EOL;
include 'includes/polling/mib/ceraos-mib.inc.php';
} elseif ($device['os'] == 'siklu') {
echo 'It is Siklu' . PHP_EOL;
include 'includes/polling/mib/siklu-mib.inc.php';
} elseif ($device['os'] == 'saf') {
echo 'It is SAF Tehnika' . PHP_EOL;
include 'includes/polling/mib/saf-mib.inc.php';
} elseif ($device['os'] == 'sub10') {
echo 'It is Sub10' . PHP_EOL;
include 'includes/polling/mib/sub10-mib.inc.php';
} elseif ($device['os'] == 'unifi') {
include 'includes/polling/mib/ubnt-unifi-mib.inc.php';
}
} else {
echo 'Unsupported type: ' . $device['type'] . PHP_EOL;
// don't add new things here use wireless polling: https://docs.librenms.org/#Developing/os/Wireless-Sensors/
if ($device['os'] == 'airos-af') {
echo 'It Is AirFIBER' . PHP_EOL;
include 'includes/polling/mib/ubnt-airfiber-mib.inc.php'; // packet stats
} elseif ($device['os'] == 'ceraos') {
echo 'It is Ceragon CeroOS' . PHP_EOL;
include 'includes/polling/mib/ceraos-mib.inc.php';
} elseif ($device['os'] == 'siklu') {
echo 'It is Siklu' . PHP_EOL;
include 'includes/polling/mib/siklu-mib.inc.php';
} elseif ($device['os'] == 'sub10') {
echo 'It is Sub10' . PHP_EOL;
include 'includes/polling/mib/sub10-mib.inc.php';
}
includes/polling/wireless/xirrus.inc.php
+2 -30
View File
@@ -1,31 +1,8 @@
<?php
use LibreNMS\RRD\RrdDefinition;
$radios = snmpwalk_cache_oid($device, 'XIRRUS-MIB::realtimeMonitorIfaceName', array(), 'XIRRUS-MIB');
$rssi = snmpwalk_cache_oid($device, 'XIRRUS-MIB::realtimeMonitorAverageRSSI', array(), 'XIRRUS-MIB');
$dataRate = snmpwalk_cache_oid($device, 'XIRRUS-MIB::realtimeMonitorAverageDataRate', array(), 'XIRRUS-MIB');
$noiseFloor = snmpwalk_cache_oid($device, 'XIRRUS-MIB::realtimeMonitorNoiseFloor', array(), 'XIRRUS-MIB');
$associations=array();
foreach ($radios as $idx => $radio) {
$radioName = $radio['realtimeMonitorIfaceName'];
$associations[$radioName]=0;
$measurement = 'xirrus_stats';
$rrd_name = array($measurement, $radioName);
$rrd_def = RrdDefinition::make()
->addDataset('rssi', 'GAUGE', -150, 0)
->addDataset('dataRate', 'GAUGE', 0, 1400)
->addDataset('noiseFloor', 'GAUGE', -150, 0);
$fields = array(
'rssi' => $rssi[$idx]['realtimeMonitorAverageRSSI'],
'dataRate' => $dataRate[$idx]['realtimeMonitorAverageDataRate'],
'noiseFloor' => $noiseFloor[$idx]['realtimeMonitorNoiseFloor']
);
$tags = compact('radioName', 'rrd_name', 'rrd_def');
data_update($device, $measurement, $tags, $fields);
}
// if this config flag is true, don't poll for stations
// this in case of large APs which may have many stations
// to prevent causing long polling times
@@ -35,7 +12,7 @@ if ($config['xirrus_disable_stations']!=true) {
$assoc = snmpwalk_cache_oid($device, 'XIRRUS-MIB::stationAssociationIAP', array(), 'XIRRUS-MIB');
foreach ($assoc as $s) {
$radio = array_pop($s);
$associations[$radio]++;
$associations[$radio] = (int)$associations[$radio] + 1;
}
unset($radio);
unset($assoc);
@@ -55,10 +32,5 @@ if ($config['xirrus_disable_stations']!=true) {
$graphs['xirrus_stations'] = false;
}
$graphs['xirrus_rssi'] = true;
$graphs['xirrus_dataRates'] = true;
$graphs['xirrus_noiseFloor'] = true;
$graphs['xirrus_stations'] = true;
// cleanup
unset($rrd_def, $radios, $rssi, $radioName, $associations, $tags, $fields, $measurement);
unset($rrd_def, $associations, $tags, $fields, $measurement);