Merge branch 'master' of github.com:laf/librenms into issue-803

This commit is contained in:
laf
2015-04-22 10:52:58 +01:00
81 changed files with 22897 additions and 1907 deletions
+17
View File
@@ -140,6 +140,18 @@ $config['os'][$os]['over'][1]['text'] = "Processor Usage";
$config['os'][$os]['over'][2]['graph'] = "device_mempool";
$config['os'][$os]['over'][2]['text'] = "Memory Usage";
$os = "procera";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['group'] = "unix";
$config['os'][$os]['text'] = "Procera Networks";
$config['os'][$os]['icon'] = "linux";
$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'] = "Processor Usage";
$config['os'][$os]['over'][2]['graph'] = "device_mempool";
$config['os'][$os]['over'][2]['text'] = "Memory Usage";
// Other Unix-based OSes here please.
$os = "freebsd";
@@ -1054,6 +1066,11 @@ $config['os'][$os]['text'] = "Cambium";
$config['os'][$os]['type'] = "wireless";
$config['os'][$os]['icon'] = "cambium";
$os = "datacom";
$config['os'][$os]['text'] = "Datacom";
$config['os'][$os]['type'] = "network";
$config['os'][$os]['icon'] = "datacom";
foreach ($config['os'] as $this_os => $blah)
{
if (isset($config['os'][$this_os]['group']))