device_processor_stacked type for unix devices (where all CPUs share the same domain, not useful on network hardware where different CPUs do different jobs) Also we need inherit properties to $config['os'] from $config['os_group'], where they are not already set in $config['os']. Also updog.

git-svn-id: http://www.observium.org/svn/observer/trunk@2138 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-04-22 14:59:10 +00:00
parent 2319c8a738
commit dcaba87853
6 changed files with 109 additions and 24 deletions
+19
View File
@@ -18,6 +18,11 @@ $config['os']['default']['over'][0]['text'] = "Processor Usage";
$config['os']['default']['over'][1]['graph'] = "device_mempool";
$config['os']['default']['over'][1]['text'] = "Memory Usage";
$os_group = "unix";
$config['os_group'][$os_group]['type'] = "server";
$config['os_group'][$os_group]['processor_stacked'] = 1;
$os = "generic";
$config['os'][$os]['text'] = "Generic Device";
@@ -697,6 +702,20 @@ $config['os'][$os]['over'][0]['graph'] = "device_current";
$config['os'][$os]['over'][0]['text'] = "Current";
$config['os'][$os]['icon'] = "tripplite";
foreach($config['os'] as $this_os => $blah)
{
$this_os_group = $config['os'][$this_os]['group'];
if(isset($config['os'][$this_os]['group']) && isset($config['os_group'][$this_os_group]))
{
foreach ($config['os_group'][$this_os_group] as $property => $value)
{
if(!isset($config['os'][$this_os][$property]))
{
$config['os'][$this_os][$property] = $value;
}
}
}
}
$device_types = array('server', 'network', 'firewall', 'workstation', 'printer', 'power', 'environment');