diff --git a/centreon-plugins/apps/activedirectory/wsman/conf/dcdiag.xml b/centreon-plugins/apps/activedirectory/wsman/conf/dcdiag.xml
new file mode 100644
index 000000000..0a7e51ca6
--- /dev/null
+++ b/centreon-plugins/apps/activedirectory/wsman/conf/dcdiag.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ passed test\s+(.*)
+ warning test\s+(.*)
+ failed test\s+(.*)
+
+
+
\ No newline at end of file
diff --git a/centreon-plugins/apps/activedirectory/wsman/mode/dcdiag.pm b/centreon-plugins/apps/activedirectory/wsman/mode/dcdiag.pm
new file mode 100644
index 000000000..71fefb827
--- /dev/null
+++ b/centreon-plugins/apps/activedirectory/wsman/mode/dcdiag.pm
@@ -0,0 +1,247 @@
+################################################################################
+# Copyright 2005-2014 MERETHIS
+# Centreon is developped by : Julien Mathis and Romain Le Merlus under
+# GPL Licence 2.0.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation ; either version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see .
+#
+# Linking this program statically or dynamically with other modules is making a
+# combined work based on this program. Thus, the terms and conditions of the GNU
+# General Public License cover the whole combination.
+#
+# As a special exception, the copyright holders of this program give MERETHIS
+# permission to link this program with independent modules to produce an executable,
+# regardless of the license terms of these independent modules, and to copy and
+# distribute the resulting executable under terms of MERETHIS choice, provided that
+# MERETHIS also meet, for each linked independent module, the terms and conditions
+# of the license of that module. An independent module is a module which is not
+# derived from this program. If you modify this program, you may extend this
+# exception to your version of the program, but you are not obliged to do so. If you
+# do not wish to do so, delete this exception statement from your version.
+#
+# For more information : contact@centreon.com
+# Authors : Quentin Garnier
+#
+####################################################################################
+
+package apps::activedirectory::wsman::mode::dcdiag;
+
+use base qw(centreon::plugins::mode);
+
+use strict;
+use warnings;
+use File::Basename;
+use XML::LibXML;
+
+sub new {
+ my ($class, %options) = @_;
+ my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+ bless $self, $class;
+
+ $self->{version} = '1.0';
+ $options{options}->add_options(arguments =>
+ {
+ "config:s" => { name => 'config', },
+ "language:s" => { name => 'language', default => 'en' },
+ "dfsr" => { name => 'dfsr', },
+ "noeventlog" => { name => 'noeventlog', },
+ });
+ $self->{os_is2003} = 0;
+ $self->{os_is2008} = 0;
+ $self->{os_is2012} = 0;
+
+ $self->{msg} = {ok => undef, warning => undef, critical => undef};
+ return $self;
+}
+
+sub check_options {
+ my ($self, %options) = @_;
+ $self->SUPER::init(%options);
+ if (defined($self->{option_results}->{config})) {
+ $self->{config_file} = $self->{option_results}->{config};
+ } else {
+ $self->{config_file} = dirname(__FILE__) . '/../conf/dcdiag.xml';
+ }
+}
+
+sub check_version {
+ my ($self, %options) = @_;
+
+ $self->{result} = $self->{wsman}->execute_winshell_commands(commands => [{label => 'os_version', value => 'ver' }],
+ keep_open => 1);
+ if ($self->{result}->{os_version}->{exit_code} != 0) {
+ $self->{output}->output_add(severity => 'UNKNOWN',
+ short_msg => 'Problem execution to get OS version (use verbose for more details)');
+ $self->{output}->output_add(long_msg => 'stderr: ' . $self->{result}->{os_version}->{stderr}) if (defined($self->{result}->{os_version}->{stderr}));
+ $self->{output}->output_add(long_msg => 'stdout: ' . $self->{result}->{os_version}->{stdout}) if (defined($self->{result}->{os_version}->{stdout}));
+ return 1;
+ }
+
+ if ($self->{result}->{os_version}->{stdout} !~ /(\d+\.\d+\.\d+)/) {
+ $self->{output}->output_add(severity => 'UNKNOWN',
+ short_msg => 'Cannot find OS version in output');
+ return 1;
+ }
+
+ # 5.1, 5.2 => XP/2003
+ # 6.0, 6.1 => Vista/7/2008
+ # 6.2, 6.3 => 2012
+ my $os_version = $1;
+ if ($os_version =~ /^(5\.1\.|5\.2\.)/) {
+ $self->{os_is2003} = 1;
+ } elsif ($os_version =~ /^(6\.0\.|6\.1\.)/) {
+ $self->{os_is2008} = 1;
+ } elsif ($os_version =~ /^(6\.2\.|6\.3\.)/) {
+ $self->{os_is2012} = 1;
+ } else {
+ $self->{output}->output_add(severity => 'UNKNOWN',
+ short_msg => 'OS version ' . $os_version . ' not managed.');
+ return 1;
+ }
+ return 0;
+}
+
+sub load_xml {
+ my ($self, %options) = @_;
+
+ # Load XML File
+ my $parser = XML::LibXML->new();
+ my $doc = $parser->parse_file($self->{config_file});
+ my $nodes = $doc->getElementsByTagName('dcdiag');
+ if ($nodes->size() == 0) {
+ $self->{output}->output_add(severity => 'UNKNOWN',
+ short_msg => 'Cannot find a node in XML Config file');
+ return 1;
+ }
+
+ my $language_found = 0;
+ foreach my $node ($nodes->get_nodelist()) {
+ if ($node->getAttribute('language') eq $self->{option_results}->{language}) {
+ $language_found = 1;
+ my $messages_node = $node->getElementsByTagName('messages');
+ foreach my $node2 ($messages_node->get_nodelist()) {
+ foreach my $element_msg ($node2->getChildrenByTagName('*')) {
+ $self->{msg}->{$element_msg->nodeName} = $element_msg->textContent if (exists($self->{msg}->{$element_msg->nodeName}));
+ }
+ }
+ last;
+ }
+ }
+
+ if ($language_found == 0) {
+ $self->{output}->output_add(severity => 'UNKNOWN',
+ short_msg => "Cannot found language '" . $self->{option_results}->{language} . "' in XML Config file");
+ return 1;
+ }
+
+ foreach my $label (keys %{$self->{msg}}) {
+ if (!defined($self->{msg}->{$label})) {
+ $self->{output}->output_add(severity => 'UNKNOWN',
+ short_msg => "Message '" . $label . "' for language '" . $self->{option_results}->{language} . "' not defined in XML Config file");
+ return 1;
+ }
+ }
+
+ return 0;
+}
+
+sub dcdiag {
+ my ($self, %options) = @_;
+
+ my $dcdiag_cmd = 'dcdiag /test:services /test:replications /test:advertising /test:fsmocheck /test:ridmanager /test:machineaccount';
+ $dcdiag_cmd .= ' /test:frssysvol' if ($self->{os_is2003} == 1);
+ $dcdiag_cmd .= ' /test:sysvolcheck' if ($self->{os_is2008} == 1 || $self->{os_is2012} == 1);
+
+ if (!defined($self->{option_results}->{noeventlog})) {
+ $dcdiag_cmd .= ' /test:frsevent /test:kccevent' if ($self->{os_is2003} == 1);
+ $dcdiag_cmd .= ' /test:frsevent /test:kccevent' if (($self->{os_is2008} == 1 || $self->{os_is2012} == 1) && !defined($self->{option_results}->{dfsr}));
+ $dcdiag_cmd .= ' /test:dfsrevent /test:kccevent' if (($self->{os_is2008} == 1 || $self->{os_is2012} == 1) && defined($self->{option_results}->{dfsr}));
+ }
+
+ $self->{result} = $self->{wsman}->execute_winshell_commands(commands => [{label => 'dcdiag', value => $dcdiag_cmd }]);
+ if ($self->{result}->{dcdiag}->{exit_code} != 0) {
+ $self->{output}->output_add(severity => 'UNKNOWN',
+ short_msg => 'Problem execution of dcdiag (use verbose for more details)');
+ $self->{output}->output_add(long_msg => 'stderr: ' . $self->{result}->{dcdiag}->{stderr}) if (defined($self->{result}->{dcdiag}->{stderr}));
+ $self->{output}->output_add(long_msg => 'stdout: ' . $self->{result}->{dcdiag}->{stdout}) if (defined($self->{result}->{dcdiag}->{stdout}));
+ return 1;
+ }
+
+ my $match = 0;
+ foreach my $line (split /\n/, $self->{result}->{os_version}->{stdout}) {
+ if ($line =~ /$self->{msg}->{ok}/) {
+ $match = 1;
+ $self->{output}->output_add(severity => 'OK',
+ short_msg => $1);
+ } elsif ($line =~ /$self->{msg}->{critical}/) {
+ $match = 1;
+ $self->{output}->output_add(severity => 'CRITICAL',
+ short_msg => 'test ' . $1);
+ } elsif ($line =~ /$self->{msg}->{warning}/) {
+ $match = 1;
+ $self->{output}->output_add(severity => 'WARNING',
+ short_msg => 'test ' . $1);
+ }
+ }
+
+ if ($match == 0) {
+ $self->{output}->output_add(severity => 'UNKNOWN',
+ short_msg => 'Cannot match output test (maybe you need to set the good language)');
+ return 1;
+ }
+
+ return 0;
+}
+
+sub run {
+ my ($self, %options) = @_;
+ # $options{wsman} = wsman object
+ $self->{wsman} = $options{wsman};
+
+ if ($self->load_xml() == 0 && $self->check_version() == 0) {
+ $self->dcdiag();
+ }
+
+ $self->{output}->display();
+ $self->{output}->exit();
+}
+
+1;
+
+__END__
+
+=head1 MODE
+
+Check Windows Active Directory Health (use 'dcdiag' command).
+
+=over 8
+
+=item B<--config>
+
+command can be localized by using a configuration file.
+This parameter can be used to specify an alternative location for the configuration file
+
+=item B<--language>
+
+Set the language used in config file (default: 'en').
+
+=item B<--dfsr>
+
+Specifies that SysVol replication uses DFS instead of FRS (Windows 2008 or later)
+
+=item B<--noeventlog>
+
+Don't run the dc tests kccevent, frsevent and dfsrevent
+
+=back
+
+=cut
\ No newline at end of file
diff --git a/centreon-plugins/apps/activedirectory/wsman/plugin.pm b/centreon-plugins/apps/activedirectory/wsman/plugin.pm
new file mode 100644
index 000000000..5003a47d6
--- /dev/null
+++ b/centreon-plugins/apps/activedirectory/wsman/plugin.pm
@@ -0,0 +1,64 @@
+################################################################################
+# Copyright 2005-2014 MERETHIS
+# Centreon is developped by : Julien Mathis and Romain Le Merlus under
+# GPL Licence 2.0.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation ; either version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, see .
+#
+# Linking this program statically or dynamically with other modules is making a
+# combined work based on this program. Thus, the terms and conditions of the GNU
+# General Public License cover the whole combination.
+#
+# As a special exception, the copyright holders of this program give MERETHIS
+# permission to link this program with independent modules to produce an executable,
+# regardless of the license terms of these independent modules, and to copy and
+# distribute the resulting executable under terms of MERETHIS choice, provided that
+# MERETHIS also meet, for each linked independent module, the terms and conditions
+# of the license of that module. An independent module is a module which is not
+# derived from this program. If you modify this program, you may extend this
+# exception to your version of the program, but you are not obliged to do so. If you
+# do not wish to do so, delete this exception statement from your version.
+#
+# For more information : contact@centreon.com
+# Authors : Quentin Garnier
+#
+####################################################################################
+
+package apps::activedirectory::wsman::plugin;
+
+use strict;
+use warnings;
+use base qw(centreon::plugins::script_wsman);
+
+sub new {
+ my ($class, %options) = @_;
+ my $self = $class->SUPER::new(package => __PACKAGE__, %options);
+ bless $self, $class;
+ # $options->{options} = options object
+
+ $self->{version} = '0.1';
+ %{$self->{modes}} = (
+ 'dcdiag' => 'apps::activedirectory::wsman::mode::dcdiag',
+ );
+
+ return $self;
+}
+
+1;
+
+__END__
+
+=head1 PLUGIN DESCRIPTION
+
+Check Windows ActiveDirectory through "WinRM" (ws-management protocol).
+
+=cut
diff --git a/centreon-plugins/centreon/plugins/wsman.pm b/centreon-plugins/centreon/plugins/wsman.pm
index 7e56d9f0a..45fb3c808 100644
--- a/centreon-plugins/centreon/plugins/wsman.pm
+++ b/centreon-plugins/centreon/plugins/wsman.pm
@@ -129,6 +129,7 @@ sub connect {
sub execute_winshell_commands {
my ($self, %options) = @_;
+ # $options{keep_open} = integer
# $options{commands} = ref array of hash ([{label => 'myipconfig', value => 'ipconfig /all' }])
my ($dont_quit) = (defined($options{dont_quit}) && $options{dont_quit} == 1) ? 1 : 0;
@@ -136,34 +137,37 @@ sub execute_winshell_commands {
my $uri = 'http://schemas.microsoft.com/wbem/wsman/1/windows/shell/cmd';
my $namespace = 'http://schemas.microsoft.com/wbem/wsman/1/windows/shell';
- $self->{shell_id} = undef;
- my ($command_id);
my $command_result = {};
+ my ($command_id, $client_options, $data, $result, $node);
# Init result
foreach my $command (@{$options{commands}}) {
$command_result->{$command->{label}} = {stdout => undef, stderr => undef, exit_code => undef};
}
- ######
- # Start Shell
- my $client_options = new openwsman::ClientOptions::()
- or $self->internal_exit(msg => 'Could not create client options handler');
- $client_options->set_timeout(30 * 1000); # 30sec
- $client_options->add_selector('Name', 'Themes');
- $client_options->add_option('WINRS_NOPROFILE', 'FALSE');
- $client_options->add_option('WINRS_CODEPAGE', '437'); # utf-8
+ if (!defined($self->{shell_id})) {
+ $self->{shell_id} = undef;
- my $data = new openwsman::XmlDoc::('Shell', $namespace)
+ ######
+ # Start Shell
+ $client_options = new openwsman::ClientOptions::()
+ or $self->internal_exit(msg => 'Could not create client options handler');
+ $client_options->set_timeout(30 * 1000); # 30sec
+ $client_options->add_selector('Name', 'Themes');
+ $client_options->add_option('WINRS_NOPROFILE', 'FALSE');
+ $client_options->add_option('WINRS_CODEPAGE', '437'); # utf-8
+
+ $data = new openwsman::XmlDoc::('Shell', $namespace)
or $self->internal_exit(msg => 'Could not create XmlDoc');
- $data->root()->add($namespace, 'InputStreams', 'stdin');
- $data->root()->add($namespace, 'OutputStreams', 'stdout stderr');
+ $data->root()->add($namespace, 'InputStreams', 'stdin');
+ $data->root()->add($namespace, 'OutputStreams', 'stdout stderr');
- my $result = $self->{client}->create($client_options, $uri, $data->string(), length($data->string()), "utf-8");
- return undef if ($self->handle_dialog_fault(result => $result, msg => 'Create failed: ', dont_quit => $dont_quit));
- my $node = $result->root()->find(undef, 'Selector')
+ $result = $self->{client}->create($client_options, $uri, $data->string(), length($data->string()), "utf-8");
+ return undef if ($self->handle_dialog_fault(result => $result, msg => 'Create failed: ', dont_quit => $dont_quit));
+ $node = $result->root()->find(undef, 'Selector')
or $self->internal_exit(msg => 'No shell id returned');
- $self->{shell_id} = $node->text();
+ $self->{shell_id} = $node->text();
+ }
foreach my $command (@{$options{commands}}) {
#######
@@ -272,7 +276,7 @@ sub execute_winshell_commands {
}
# Delete Shell resource
- if (defined($self->{shell_id})) {
+ if (defined($self->{shell_id}) && !(defined($options{keep_open}) && $options{keep_open} == 1)) {
my $client_options = new openwsman::ClientOptions::()
or die print "[ERROR] Could not create client options handler.\n";
$client_options->set_timeout(30 * 1000); # 30sec
diff --git a/centreon-plugins/os/solaris/local/mode/prtdiag.pm b/centreon-plugins/os/solaris/local/mode/prtdiag.pm
index 8be7ec150..5a16e75bd 100644
--- a/centreon-plugins/os/solaris/local/mode/prtdiag.pm
+++ b/centreon-plugins/os/solaris/local/mode/prtdiag.pm
@@ -75,7 +75,7 @@ sub check_options {
if (defined($self->{option_results}->{config_file})) {
$self->{config_file} = $self->{option_results}->{config_file};
} else {
- $self->{config_file} = dirname(__FILE__) . '/../prtdiag.conf';
+ $self->{config_file} = dirname(__FILE__) . '/../conf/prtdiag.conf';
}
}