Skip to content

Commit

Permalink
device: Added AeroHive Wireless Support (librenms#8500)
Browse files Browse the repository at this point in the history
* AeroHive 001

* AeroHive 002

* AeroHive 003

* Removed duplicate HiveOS for OS

* Added AP550 detection

* changed to Hiveos-Wireless

* changed back to HiveosWireless. Hiveoss-Wireless doesn't work

* changed back to HiveosWireless. Hiveoss-Wireless doesn't work

* Added Processor Usage.

* Added Mempool.

* working on review requests 001

* working on review requests 002

* stuck on radio stats

* WirelessSensor.php added channel 165

* Added AP250 snmprec

* Frequency work in progress.

* Frequency trying another way.

* Frequency trying another way 002

* Fixed AH-SMI-MIB? Added array try 003

* Frequency array is working thanks to Murrant.

* Frequency array description working.

* Added TX Power

* changed interface naming method

* Review changes 001

* Review changes 002

* Review changes 003

* Added json test data.

* Fixed test data 001.
  • Loading branch information
theherodied authored and TheMysteriousX committed May 20, 2018
1 parent 5df0804 commit cfa9dd3
Show file tree
Hide file tree
Showing 9 changed files with 1,909 additions and 13 deletions.
1 change: 1 addition & 0 deletions LibreNMS/Device/WirelessSensor.php
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ public static function channelToFrequency($channel)
153 => 5765,
157 => 5785,
161 => 5805,
165 => 5825,
);

return $channels[$channel];
Expand Down
152 changes: 152 additions & 0 deletions LibreNMS/OS/HiveosWireless.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
<?php
/**
* HiveosWireless.php
*
* AeroHive Hiveos-Wireless
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package LibreNMS
* @link http://librenms.org
* @copyright 2018 Ryan Finney
* @author https://github.com/theherodied/
*/

namespace LibreNMS\OS;

use LibreNMS\Device\Processor;
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\WirelessPowerDiscovery;
use LibreNMS\Interfaces\Discovery\ProcessorDiscovery;
use LibreNMS\Interfaces\Polling\Sensors\WirelessFrequencyPolling;
use LibreNMS\OS;

class HiveosWireless extends OS implements
WirelessClientsDiscovery,
WirelessFrequencyDiscovery,
WirelessFrequencyPolling,
WirelessNoiseFloorDiscovery,
WirelessPowerDiscovery,
ProcessorDiscovery
{
/**
* Discover processors.
* Returns an array of LibreNMS\Device\Processor objects that have been discovered
*
* @return array Processors
*/
public function discoverProcessors()
{
$device = $this->getDevice();
return array(
Processor::discover(
$this->getName(),
$this->getDeviceId(),
'1.3.6.1.4.1.26928.1.2.3.0', // AH-SYSTEM-MIB::ahCpuUtilization
0
)
);
}

/**
* Discover wireless client counts. Type is clients.
* Returns an array of LibreNMS\Device\Sensor objects that have been discovered
*
* @return array Sensors
*/
public function discoverWirelessClients()
{
$oid = '.1.3.6.1.4.1.26928.1.2.9.0'; // AH-SYSTEM-MIB::ahClientCount
return array(
new WirelessSensor('clients', $this->getDeviceId(), $oid, 'HiveosWireless', 1, 'Clients')
);
}

/**
* Discover wireless frequency. This is in GHz. Type is frequency.
* Returns an array of LibreNMS\Device\Sensor objects that have been discovered
*
* @return array Sensors
*/
public function pollWirelessFrequency(array $sensors)
{
return $this->pollWirelessChannelAsFrequency($sensors);
}

public function discoverWirelessFrequency()
{
$ahRadioName = $this->getCacheByIndex('ahIfName', 'AH-INTERFACE-MIB');
$data = snmpwalk_group($this->getDevice(), 'ahRadioChannel', 'AH-INTERFACE-MIB');
foreach ($data as $index => $frequency) {
$sensors[] = new WirelessSensor(
'frequency',
$this->getDeviceId(),
'.1.3.6.1.4.1.26928.1.1.1.2.1.5.1.1.' . $index,
'hiveos-wireless',
$index,
$ahRadioName[$index],
WirelessSensor::channelToFrequency($frequency['ahRadioChannel'])
);
}
return $sensors;
}

/**
* Discover wireless tx power. This is in dBm. Type is power.
* Returns an array of LibreNMS\Device\Sensor objects that have been discovered
*
* @return array
*/
public function discoverWirelessPower()
{
$sensors = array();

$ahRadioName = $this->getCacheByIndex('ahIfName', 'AH-INTERFACE-MIB');
$ahTxPow = snmpwalk_group($this->getDevice(), 'ahRadioTxPower', 'AH-INTERFACE-MIB');
foreach ($ahTxPow as $index => $entry) {
$sensors[] = new WirelessSensor(
'power',
$this->getDeviceId(),
'.1.3.6.1.4.1.26928.1.1.1.2.1.5.1.2.' . $index,
'hiveos-wireless',
$index,
'Tx Power: ' . $ahRadioName[$index],
$entry['ahRadioTxPower']
);
}
return $sensors;
}

public function discoverWirelessNoiseFloor()
{
$ahRadioName = $this->getCacheByIndex('ahIfName', 'AH-INTERFACE-MIB');
$ahRxNoise = snmpwalk_group($this->getDevice(), 'ahRadioNoiseFloor', 'AH-INTERFACE-MIB');
$sensors = array();
foreach ($ahRxNoise as $index => $entry) {
$sensors[] = new WirelessSensor(
'noise-floor',
$this->getDeviceId(),
'.1.3.6.1.4.1.26928.1.1.1.2.1.5.1.3.' . $index,
'hiveos-wireless',
$index,
'Noise floor ' . $ahRadioName[$index],
$entry['ahRxNoise']
);
}
return $sensors;
}
}
32 changes: 32 additions & 0 deletions includes/discovery/mempools/hiveos-wireless.inc.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php
/**
* hiveos-wireless.inc.php
*
* AeroHive Hiveos-Wireless Discovery Module
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package LibreNMS
* @link http://librenms.org
* @copyright 2018 Ryan Finney
* @author https://github.com/theherodied/
*/
if ($device['os'] == 'hiveos-wireless') {
echo 'Hiveos-Wireless : ';
$memory_oid = '1.3.6.1.4.1.26928.1.2.4.0';
$usage = snmp_get($device, $memory_oid, '-Ovq');
if (is_numeric($usage)) {
discover_mempool($valid_mempool, $device, '0', 'hiveos-wireless', 'Memory');
}
}
33 changes: 33 additions & 0 deletions includes/polling/mempools/hiveos-wireless.inc.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@

<?php
/**
* hiveos-wireless.inc.php
*
* AeroHive Hiveos-Wireless Polling Module
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package LibreNMS
* @link http://librenms.org
* @copyright 2018 Ryan Finney
* @author https://github.com/theherodied/
*/
d_echo('Hiveos-Wireless');
$memory_oid = '1.3.6.1.4.1.26928.1.2.4.0';
$perc = snmp_get($device, $memory_oid, '-OvQ');
if (is_numeric($perc)) {
$mempool['used'] = $perc;
$mempool['total'] = 100;
$mempool['free'] = 100 - $perc;
}
40 changes: 32 additions & 8 deletions includes/polling/os/hiveos-wireless.inc.php
Original file line number Diff line number Diff line change
@@ -1,17 +1,41 @@
<?php
/*
* LibreNMS
/**
* hiveos-wireless.inc.php
*
* Copyright (c) 2015 Søren Friis Rosiak <sorenrosiak@gmail.com>
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version. Please see LICENSE.txt at the top level of
* the source code distribution for details.
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package LibreNMS
* @link http://librenms.org
* @copyright 2015 Søren Friis Rosiak
* @author sorenrosiak@gmail.com
* @copyright 2018 Ryan Finney
* @author https://github.com/theherodied/
*/

if (preg_match('/^(.+?),/', $device['sysDescr'], $hardware)) {
$hardware = $store[1];
}
$hardware = trim(snmp_get($device, '.1.3.6.1.4.1.4413.1.1.1.1.1.3.0', '-Ovq'), '"');
$version = trim(snmp_get($device, '.1.3.6.1.4.1.4413.1.1.1.1.1.13.0', '-Ovq'), '"');
$serial = trim(snmp_get($device, '.1.3.6.1.4.1.4413.1.1.1.1.1.4.0', '-Ovq'), '"');

$apmodel = snmp_get($device, 'ahDeviceMode.0', '-Ovq', 'AH-SYSTEM-MIB');
if ($apmodel == 'AP250' || $apmodel == 'AP550') {
$data = snmp_get_multi_oid($device, 'ahSystemSerial.0 ahDeviceMode.0 ahFirmwareVersion.0', '-OQUs', 'AH-SYSTEM-MIB');
$hardware = $data['ahDeviceMode.0'];
$version2 = $data['ahFirmwareVersion.0'];
// Version has 'HiveOS ' included. We want to remove it so OS doesn't show HiveOS twice.
$version = preg_replace('/^HiveOS /', '', $version2);
$serial = $data['ahSystemSerial.0'];
}
12 changes: 7 additions & 5 deletions mibs/aerohive/AH-SMI-MIB
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ aerohive MODULE-IDENTITY
LAST-UPDATED "201608310000Z" -- Aug 31, 2016
ORGANIZATION "Aerohive Networks, Inc"
CONTACT-INFO "info@aerohive.com
1011 McCarthy Boulevard Milpitas, CA 95035"
1011 McCarthy Boulevard

Milpitas, CA 95035"
DESCRIPTION
"This is the MIB module for object type definitions
that are used throughout the Aerohive Networks enterprise MIBs."
Expand All @@ -39,10 +41,10 @@ ahAPInterface OBJECT IDENTIFIER ::= { ahAPCommon 2 }
ahAPMRP OBJECT IDENTIFIER ::= { ahAPCommon 3 }
ahAPIDP OBJECT IDENTIFIER ::= { ahAPCommon 4 }

ahAPHiveAP020_ag OBJECT IDENTIFIER ::= { ahAP 2 }
ahAPHiveAP028_ag OBJECT IDENTIFIER ::= { ahAP 3 }
ahAPHiveAP320_n OBJECT IDENTIFIER ::= { ahAP 4 }
ahAPHiveAP340_n OBJECT IDENTIFIER ::= { ahAP 5 }
ahAPHiveAP020-ag OBJECT IDENTIFIER ::= { ahAP 2 }
ahAPHiveAP028-ag OBJECT IDENTIFIER ::= { ahAP 3 }
ahAPHiveAP320-n OBJECT IDENTIFIER ::= { ahAP 4 }
ahAPHiveAP340-n OBJECT IDENTIFIER ::= { ahAP 5 }

AhString ::= TEXTUAL-CONVENTION
STATUS current
Expand Down
Loading

0 comments on commit cfa9dd3

Please sign in to comment.