fixes to memory and CPU graphs on IOS. adding mixed colourscheme to static-config

git-svn-id: http://www.observium.org/svn/observer/trunk@523 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2009-11-16 20:00:13 +00:00
parent 69fbf41b85
commit e848814a19
3 changed files with 7 additions and 38 deletions

View File

@@ -39,6 +39,10 @@ if(!$config['graph_colours']['purples']) {
if(!$config['graph_colours']['default']) {
$config['graph_colours']['default'] = $config['graph_colours']['blues'];
}
if(!$config['graph_colours']['mixed']) {
$config['graph_colours']['mixed'] = array("CC0000", "008C00", "4096EE", "73880A", "D01F3C", "36393D", "FF0084");
}
##############################
# No changes below this line #
@@ -74,36 +78,4 @@ $week = time() - (7 * 24 * 60 * 60);
$month = time() - (31 * 24 * 60 * 60);
$year = time() - (365 * 24 * 60 * 60);
### Update Database between 0.6.0 and 0.6.1 (slight slowdown)
$exists = false;
$columns = @mysql_query("SHOW columns FROM `interfaces`");
while($c = @mysql_fetch_assoc($columns)){
if($c['Field'] == "pagpOperationMode"){
$db_pagp = true;
}
if($c['Field'] == "portName"){
$db_portName = true;
}
if($c['Field'] == "ifHighSpeed"){
$db_ifHighSpeed = true;
}
}
if(!$db_pagp) {
mysql_query("ALTER TABLE `interfaces` ADD `pagpOperationMode` VARCHAR( 32 ) NULL ,
ADD `pagpPortState` VARCHAR( 16 ) NULL ,
ADD `pagpPartnerDeviceId` VARCHAR( 48 ) NULL ,
ADD `pagpPartnerLearnMethod` VARCHAR( 16 ) NULL ,
ADD `pagpPartnerIfIndex` INT NULL ,
ADD `pagpPartnerGroupIfIndex` INT NULL ,
ADD `pagpPartnerDeviceName` VARCHAR( 128 ) NULL ,
ADD `pagpEthcOperationMode` VARCHAR( 16 ) NULL ,
ADD `pagpDeviceId` VARCHAR( 48 ) NULL ,
ADD `pagpGroupIfIndex` INT NULL"); }
if(!$db_portName) { mysql_query("ALTER TABLE `interfaces` ADD `portName` VARCHAR( 128 ) NULL DEFAULT NULL AFTER `ifName`"); }
if(!$db_ifHighSpeed) { mysql_query("ALTER TABLE `interfaces` ADD `ifHighSpeed` INT ( 11 ) NULL DEFAULT NULL AFTER `ifSpeed`"); }
?>