|
@@ -418,6 +418,7 @@ Filter: acknowledged = 0
|
|
|
And: 2" | unixcat $nagioscmd` ) {
|
|
|
($d,$host,$service,$state,$output)=split /;/,$unixline;
|
|
|
handle_alert($option,$d,'SERVICE',$host,$NagStates[$state+10],$output,$service);
|
|
|
+ chomp $unixline;
|
|
|
Irssi::print("%B>>%n $unixline", MSGLEVEL_CLIENTCRAP);
|
|
|
}
|
|
|
|
|
@@ -429,6 +430,7 @@ Filter: acknowledged = 0
|
|
|
And: 2" | unixcat $nagioscmd` ) {
|
|
|
($d,$host,$state,$output)=split /;/,$unixline;
|
|
|
handle_alert($option,$d,'HOST',$host,$NagStates[$state],$output,"");
|
|
|
+ chomp $unixline;
|
|
|
Irssi::print("%B>>%n $unixline", MSGLEVEL_CLIENTCRAP);
|
|
|
}
|
|
|
}
|
|
@@ -545,18 +547,24 @@ sub event_privmsg($$$$) {
|
|
|
$server->command ( "msg ".$nagios_ack_channel.
|
|
|
" ".scalar @ACKS." alertes");
|
|
|
}
|
|
|
- elsif ($arg =~ /^list/i) {
|
|
|
+ elsif ($arg =~ /^list ?(.*)/i) {
|
|
|
$server->command ( "msg ".$nagios_ack_channel.
|
|
|
" ".scalar @ACKS." alertes");
|
|
|
my $i=0;
|
|
|
+ my $grepto;
|
|
|
+ my $togrep="$1";
|
|
|
+ Irssi::print("> ".$togrep);
|
|
|
foreach $K (@ACKS) {
|
|
|
+ my $grepto="@$K";
|
|
|
+ Irssi::print("> ".$grepto);
|
|
|
$server->command ( "msg ".$nagios_ack_channel.
|
|
|
- " ". format_alert_id(' ',$i++,$K->[2]) ." ".$K->[0]." / $K->[1] / $K->[2] / $K->[3] / ".time2date $K->[4]);
|
|
|
+ " ". format_alert_id(' ',$i,$K->[2]) ." ".$K->[0]." / $K->[1] / $K->[2] / $K->[3] / ".time2date $K->[4]) if ($grepto =~ /$togrep/);
|
|
|
+ $i++;
|
|
|
}
|
|
|
}
|
|
|
elsif ($arg =~ /^help/i) {
|
|
|
$server->command ( "msg ".$nagios_ack_channel.
|
|
|
- " !nagios list : liste des alertes nagios reçues ici");
|
|
|
+ " !nagios list [pattern] :liste des alertes nagios reçues ici");
|
|
|
$server->command ( "msg ".$nagios_ack_channel.
|
|
|
" !nagios help : l'aide");
|
|
|
$server->command ( "msg ".$nagios_ack_channel.
|