mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert change changing mempool/storage format

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@3091 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2012-04-26 16:15:11 +00:00
parent 77d055f9d6
commit 22dad0dae4
11 changed files with 144 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
includes/polling/storage.inc.php
View File

@@ -6,11 +6,11 @@ foreach (dbFetchRows("SELECT * FROM storage WHERE device_id = ?", array($device[
{
echo("Storage ".$storage['storage_descr'] . ": ");
$storage_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storageX-" . $storage['storage_mib'] . "-" . safename($storage['storage_descr']) . ".rrd");
$storage_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("storage-" . $storage['storage_mib'] . "-" . safename($storage['storage_descr']) . ".rrd");
if (!is_file($storage_rrd))
{
rrdtool_create($storage_rrd, "--step 300 DS:used:GAUGE:600:0:U DS:free:GAUGE:600:0:U DS:size:GAUGE:600:0:U DS:perc:GAUGE:600:0:100 ".$config['rrd_rra']);
rrdtool_create($storage_rrd, "--step 300 DS:used:GAUGE:600:0:U DS:free:GAUGE:600:0:U ".$config['rrd_rra']);
}
$file = $config['install_dir']."/includes/polling/storage-".$storage['storage_mib'].".inc.php";
@@ -34,7 +34,7 @@ foreach (dbFetchRows("SELECT * FROM storage WHERE device_id = ?", array($device[
echo($percent."% ");
rrdtool_update($storage_rrd,"N:".$storage['used'].":".$storage['free'].":".$storage['size'].":".$percent);
rrdtool_update($storage_rrd,"N:".$storage['used'].":".$storage['free']);
$update = dbUpdate(array('storage_used' => $storage['used'], 'storage_free' => $storage['free'], 'storage_size' => $storage['size'], 'storage_units' => $storage['units'], 'storage_perc' => $percent),
'storage', '`storage_id` = ?', array($storage['storage_id']));