tyler.durden/centreon-plugins
1
0
Fork 0
mirror of https://github.com/centreon/centreon-plugins.git synced 2025-07-28 08:04:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

add drs and das config enable 'cluster-status'

Browse Source
This commit is contained in:
garnier-quentin 2020-04-06 13:55:41 +02:00
parent ba6bcf1533
commit 6c75fd1868
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
connectors/vmware/changelog
View File

@ -1,3 +1,6 @@
2020-04-06 Quentin Garnier <qgarnier@centreon.com> - 3.1.2
* Enhancement: add drs and das config enable 'cluster-status'
2020-02-20 Quentin Garnier <qgarnier@centreon.com> - 3.1.1 2020-02-20 Quentin Garnier <qgarnier@centreon.com> - 3.1.1
* Fix: discovery folders management * Fix: discovery folders management
* Fix: no virtual machines running for 'datastore-vm' * Fix: no virtual machines running for 'datastore-vm'

2
connectors/vmware/src/centreon/script/centreon_vmware.pm
View File

@ -54,7 +54,7 @@ BEGIN {
use base qw(centreon::vmware::script); use base qw(centreon::vmware::script);
use vars qw(%centreon_vmware_config); use vars qw(%centreon_vmware_config);
my $VERSION = '3.1.1'; my $VERSION = '3.1.2';
my %handlers = (TERM => {}, HUP => {}, CHLD => {}); my %handlers = (TERM => {}, HUP => {}, CHLD => {});
my @load_modules = ( my @load_modules = (

12
connectors/vmware/src/centreon/vmware/cmdstatuscluster.pm
View File

@ -38,7 +38,7 @@ sub checkArgs {
my ($self, %options) = @_; my ($self, %options) = @_;
if (defined($options{arguments}->{cluster_name}) && $options{arguments}->{cluster_name} eq '') { if (defined($options{arguments}->{cluster_name}) && $options{arguments}->{cluster_name} eq '') {
centreon::vmware::common::set_response(code => 100, short_message => "Argument error: cluster name cannot be null"); centreon::vmware::common::set_response(code => 100, short_message => 'Argument error: cluster name cannot be null');
return 1; return 1;
} }
@ -50,7 +50,7 @@ sub run {
my $vsan_cluster_health; my $vsan_cluster_health;
my $filters = $self->build_filter(label => 'name', search_option => 'cluster_name', is_regexp => 'filter'); my $filters = $self->build_filter(label => 'name', search_option => 'cluster_name', is_regexp => 'filter');
my @properties = ('name', 'summary.overallStatus'); my @properties = ('name', 'summary.overallStatus', 'configuration');
if ($self->is_vsan_enabled()) { if ($self->is_vsan_enabled()) {
$vsan_cluster_health = centreon::vmware::common::vsan_create_mo_view( $vsan_cluster_health = centreon::vmware::common::vsan_create_mo_view(
vsan_vim => $self->{connector}->{vsan_vim}, vsan_vim => $self->{connector}->{vsan_vim},
@ -59,7 +59,7 @@ sub run {
); );
push @properties, 'configurationEx'; push @properties, 'configurationEx';
} }
my $views = centreon::vmware::common::search_entities(command => $self, view_type => 'ComputeResource', properties => \@properties, filter => $filters); my $views = centreon::vmware::common::search_entities(command => $self, view_type => 'ClusterComputeResource', properties => \@properties, filter => $filters);
return if (!defined($views)); return if (!defined($views));
my $data = {}; my $data = {};
@ -67,7 +67,9 @@ sub run {
my $entity_value = $view->{mo_ref}->{value}; my $entity_value = $view->{mo_ref}->{value};
$data->{$entity_value} = { $data->{$entity_value} = {
name => $view->{name}, name => $view->{name},
overall_status => $view->{'summary.overallStatus'}->val overall_status => $view->{'summary.overallStatus'}->val,
ha_enabled => (defined($view->{configuration}->{dasConfig}->{enabled}) && $view->{configuration}->{dasConfig}->{enabled} =~ /^1|true/i) ? 'true' : 'false',
drs_enabled => (defined($view->{configuration}->{drsConfig}->{enabled}) && $view->{configuration}->{drsConfig}->{enabled} =~ /^1|true/i) ? 'true' : 'false'
}; };
if (defined($view->{configurationEx}->{vsanConfigInfo}) && $view->{configurationEx}->{vsanConfigInfo}->enabled == 1) { if (defined($view->{configurationEx}->{vsanConfigInfo}) && $view->{configurationEx}->{vsanConfigInfo}->enabled == 1) {
@ -75,7 +77,7 @@ sub run {
cluster => $view, cluster => $view,
includeObjUuids => 'false', includeObjUuids => 'false',
fetchFromCache => 'false', fetchFromCache => 'false',
fields => ['clusterStatus'], fields => ['clusterStatus']
); );
$data->{$entity_value}->{vsan_cluster_status} = $summary->clusterStatus->status; $data->{$entity_value}->{vsan_cluster_status} = $summary->clusterStatus->status;
} }

2
connectors/vmware/src/centreon/vmware/common.pm
View File

@ -45,7 +45,7 @@ sub init_response {
my (%options) = @_; my (%options) = @_;
$manager_response->{code} = 0; $manager_response->{code} = 0;
$manager_response->{vmware_connector_version} = '3.1.1'; $manager_response->{vmware_connector_version} = '3.1.2';
$manager_response->{short_message} = 'OK'; $manager_response->{short_message} = 'OK';
$manager_response->{extra_message} = ''; $manager_response->{extra_message} = '';
$manager_response->{identity} = $options{identity} if (defined($options{identity})); $manager_response->{identity} = $options{identity} if (defined($options{identity}));