diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index 31f417edd..667ae782b 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -240,6 +240,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 = 'cumulus'; +$config['os'][$os]['type'] = 'network'; +$config['os'][$os]['group'] = 'unix'; +$config['os'][$os]['text'] = 'Cumulus Linux'; +//$config['os'][$os]['icon'] = 'cumulus'; +$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'; $config['os'][$os]['type'] = 'server'; diff --git a/includes/discovery/os/linux.inc.php b/includes/discovery/os/linux.inc.php index 3ae2e3e6d..f74722d92 100644 --- a/includes/discovery/os/linux.inc.php +++ b/includes/discovery/os/linux.inc.php @@ -64,6 +64,9 @@ if (!$os) { ); register_mibs($device, $pktj_mibs, "include/discovery/os/linux.inc.php"); } + else if (stristr($sysObjectId, 'cumulusMib') || strstr($sysObjectId, '.1.3.6.1.4.1.40310')) { + $os = 'cumulus'; + } else { // Check for Synology DSM $hrSystemInitialLoadParameters = trim(snmp_get($device, 'HOST-RESOURCES-MIB::hrSystemInitialLoadParameters.0', '-Osqnv')); diff --git a/includes/discovery/sensors/fanspeeds/lmsensors.inc.php b/includes/discovery/sensors/fanspeeds/lmsensors.inc.php index 5396eeccb..3127970f3 100644 --- a/includes/discovery/sensors/fanspeeds/lmsensors.inc.php +++ b/includes/discovery/sensors/fanspeeds/lmsensors.inc.php @@ -1,7 +1,7 @@