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

bug fix for monitoring

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@729 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2008-03-07 21:01:14 +00:00
parent a230e3fce4
commit e9d4ef60ff
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ use IO::File;
use xCAT::Utils;
print "xCAT_monitoring::snmpmon loaded\n";
#print "xCAT_monitoring::snmpmon loaded\n";
1;
@ -346,6 +346,6 @@ sub getDescription {
For example, you can have the following setting:
email CRITICAL,BLADESPPALT-MIB::pTrapPriority=4
This means send email for all the critical events, or the BladeCenter
This means send email for all the critical events and the BladeCenter
system events.\n"
}

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

@ -10,6 +10,13 @@ use xCAT::Table;
use xCAT_plugin::ipmi;
use xCAT_monitoring::monitorctrl;
#-------------------------------------------------------------------------------
=head1 xcat_traphandler
=head2 Description
Script for SNMP trap handling.
=cut
#-------------------------------------------------------------------------------
# admin needs to create a mail aliase called alerts
# put "alerts: emailadd,emailaddr.." to /etc/aliases file
# then run newaliases command
@ -129,13 +136,21 @@ while ($temp=<STDIN>) {
elsif ($oid =~ /BLADESPPALT-MIB::spTrapPriority|RSASPPALT-MIB::ibmSpTrapPriority/) {
# Critical Alert(0), Major(1), Non-Critical Alert(2), System Alert(4),
# Recovery Alert(8), Informational Only Alert(255)
$severity_type="Warning";
if ($value==0) {
$severity="Critical Alert";
$severity_type="Critical";
} elsif ($value==1) {
$severity="Major Alert";
$severity_type="Critical";
} elsif ($value==2) {
$severity="Non-Critical Alert";
$severity_type="Warning";
} elsif ($value==4) {
$severity="System Alert";
$severity_type="Warning";
} elsif ($value==8) {
$severity="Recovery Alert";
$severity_type="Informational";
} elsif ($value==255) {
$severity="Informational Alert";
$severity_type="Informational";
@ -179,7 +194,7 @@ while ($temp=<STDIN>) {
$message .= " $oid=$value\n";
#check agains the settings
$value =~ s/^\"(.*)\"$/$1/;
$value =~ s/\"//g;
checkWithOid($oid, $value);
#print "I=$IGNORE,E=$EMAIL, L=$LOG, R=$RUNCMD\n";
if ($IGNORE) { print "out\n"; exit 0;}
@ -195,9 +210,10 @@ if ((!$RUNCMD) && exists($hashR{severity_type})) { $RUNCMD=1; }
#email 'alerts' aliase
if ($EMAIL || ((keys(%hashE)==0) && ($severity_type =~/Critical|Warning/))) {
print "email\n";
($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";
#($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";
my $head="SNMP $severity received from $host($ip)\n$briefmsg\n";
my $middle="Trap details:\n$message\n";
my $end;
if ($node1) {$info= getMoreInfo($node1);}
@ -213,7 +229,7 @@ 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) on $datetime";
my $head="SNMP $severity received from $host($ip).";
my $body;
if ($briefmsg) { $body=$briefmsg;}
else { $body=$message; }