arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

support the latest ganglia output

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11805 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
xq2005 2012-03-09 11:07:59 +00:00
parent 0361e95683
commit 7fcd6c03b1
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xCAT-UI/xcat/plugins/web.pm
View File

@ -703,17 +703,20 @@ sub web_gangliaShow{
my $cpunum = 0;
for($index = 0; $index < $size; $index += $step){
if ($runInfo->[$index] =~ /^(\S+): (\S+) (\S+)/){
if (($2 eq 'NaNQ') || ($2 eq 'nan')){
my $timestamp = $1;
my $value = $2;
my $valuenum = $3;
if ((lc($value) =~ /nanq/) || (lc($value) =~ /nan/)){
#the rrdtool fetch last outline line always nan, so no need to add into return string
if ($index == ($size - 1)){
next;
}
$temp .= $1 . ',0,';
$temp .= $timestamp . ',0,';
}
else{
$cpuidle = sprintf "%.2f", $2;
$cpunum = sprintf "%.2f", $3;
$temp .= $1 . ',' . (sprintf "%.2f", $cpuidle/$cpunum) . ',';
$cpuidle = sprintf "%.2f", $value;
$cpunum = sprintf "%.2f", $valuenum;
$temp .= $timestamp . ',' . (sprintf "%.2f", $cpuidle/$cpunum) . ',';
}
}
}
@ -721,15 +724,17 @@ sub web_gangliaShow{
else{
for($index = 0; $index < $size; $index += $step){
if ($runInfo->[$index] =~ /^(\S+): (\S+).*/){
if (($2 eq 'NaNQ') || ($2 eq 'nan')){
my $timestamp = $1;
my $value = $2;
if ((lc($value) =~ /nanq/) || (lc($value) =~ /nan/)){
#the rrdtool fetch last outline line always nan, so no need to add into return string
if ($index == ($size - 1)){
next;
}
$temp .= $1 . ',0,';
$temp .= $timestamp . ',0,';
}
else{
$temp .= $1 . ',' . (sprintf "%.2f", $2) . ',';
$temp .= $timestamp . ',' . (sprintf "%.2f", $2) . ',';
}
}
}
@ -1061,7 +1066,7 @@ sub web_rmcmonShow() {
next;
}
if ($temp =~ /[NaNQ|nan]/){
if (lc($temp) =~ /[nanq|nan]/){
next;
}