tyler.durden
/
centreon-plugins
mirror of https://github.com/centreon/centreon-plugins.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refs #5196

This commit is contained in:
Quentin Garnier 2014-02-20 15:57:30 +01:00
parent 8f82f90a5a
commit de2b24cf65
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/activedirectory/local/conf/dcdiag.xml
View File

@ -2,9 +2,18 @@
<root>
<dcdiag language="en">
<messages>
<ok>passed test\s+(.*)</ok>
<warning>warning test\s+(.*)</warning>
<critical>failed test\s+(.*)</critical>
<global>Starting test.*?:\s+(.*?)\n.*?(passed|warning|failed)</global>
<ok>passed</ok>
<warning>warning</warning>
<critical>failed</critical>
</messages>
</dcdiag>
<dcdiag language="fr">
<messages>
<global>D.marrage du test.*?:\s+(.*?)\n.*?(a r.ussi|a .chou.|warning)</global>
<ok>a r.ussi</ok>
<warning>warning</warning>
<critical>a .chou.</critical>
</messages>
</dcdiag>
</root>

18
apps/activedirectory/local/mode/dcdiag.pm
View File

@ -61,7 +61,7 @@ sub new {
$self->{os_is2008} = 0;
$self->{os_is2012} = 0;
$self->{msg} = {ok => undef, warning => undef, critical => undef};
$self->{msg} = {global => undef, ok => undef, warning => undef, critical => undef};
return $self;
}
@ -163,19 +163,21 @@ sub dcdiag {
command_options => undef);
my $match = 0;
foreach my $line (split /\n/, $stdout) {
if ($line =~ /$self->{msg}->{ok}/) {
while ($stdout =~ /$self->{msg}->{global}/imsg) {
my ($test_name, $pattern) = ($1, lc($2));
if ($pattern =~ /$self->{msg}->{ok}/i) {
$match = 1;
$self->{output}->output_add(severity => 'OK',
short_msg => $1);
} elsif ($line =~ /$self->{msg}->{critical}/) {
short_msg => $test_name);
} elsif ($pattern =~ /$self->{msg}->{critical}/i) {
$match = 1;
$self->{output}->output_add(severity => 'CRITICAL',
short_msg => 'test ' . $1);
} elsif ($line =~ /$self->{msg}->{warning}/) {
short_msg => 'test ' . $test_name);
} elsif ($pattern =~ /$self->{msg}->{warning}/i) {
$match = 1;
$self->{output}->output_add(severity => 'WARNING',
short_msg => 'test ' . $1);
short_msg => 'test ' . $test_name);
}
}