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

rmc monitor show on gui

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9666 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
xq2005
2011-05-24 06:40:15 +00:00
parent 7921c1f468
commit 1e30c64599
1 changed files with 30 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
xCAT-server/lib/xcat/plugins/web.pm
View File

@@ -709,7 +709,7 @@ sub web_rmcmonShow() {
push( @{ $retHash->{node} }, { name => $node, data => 'OK' } );
}
else{
push( @{ $retHash->{node} }, { name => $node, data => 'NR' } );
push( @{ $retHash->{node} }, { name => $node, data => 'UNKNOWN' } );
}
}
@@ -717,43 +717,35 @@ sub web_rmcmonShow() {
return;
}
my $attrName = "";
my @attrValue = ();
$output = xCAT::Utils->runcmd( "monshow rmcmon $nodeRange -t 60 -o p -a " . $attr, -1, 1 );
foreach (@$output) {
$temp = $_;
if ( $temp =~ /\t/ ) {
$temp =~ s/\t/ /g;
chomp($temp);
}
#the attribute name
if ( $temp =~ m/\s+(Pct.*)\s+/ ) {
$temp = $1;
#the first one
if ( "" ne $attrName ) {
push(
@{ $retHash->{node} },
{ name => $attrName, data => join( ',', @attrValue ) }
);
$attrName = "";
@attrValue = ();
}
$attrName = $temp;
next;
}
#the content of the attribute
$temp =~ m/\s+(\d+\.\d{4})\s*$/;
if ( defined($1) ) {
push( @attrValue, $1 );
}
}
#push the last attribute name and values.
push( @{ $retHash->{node} }, { name => $attrName, data => join( ',', @attrValue ) } );
$callback->($retHash);
my $attrName = "";
my @attrs = split(/,/, $attr);
for $attrName (@attrs){
my @attrValue = ();
$output = xCAT::Utils->runcmd( "rrdtool fetch /var/rrd/${nodeRange}/${attrName}.rrd -r 60 -s e-1h AVERAGE", -1, 1 );
foreach(@$output){
$temp = $_;
if ($temp eq ''){
next;
}
if ($temp =~ /[NaNQ|nan]/){
next;
}
if ($temp =~ /^(\d+): (\S+) (\S+)/){
push( @attrValue, (sprintf "%.2f", $2));
}
}
if(scalar(@attrValue) > 1){
push(@{$retHash->{node}}, { name => $attrName, data => join( ',', @attrValue )});
}
else{
$retHash->{node}= { name => $attrName, data => ''};
last;
}
}
$callback->($retHash);
}
sub web_monls() {