clones/librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-09-22 02:48:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug where mempool >2GB was broken. (i blame sid3windr for this, he was probably distracting me with talk of printers or something)

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@1047 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong 2010-03-26 18:30:27 +00:00
parent 6d881f3a23
commit 152dc52b4e
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database-update.sql
View File

@ -4,4 +4,4 @@ ALTER TABLE `processors` CHANGE `processor_descr` `processor_descr` VARCHAR(
DROP TABLE `cempMemPool`;
DROP TABLE `cpmCPU`;
DROP TABLE `cmpMemPool`;
ALTER TABLE `mempools` CHANGE `mempool_used` `mempool_used` INT( 16 ) NOT NULL ,CHANGE `mempool_free` `mempool_free` INT( 16 ) NOT NULL ,CHANGE `mempool_total` `mempool_total` INT( 16 ) NOT NULL ,CHANGE `mempool_largestfree` `mempool_largestfree` INT( 16 ) NULL DEFAULT NULL ,CHANGE `mempool_lowestfree` `mempool_lowestfree` INT( 16 ) NULL DEFAULT NULL ;
ALTER TABLE `mempools` CHANGE `mempool_used` `mempool_used` BIGINT( 16 ) NOT NULL ,CHANGE `mempool_free` `mempool_free` BIGINT( 16 ) NOT NULL ,CHANGE `mempool_total` `mempool_total` BIGINT( 16 ) NOT NULL ,CHANGE `mempool_largestfree` `mempool_largestfree` BIGINT( 16 ) NULL DEFAULT NULL ,CHANGE `mempool_lowestfree` `mempool_lowestfree` BIGINT( 16 ) NULL DEFAULT NULL ;

4
includes/discovery/functions.inc.php
View File

@ -127,7 +127,9 @@ function discover_mempool(&$valid_mempool, $device, $index, $type, $descr, $prec
{
echo(".");
# entry = mysql_fetch_assoc(mysql_query());
$query = "UPDATE `mempools` SET `mempool_descr` = '".$descr."', `entPhysicalIndex` = '$entPhysicalIndex', `hrDeviceIndex` = '$hrDeviceIndex' WHERE `device_id` = '".$device['device_id']."' AND `mempool_index` = '".$index."' AND `mempool_type` = '".$type."'";
$query = "UPDATE `mempools` SET `mempool_descr` = '".$descr."', `entPhysicalIndex` = '".$entPhysicalIndex."'"'
$query .= ", `hrDeviceIndex` = '$hrDeviceIndex' ";
$query .= "WHERE `device_id` = '".$device['device_id']."' AND `mempool_index` = '".$index."' AND `mempool_type` = '".$type."'";
mysql_query($query);
if($debug) { print $query . "\n"; }
}

3
includes/polling/mempools.inc.php
View File

@ -42,7 +42,8 @@ while($mempool = mysql_fetch_array($mempool_data)) {
rrdtool_update($mempoolrrd,"N:".$mempool['used'].":".$mempool['free']);
$update_query = "UPDATE `mempools` SET `mempool_used` = '".$mempool['used']."'";
$update_query .= ", `mempool_free` = '".$mempool['free']."', `mempool_total` = '".$mempool['total']."'";
$update_query .= ", `mempool_free` = '".$mempool['free']."'";
$update_query .= ", `mempool_total` = '".$mempool['total']."'";
$update_query .= ", `mempool_largestfree` = '".$mempool['largestfree']."'";
$update_query .= ", `mempool_lowestfree` = '".$mempool['lowestfree']."'";
$update_query .= " WHERE `mempool_id` = '".$mempool['mempool_id']."'";