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

Merge branch 'master' of https://github.com:/wiad/librenms into issue-2708

Browse Source 
Conflicts:
	includes/definitions.inc.php
This commit is contained in:
wiad
2016-01-19 09:51:03 +01:00
parent 1a8472258b ded1fa3e73
commit 086443b77a
9 changed files with 716 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
includes/definitions.inc.php
View File

@@ -1440,11 +1440,26 @@ $config['os'][$os]['over'][1]['text'] = 'CPU Usage';
$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
$config['os'][$os]['over'][2]['text'] = 'Memory Usage';
<<<<<<< HEAD
$os = 'nios';
$config['os'][$os]['text'] = 'Infoblox';
$config['os'][$os]['type'] = 'appliance';
$config['os'][$os]['icon'] = 'infoblox';
=======
// Lenovo EMC (NAS)
$os = 'lenovoemc';
$config['os'][$os]['type'] = 'storage';
$config['os'][$os]['group'] = 'storage';
$config['os'][$os]['text'] = 'LenovoEMC';
$config['os'][$os]['icon'] = 'lenovo';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Device Traffic';
$config['os'][$os]['over'][1]['graph'] = 'device_processor';
$config['os'][$os]['over'][1]['text'] = 'CPU Usage';
$config['os'][$os]['over'][2]['graph'] = 'device_mempool';
$config['os'][$os]['over'][2]['text'] = 'Memory Usage';
>>>>>>> ded1fa3e73bcd99f03259cc449e8cd816664a158
// Graph Types
require_once $config['install_dir'].'/includes/load_db_graph_types.inc.php';