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

1.revise monshow to show data for nodes whose nodetype is osi; 2. change output of monshow -s from node-sum to node-summary

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3763 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ellen56 2009-07-13 03:05:10 +00:00
parent a896e7ed17
commit bd0d87a2c6
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xCAT-rmc/plugin/rmcmon.pm
View File

@ -1580,6 +1580,7 @@ sub show {
print "rmcmon:show called\n";
no strict 'refs';
my ($noderef, $sum, $time, $attrs, $pe, $callback) = @_;
my @monnodes = ();
my $rsp = {};
my $localhostname=hostname();
my $start_time = undef;
@ -1596,17 +1597,24 @@ sub show {
$start_time = $end_time - $time * 60;
}
foreach $node (@$noderef){
my $table = xCAT::Table->new('nodetype');
my $entry = $table->getNodeAttribs($node, ['nodetype']);
if($entry && ($entry->{nodetype} =~ /$::NODETYPE_OSI/)){
push @monnodes, $node;
}
}
#the identification of this node
my $isSV=xCAT::Utils->isServiceNode();
if(!$isSV && ($sum&0x2)){
push @$noderef, $localhostname;
push @monnodes, $localhostname;
}
print "$localhostname: @$noderef\n";
$sum &= 0x1;
if($sum){
foreach $node (@$noderef){
foreach $node (@monnodes){
if($node eq $localhostname){
$rrddir = "/var/rrd/cluster";
my @metrixconf = xCAT_monitoring::rmcmetrix::get_metrix_conf();
@ -1626,11 +1634,11 @@ sub show {
$rrddir = "/var/rrd/$node";
}
$output = &showmetrix($rrddir, $attrs, $start_time, $end_time);
push @{$rsp->{data}}, "\n$node-sum:";
push @{$rsp->{data}}, "\n$node-summary:";
push @{$rsp->{data}}, @$output;
}
} else {
foreach $node (@$noderef){
foreach $node (@monnodes){
$rrddir = "/var/rrd/$node";
$output = &showmetrix($rrddir, $attrs, $start_time, $end_time);
push @{$rsp->{data}}, "\n$node:";