Merge pull request #2616 from laf/issue-2569

Moved memory graphs for vmware to mempool polling
This commit is contained in:
Daniel Preussker
2015-12-13 18:59:14 +00:00
2 changed files with 11 additions and 0 deletions
@@ -31,6 +31,10 @@ if (is_array($storage_array)) {
break;
}
if ($device['os'] == 'vmware' && $descr == 'Real Memory') {
$deny = 0;
}
if ($device['os'] == 'routeros' && $descr == 'main memory') {
$deny = 0;
}
@@ -33,6 +33,13 @@ if (is_array($hrstorage_array)) {
break;
}
if ($device['os'] == 'vmware' && $descr == 'Real Memory') {
$old_rrdfile = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('storage-hrstorage-'.safename($descr).'.rrd');
$new_rrdfile = $config['rrd_dir'].'/'.$device['hostname'].'/'.safename('mempool-hrstorage-'.$storage['hrStorageIndex'].'.rrd');
rename($old_rrdfile, $new_rrdfile);
$deny = 1;
}
foreach ($config['ignore_mount'] as $bi) {
if ($bi == $descr) {
$deny = 1;