Merge branch 'master' into avtech

This commit is contained in:
Tony Murray
2016-02-17 11:55:08 -06:00
101 changed files with 6547 additions and 1476 deletions

View File

@@ -311,6 +311,23 @@ $config['os'][$os]['icon'] = 'barracuda';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Traffic';
$os = 'barracudaspamfirewall';
$config['os'][$os]['text'] = 'Barracuda Spam Firewall';
$config['os'][$os]['type'] = 'firewall';
$config['os'][$os]['icon'] = 'barracuda';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Traffic';
// Calix
$os = 'calix';
$config['os'][$os]['text'] = 'Calix E7';
$config['os'][$os]['type'] = 'network';
$config['os'][$os]['ifname'] = 1;
$config['os'][$os]['empty_ifdescr'] = 1;
$config['os'][$os]['icon'] = 'calix';
$config['os'][$os]['over'][0]['graph'] = 'device_bits';
$config['os'][$os]['over'][0]['text'] = 'Device Traffic';
// Cisco OSes
$os = 'ios';
$config['os'][$os]['group'] = 'cisco';