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/mempools.inc.php
View File

@@ -4,7 +4,7 @@ foreach (dbFetchRows("SELECT * FROM mempools WHERE device_id = ?", array($device
{
echo("Mempool ". $mempool['mempool_descr'] . ": ");
$mempool_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("mempoolX-" . $mempool['mempool_type'] . "-" . $mempool['mempool_index'] . ".rrd");
$mempool_rrd = $config['rrd_dir'] . "/" . $device['hostname'] . "/" . safename("mempool-" . $mempool['mempool_type'] . "-" . $mempool['mempool_index'] . ".rrd");
$file = $config['install_dir']."/includes/polling/mempools/".$mempool['mempool_type'].".inc.php";
if (is_file($file))
@@ -27,9 +27,9 @@ foreach (dbFetchRows("SELECT * FROM mempools WHERE device_id = ?", array($device
if (!is_file($mempool_rrd))
{
rrdtool_create($mempool_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($mempool_rrd, "--step 300 DS:used:GAUGE:600:0:U DS:free:GAUGE:600:0:U ".$config['rrd_rra']);
}
rrdtool_update($mempool_rrd,"N:".$mempool['used'].":".$mempool['free'].":".$mempool['total'].":".$percent);
rrdtool_update($mempool_rrd,"N:".$mempool['used'].":".$mempool['free']);
dbUpdate(array('mempool_used' => $mempool['used'], 'mempool_perc' => $percent, 'mempool_free' => $mempool['free'],
'mempool_total' => $mempool['total'], 'mempool_largestfree' => $mempool['largestfree'], 'mempool_lowestfree' => $mempool['lowestfree']),