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

monitoring code cleanup and logging error to syslog

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@853 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2008-03-20 15:54:51 +00:00
parent bdf7d0f41c
commit 64a797479a
5 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ use Socket;
use xCAT::Utils;
use xCAT::GlobalDef;
use xCAT_monitoring::monitorctrl;
use xCAT::MsgUtils;
#print "xCAT_monitoring::rmcmon loaded\n";
1;
@ -51,7 +52,7 @@ use xCAT_monitoring::monitorctrl;
=cut
#--------------------------------------------------------------------------------
sub start {
print "rmcmon::start called\n";
#print "rmcmon::start called\n";
my $noderef=xCAT_monitoring::monitorctrl->getMonHierarchy();
@ -76,7 +77,7 @@ sub start {
$result=`/usr/bin/lsrsrc-api -s IBM.MngNode::::Name 2>&1`;
if ($?) {
if ($result !~ /2612-023/) {#2612-023 no resources found error
print "$result\n";
xCAT::MsgUtils->message('S', "[mon]: $result\n");
return (1,$result);
}
$result='';
@ -115,24 +116,24 @@ sub start {
my $active_nodes=$nodes_status{$::STATUS_ACTIVE};
my $inactive_nodes=$nodes_status{$::STATUS_INACTIVE};
if (@$inactive_nodes>0) {
print "The following nodes cannot be added to the RMC cluster because they are inactive:\n @$inactive_nodes\n"
xCAT::MsgUtils->message('S', "[mon]: The following nodes cannot be added to the RMC cluster because they are inactive:\n @$inactive_nodes\n");
}
if (@$active_nodes>0) {
print "active nodes to add:\n @$active_nodes\n";
#print "active nodes to add:\n @$active_nodes\n";
addNodes_noChecking(@$active_nodes);
}
}
#remove unwanted nodes to the RMC cluster
if (@nodes_to_remove>0) {
print "nodes to remove @nodes_to_remove\n";
#print "nodes to remove @nodes_to_remove\n";
removeNodes_noChecking(@nodes_to_remove);
}
#start condition-response assosciations
my $result=`$::XCATROOT/sbin/rmcmon/mkrmcresources $::XCATROOT/lib/perl/xCAT_monitoring/rmc/resources/ms 2>&1`;
if ($?) {
print "Error when creating predefined resources on $localhostname:\n$result\n";
xCAT::MsgUtils->message('S', "[mon]: Error when creating predefined resources on $localhostname:\n$result\n");
}
return (0, "started");
@ -194,7 +195,7 @@ sub pingNodeStatus {
=cut
#--------------------------------------------------------------------------------
sub stop {
print "rmcmon::stop called\n";
#print "rmcmon::stop called\n";
#TODO: stop condition-response associtations.
return (0, "stopped");
@ -215,7 +216,7 @@ sub stop {
=cut
#--------------------------------------------------------------------------------
sub supportNodeStatusMon {
print "rmcmon::supportNodeStatusMon called\n";
#print "rmcmon::supportNodeStatusMon called\n";
return 1;
}
@ -236,7 +237,7 @@ sub supportNodeStatusMon {
=cut
#--------------------------------------------------------------------------------
sub startNodeStatusMon {
print "rmcmon::startNodeStatusMon called\n";
#print "rmcmon::startNodeStatusMon called\n";
return (0, "started");
}
@ -254,7 +255,7 @@ sub startNodeStatusMon {
=cut
#--------------------------------------------------------------------------------
sub stopNodeStatusMon {
print "rmcmon::stopNodeStatusMon called\n";
#print "rmcmon::stopNodeStatusMon called\n";
return (0, "stopped");
}
@ -294,7 +295,7 @@ sub addNodes {
#check if the node has already defined
$result=`lsrsrc-api -s IBM.MngNode::"Name=\\\"\"$node\\\"\"" 2>&1`;
if (($?) && ($result !~ /2612-023/)) { #2612-023 no resources found error
print "$result\n";
xCAT::MsgUtils->message('S', "[mon]: $result\n");
next;
}
@ -302,7 +303,7 @@ sub addNodes {
if ($ms_host_name ne $node) {
`fping -a $node 2> /dev/null`;
if ($?) {
print "Cannot add the node $node into the RMC domian. The node is inactive.\n";
xCAT::MsgUtils->message('S', "[mon]: Cannot add the node $node into the RMC domian. The node is inactive.\n");
next;
}
}
@ -366,11 +367,11 @@ sub addNodes_noChecking {
} else {
$mn_node_id=`$::XCATROOT/bin/psh --nonodecheck $node /usr/sbin/rsct/bin/lsnodeid 2>&1`;
if ($?) {
print "Cannot get NodeID for $node. $mn_node_id\n";
xCAT::MsgUtils->message('S', "[mon]: Cannot get NodeID for $node. $mn_node_id\n");
next;
}
if ($mn_node_id =~ s/.*([0-9 a-g]{16}).*/$1/s) {;}
else { print "No node id found for $node:\n$mn_node_id\n"; next;}
else { xCAT::MsgUtils->message('S', "[mon]: No node id found for $node:\n$mn_node_id\n"); next;}
}
my ($mn_name,$mn_aliases,$mn_addrtype,$mn_length,@mn_addrs) = gethostbyname($node);
@ -386,7 +387,7 @@ sub addNodes_noChecking {
# define resource in IBM.MngNode class on server
$result=`mkrsrc-api IBM.MngNode::Name::"$node"::KeyToken::"$node"::IPAddresses::"$mn_ipaddresses"::NodeID::0x$mn_node_id 2>&1`;
if ($?) {
print "define resource in IBM.MngNode class result=$result\n";
xCAT::MsgUtils->message('S', "[mon]: define resource in IBM.MngNode class result=$result\n");
next;
}
@ -394,19 +395,19 @@ sub addNodes_noChecking {
if($ms_host_name eq $node) {
$result=`/usr/bin/mkrsrc-api IBM.MCP::MNName::"$node"::KeyToken::"$ms_host_name"::IPAddresses::"$ms_ipaddresses"::NodeID::0x$ms_node_id`;
if ($?) {
print "$result\n";
xCAT::MsgUtils->message('S', "[mon]: $result\n");
next;
}
} else {
$result=`scp $::XCATROOT/sbin/rmcmon/configrmcnode $node:/tmp 2>&1`;
if ($?) {
print "rmcmon:addNodes: cannot copy the file configrmcnode to node $node\n";
xCAT::MsgUtils->message('S', "[mon]: rmcmon:addNodes: cannot copy the file configrmcnode to node $node\n");
next;
}
$result=`$::XCATROOT/bin/psh --nonodecheck $node /tmp/configrmcnode -a $node $ms_host_name $ms_ipaddresses 0x$ms_node_id 2>&1`;
if ($?) {
print "$result\n";
xCAT::MsgUtils->message('S', "[mon]: $result\n");
}
}
}
@ -482,7 +483,7 @@ sub removeNodes_noChecking {
if ($result =~ m/2612-023/) { #resource not found
next;
}
print "Remove resource in IBM.MngNode class result=$result\n";
xCAT::MsgUtils->message('S', "[mon]: Remove resource in IBM.MngNode class result=$result\n");
}
# TODO: check all the nodes together or use the 'status' value
@ -497,19 +498,19 @@ sub removeNodes_noChecking {
if ($ms_host_name eq $node) {
$result= `/usr/bin/rmrsrc-api -s IBM.MCP::"MNName=\\\"\"$node\\\"\"" 2>&1`;
if ($?) {
print "$result\n";
xCAT::MsgUtils->message('S', "[mon]: $result\n");
}
} else {
#copy the configuration script and run it locally
$result=`scp $::XCATROOT/sbin/rmcmon/configrmcnode $node:/tmp 2>&1 `;
if ($?) {
print "rmcmon:removeNodes: cannot copy the file configrmcnode to node $node\n";
xCAT::MsgUtils->message('S', "[mon]: rmcmon:removeNodes: cannot copy the file configrmcnode to node $node\n");
next;
}
$result=`$::XCATROOT/bin/psh --nonodecheck $node /tmp/configrmcnode -d $node 2>&1`;
if ($?) {
print "$result\n";
xCAT::MsgUtils->message('S', "[mon]: $result\n");
}
}
}

14
xCAT-server-2.0/lib/xcat/monitoring/monitorctrl.pm
View File

@ -25,6 +25,7 @@ use xCAT_monitoring::montbhandler;
$NODESTAT_MON_NAME;
$masterpid;
1;
#-------------------------------------------------------------------------------
@ -88,11 +89,11 @@ sub start {
my @ret2 = startNodeStatusMonitoring($NODESTAT_MON_NAME);
$ret{"Node status monitoring with $NODESTAT_MON_NAME"}=\@ret2;
}
# TODO: somehow, we should log the return status here
if (%ret) {
foreach(keys(%ret)) {
my $retstat=$ret{$_};
print "$_: @$retstat\n";
xCAT::MsgUtils->message('S', "[mon]: $_: @$retstat\n");
#print "$_: @$retstat\n";
}
}
@ -236,10 +237,10 @@ sub handleMonSignal {
#setup the signal again
$SIG{USR2}=\&handleMonSignal;
#TODO: log status
#log status
foreach(keys(%ret)) {
my $retstat=$ret{$_};
print "$_: @$retstat\n";
xCAT::MsgUtils->message('S', "[mon]: $_: @$retstat\n");
}
}
@ -297,7 +298,8 @@ sub stop {
if (%ret) {
foreach(keys(%ret)) {
$retstat=$ret{$_};
print "$_: @$retstat\n";
xCAT::MsgUtils->message('S',"[mon]: $_: @$retstat\n");
# print "$_: @$retstat\n";
}
}
@ -827,7 +829,7 @@ sub refreshProductList {
#load the module in memory
eval {require($file_name)};
if ($@) {
print "The file $file_name cannot be located or has compiling errors.\n";
xCAT::MsgUtils->message('S', "[mon]: The file $file_name cannot be located or has compiling errors.\n");
}
else {
my @a=($file_name, $module_name);

5
xCAT-server-2.0/lib/xcat/monitoring/snmpmon.pm
View File

@ -8,6 +8,7 @@ BEGIN
use lib "$::XCATROOT/lib/perl";
use IO::File;
use xCAT::Utils;
use xCAT::MsgUtils;
#print "xCAT_monitoring::snmpmon loaded\n";
@ -135,7 +136,7 @@ sub configBMC {
if ($action==0) {$actionstring="dis";}
my $result = `XCATBYPASS=Y rspconfig $noderange alert=$actionstring 2>&1`;
if ($?) {
print "Changeing SNMP PEF policy for $noderange:\n $result\n";
xCAT::MsgUtils->message('S', "[mon]: Changeing SNMP PEF policy for $noderange:\n $result\n");
}
#setup the snmp destination
@ -146,7 +147,7 @@ sub configBMC {
my $nr2=join(',', @$ref2);
my $result2 = `XCATBYPASS=Y rspconfig $nr2 snmpdest=$_ 2>&1`;
if ($?) {
print "Changing SNMP destination for $nr2:\n $result2\n";
xCAT::MsgUtils->message('S', "[mon]: Changing SNMP destination for $nr2:\n $result2\n");
}
}
}

2
xCAT-server-2.0/lib/xcat/plugins/monctrlcmds.pm
View File

@ -274,7 +274,7 @@ sub startmon {
my $mon_hierachy=xCAT_monitoring::monitorctrl->getMonHierarchy();
my @mon_servers=keys(%$mon_hierachy);
my @hostinfo=xCAT::Utils->determinehostname();
print "hostinfo=@hostinfo\n";
#print "hostinfo=@hostinfo\n";
%iphash=();
foreach(@hostinfo) {$iphash{$_}=1;}
foreach (@mon_servers) {

11
xCAT-server-2.0/sbin/xcat_traphandler
View File

@ -68,7 +68,7 @@ $value=join(' ', @a);
$message .= " $oid=$value\n";
checkWithOid($oid, $value);
#print "I=$IGNORE,E=$EMAIL, L=$LOG, R=$RUNCMD\n";
if ($IGNORE) { print "out\n"; exit 0;}
if ($IGNORE) { exit 0;}
#for ipmi traps, the values is: SNMPv2-SMI::enterprises.3183.1.1.0.x, x is the ipmi trap id.
$value =~ s/(SNMPv2-SMI::enterprises\.3183\.1\.1\.0\.)//g;
@ -228,19 +228,18 @@ while ($temp=<STDIN>) {
$value =~ s/\"//g;
checkWithOid($oid, $value);
#print "I=$IGNORE,E=$EMAIL, L=$LOG, R=$RUNCMD\n";
if ($IGNORE) { print "out\n"; exit 0;}
if ($IGNORE) { exit 0;}
}
if (!$severity_type) { $severity_type="Warning"; }
if ((!$IGNORE) && exists($hashI{$severity_type})) { print "out\n"; exit 0; }
if ((!$IGNORE) && exists($hashI{$severity_type})) { exit 0; }
if ((!$EMAIL) && exists($hashE{$severity_type})) { $EMAIL=1; }
if ((!$LOG) && exists($hashL{$severity_type})) { $LOG=1; }
if ((!$RUNCMD) && exists($hashR{severity_type})) { $RUNCMD=1; }
#print "I=$IGNORE,E=$EMAIL, L=$LOG, R=$RUNCMD\n";
#email 'alerts' aliase
if ($EMAIL || ((keys(%hashE)==0) && ($severity_type =~/Critical|Warning/))) {
print "email\n";
if ($EMAIL || ((keys(%hashE)==0) && ($severity_type =~/Critical|Warning/))) {
#($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)=localtime(time);
#$datetime=sprintf "%2d-%02d-%04d %02d:%02d:%02d", $mon+1,$mday,$year+1900,$hour,$min,$sec;
#my $head="SNMP $severity received from $host($ip) on $datetime\n$briefmsg\n";
@ -259,7 +258,6 @@ if ($EMAIL || ((keys(%hashE)==0) && ($severity_type =~/Critical|Warning/))) {
#log to syslog if needed. default is log all
if ($LOG || (keys(%hashL)==0)) {
print "log\n";
my $head="SNMP $severity received from $host($ip).";
my $body;
if ($briefmsg) { $body=$briefmsg;}
@ -276,7 +274,6 @@ if ($LOG || (keys(%hashL)==0)) {
#run user defined commands if needed.
if ($RUNCMD) {
print "runcmd\n";
my $scripts=$settings{'cmds'};
while ($scripts =~ s/^([^,]+)(,)*//) {
my $cmd="echo \'host=$host\nip=$ip\n$message\n\' \| $1";