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

newdevice: Added memory detection, fixed cpu polling (#6896)

Browse Source 
* newdevice: Added memory detection, fixed cpu polling

* Added new line

* Fix temperature entPhysicalIndex too

* Edited the wrong spot :0
This commit is contained in:
Neil Lathwood
2017-06-28 06:54:14 +01:00
committed by Tony Murray
parent 8b806a857a
commit b8d8d79a0a
4 changed files with 79 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
includes/discovery/mempools/comware.inc.php Normal file
View File

@@ -0,0 +1,44 @@
<?php
/**
* comware.inc.php
*
* LibreNMS mempools discovery module for Comware
*
* 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 2017 Neil Lathwood
* @author Neil Lathwood <gh+n@laf.io>
*/
if ($device['os'] === 'comware') {
echo 'hh3cEntityExtMemUsage: ';
$entphydata = dbFetchRows("SELECT `entPhysicalIndex`, `entPhysicalClass`, `entPhysicalName` FROM `entPhysical` WHERE `device_id` = ? AND `entPhysicalClass` = 'module' ORDER BY `entPhysicalIndex`", array($device['device_id']));
if ($entphydata) {
$comware_mem = snmpwalk_cache_oid($device, 'hh3cEntityExtMemUsage', null, 'HH3C-ENTITY-EXT-MIB');
foreach ($entphydata as $index) {
if (is_numeric($comware_mem[$index['entPhysicalIndex']]['hh3cEntityExtMemUsage']) && is_numeric($index['entPhysicalIndex']) && $comware_mem[$index['entPhysicalIndex']]['hh3cEntityExtMemUsage'] > 0) {
discover_mempool($valid_mempool, $device, $index['entPhysicalIndex'], 'comware', $index['entPhysicalName'], '1', null, null);
}
}
}
unset(
$entphydata,
$comware_mem
);
}

8
includes/discovery/processors/comware.inc.php
View File

@@ -14,9 +14,9 @@
if ($device['os'] == 'comware') {
echo 'HPE Comware ';
$entity_data = snmpwalk_cache_oid($device, 'entPhysicalName', array(), 'ENTITY-MIB');
$entity_data = snmpwalk_cache_oid($device, 'entPhysicalClass', array(), 'ENTITY-MIB');
$indexes = array_keys(array_filter($entity_data, function ($entry) {
return $entry['entPhysicalName'] == 'Board';
return $entry['entPhysicalClass'] == 'module';
}));
if (!empty($indexes)) {
@@ -27,7 +27,9 @@ if ($device['os'] == 'comware') {
$cur_oid = ".1.3.6.1.4.1.25506.2.6.1.1.1.1.6.$entIndex";
$cur_value = $procdata[$entIndex]['hh3cEntityExtCpuUsage'];
$descr = 'Slot ' . ++$i;
discover_processor($valid['processor'], $device, $cur_oid, $entIndex, 'comware', $descr, '1', $cur_value);
if ($cur_value > 0) {
discover_processor($valid['processor'], $device, $cur_oid, $entIndex, 'comware', $descr, '1', $cur_value);
}
}
}
}

2
includes/discovery/sensors/temperature/comware.inc.php
View File

@@ -37,7 +37,7 @@ if (!empty($entphydata)) {
null,
$value['hh3cEntityExtTemperature'],
'snmp',
$index
$index['entPhysicalIndex']
);
}
}

29
includes/polling/mempools/comware.inc.php Normal file
View File

@@ -0,0 +1,29 @@
<?php
/**
* comware.inc.php
*
* LibreNMS mempools poller module for Comware
*
* 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 2017 Neil Lathwood
* @author Neil Lathwood <gh+n@laf.io>
*/
$usage = snmp_get($device, "hh3cEntityExtMemUsage.{$mempool['mempool_index']}", '-Ovq', 'HH3C-ENTITY-EXT-MIB');
$mempool['total'] = 100;
$mempool['used'] = $usage;
$mempool['free'] = ($mempool['total'] - $mempool['used']);