Skip to content
This repository has been archived by the owner on Oct 9, 2023. It is now read-only.

Commit

Permalink
enh(vmware): version 3.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
garnier-quentin authored Dec 21, 2021
2 parents 9fed765 + d940789 commit 1614463
Show file tree
Hide file tree
Showing 12 changed files with 420 additions and 62 deletions.
76 changes: 48 additions & 28 deletions centreon/script/centreon_vmware.pm
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,14 @@ BEGIN {
use base qw(centreon::vmware::script);
use vars qw(%centreon_vmware_config);

my $VERSION = '3.2.1';
my $VERSION = '3.2.2';
my %handlers = (TERM => {}, HUP => {}, CHLD => {});

my @load_modules = (
'centreon::vmware::cmdalarmdatacenter',
'centreon::vmware::cmdalarmhost',
'centreon::vmware::cmdcountvmhost',
'centreon::vmware::cmdcpucluster',
'centreon::vmware::cmdcpuhost',
'centreon::vmware::cmdcpuvm',
'centreon::vmware::cmddatastorecountvm',
Expand All @@ -74,6 +75,7 @@ my @load_modules = (
'centreon::vmware::cmddiscovery',
'centreon::vmware::cmdgetmap',
'centreon::vmware::cmdhealthhost',
'centreon::vmware::cmdlicenses',
'centreon::vmware::cmdlimitvm',
'centreon::vmware::cmdlistclusters',
'centreon::vmware::cmdlistdatacenters',
Expand All @@ -89,6 +91,7 @@ my @load_modules = (
'centreon::vmware::cmdstatuscluster',
'centreon::vmware::cmdstatushost',
'centreon::vmware::cmdstatusvm',
'centreon::vmware::cmdstoragehost',
'centreon::vmware::cmdswaphost',
'centreon::vmware::cmdswapvm',
'centreon::vmware::cmdthinprovisioningvm',
Expand Down Expand Up @@ -160,6 +163,11 @@ sub init {

$self->{centreon_vmware_config} = {%{$self->{centreon_vmware_default_config}}, %centreon_vmware_config};

foreach my $name (keys %{$self->{centreon_vmware_config}->{vsphere_server}}) {
my $iname = lc($name);
$self->{centreon_vmware_config}->{vsphere_server}->{$iname} = delete $self->{centreon_vmware_config}->{vsphere_server}->{$name};
}

##### Load modules
$self->load_module(@load_modules);

Expand Down Expand Up @@ -352,20 +360,27 @@ sub request_dynamic {
my $container = md5_hex($options{result}->{vsphere_address} . $options{result}->{vsphere_username} . $options{result}->{vsphere_password});
# Need to create fork
if (!defined($self->{centreon_vmware_config}->{vsphere_server}->{$container})) {
$self->{centreon_vmware_config}->{vsphere_server}->{$container} = { url => 'https://' . $options{result}->{vsphere_address} . '/sdk',
username => $options{result}->{vsphere_username},
password => $options{result}->{vsphere_password},
last_request => time() };
$self->{logger}->writeLogError(sprintf("Dynamic creation: identity = %s [address: %s] [username: %s] [password: %s]",
$container, $options{result}->{vsphere_address}, $options{result}->{vsphere_username}, $options{result}->{vsphere_password}));
$self->{centreon_vmware_config}->{vsphere_server}->{$container} = {
url => 'https://' . $options{result}->{vsphere_address} . '/sdk',
username => $options{result}->{vsphere_username},
password => $options{result}->{vsphere_password},
last_request => time()
};
$self->{logger}->writeLogError(
sprintf(
"Dynamic creation: identity = %s [address: %s] [username: %s] [password: %s]",
$container, $options{result}->{vsphere_address}, $options{result}->{vsphere_username}, $options{result}->{vsphere_password}
)
);
$centreon_vmware->create_vsphere_child(vsphere_name => $container, dynamic => 1);
}

return if ($self->waiting_ready(container => $container, manager => $options{manager},
identity => $options{identity}) == 0);

return if ($self->waiting_ready(
container => $container, manager => $options{manager},
identity => $options{identity}) == 0);

$self->{centreon_vmware_config}->{vsphere_server}->{$container}->{last_request} = time();

my $flag = ZMQ_NOBLOCK | ZMQ_SNDMORE;
my $msg = zmq_msg_init_data("server-" . $container);
zmq_msg_send($msg, $frontend, $flag);
Expand Down Expand Up @@ -393,36 +408,39 @@ sub request {
centreon::vmware::common::response(token => 'RESPSERVER', endpoint => $frontend, identity => $options{identity});
return ;
}
if (!defined($self->{modules_registry}->{$result->{command}})) {
if (!defined($self->{modules_registry}->{ $result->{command} })) {
centreon::vmware::common::set_response(code => 1, short_message => "Unknown method name '$result->{command}'");
centreon::vmware::common::response(token => 'RESPSERVER', endpoint => $frontend, identity => $options{identity});
return ;
}
if ($self->{modules_registry}->{$result->{command}}->checkArgs(manager => $options{manager},
arguments => $result)) {
if ($self->{modules_registry}->{ $result->{command} }->checkArgs(
manager => $options{manager},
arguments => $result)) {
centreon::vmware::common::response(token => 'RESPSERVER', endpoint => $frontend, identity => $options{identity});
return ;
}

# Mode dynamic
if (defined($result->{vsphere_address}) && $result->{vsphere_address} ne '') {
$self->request_dynamic(result => $result, %options);
return ;
}

if (!defined($self->{centreon_vmware_config}->{vsphere_server}->{$result->{container}})) {

$result->{container} = lc($result->{container});
if (!defined($self->{centreon_vmware_config}->{vsphere_server}->{ $result->{container} })) {
centreon::vmware::common::set_response(code => 1, short_message => "Unknown container name '$result->{container}'");
centreon::vmware::common::response(token => 'RESPSERVER', endpoint => $frontend, identity => $options{identity});
return ;
}

return if ($self->waiting_ready(container => $result->{container}, manager => $options{manager},
identity => $options{identity}) == 0);

$self->{counter_stats}->{$result->{container}}++;
return if ($self->waiting_ready(
container => $result->{container}, manager => $options{manager},
identity => $options{identity}) == 0);

$self->{counter_stats}->{ $result->{container} }++;

my $flag = ZMQ_NOBLOCK | ZMQ_SNDMORE;
my $msg = zmq_msg_init_data("server-" . $result->{container});
my $msg = zmq_msg_init_data('server-' . $result->{container});
zmq_msg_send($msg, $frontend, $flag);
zmq_msg_close($msg);
$msg = zmq_msg_init_data('REQCLIENT ' . $options{data});
Expand All @@ -445,9 +463,11 @@ sub repserver {

$result->{identity} =~ /^client-(.*)$/;
my $identity = 'client-' . pack('H*', $1);

centreon::vmware::common::response(token => 'RESPSERVER', endpoint => $frontend,
identity => $identity, force_response => $options{data});

centreon::vmware::common::response(
token => 'RESPSERVER', endpoint => $frontend,
identity => $identity, force_response => $options{data}
);
}

sub router_event {
Expand All @@ -457,12 +477,12 @@ sub router_event {
zmq_msg_recv($msg, $frontend, ZMQ_DONTWAIT);
my $identity = zmq_msg_data($msg);
zmq_msg_close($msg);

$msg = zmq_msg_init();
zmq_msg_recv($msg, $frontend, ZMQ_DONTWAIT);
my $data = zmq_msg_data($msg);
zmq_msg_close($msg);

centreon::vmware::common::init_response();
if ($centreon_vmware->{stop} != 0) {
# We quit so we say we're leaving ;)
Expand Down Expand Up @@ -516,7 +536,7 @@ sub create_vsphere_child {
modules_registry => $self->{modules_registry},
config => $self->{centreon_vmware_config},
logger => $self->{logger},
vsan_enabled => $self->{vsan_enabled},
vsan_enabled => $self->{vsan_enabled}
);
$connector->run();
exit(0);
Expand Down
8 changes: 4 additions & 4 deletions centreon/vmware/cmdbase.pm
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sub new {

$self->{logger} = $options{logger};
$self->{global_case_insensitive} = defined($options{case_insensitive}) ? $options{case_insensitive} : 0;

return $self;
}

Expand All @@ -55,7 +55,7 @@ sub class_handle_ALRM {

sub handle_ALRM {
my $self = shift;

$self->{logger}->writeLogError('Child process autokill!!');
exit(0);
}
Expand All @@ -80,12 +80,12 @@ sub set_connector {

sub initArgs {
my ($self, %options) = @_;

foreach (keys %{$options{arguments}}) {
$self->{$_} = $options{arguments}->{$_};
}
centreon::vmware::common::init_response(identity => $options{arguments}->{identity});

if ($self->{global_case_insensitive} == 0 && defined($self->{case_insensitive})) {
$self->{global_case_insensitive} = 1;
}
Expand Down
97 changes: 97 additions & 0 deletions centreon/vmware/cmdcpucluster.pm
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# Copyright 2015 Centreon (http://www.centreon.com/)
#
# Centreon is a full-fledged industry-strength solution that meets
# the needs in IT infrastructure and application monitoring for
# service performance.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

package centreon::vmware::cmdcpucluster;

use base qw(centreon::vmware::cmdbase);

use strict;
use warnings;
use centreon::vmware::common;

sub new {
my ($class, %options) = @_;
my $self = $class->SUPER::new(%options);
bless $self, $class;

$self->{commandName} = 'cpucluster';

return $self;
}

sub checkArgs {
my ($self, %options) = @_;

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');
return 1;
}

return 0;
}

sub run {
my $self = shift;

if (!($self->{connector}->{perfcounter_speriod} > 0)) {
centreon::vmware::common::set_response(code => -1, short_message => "Can't retrieve perf counters");
return ;
}

my $filters = $self->build_filter(label => 'name', search_option => 'cluster_name', is_regexp => 'filter');
my @properties = ('name');
my $views = centreon::vmware::common::search_entities(command => $self, view_type => 'ClusterComputeResource', properties => \@properties, filter => $filters);
return if (!defined($views));

my $values = centreon::vmware::common::generic_performance_values_historic(
$self->{connector},
$views,
[
{ label => 'cpu.usage.average', instances => [''] },
{ label => 'cpu.usagemhz.average', instances => [''] }
],
$self->{connector}->{perfcounter_speriod},
sampling_period => $self->{sampling_period},
time_shift => $self->{time_shift},
skip_undef_counter => 1, multiples => 1, multiples_result_by_entity => 1
);
return if (centreon::vmware::common::performance_errors($self->{connector}, $values) == 1);

my $interval_min = centreon::vmware::common::get_interval_min(
speriod => $self->{connector}->{perfcounter_speriod},
sampling_period => $self->{sampling_period},
time_shift => $self->{time_shift}
);

my $data = {};
foreach my $view (@$views) {
my $entity_value = $view->{mo_ref}->{value};
$data->{$entity_value} = { name => $view->{name} };

my $total_cpu_average = centreon::vmware::common::simplify_number(centreon::vmware::common::convert_number($values->{$entity_value}->{ $self->{connector}->{perfcounter_cache}->{'cpu.usage.average'}->{key} . ':' } * 0.01));
my $total_cpu_mhz_average = centreon::vmware::common::simplify_number(centreon::vmware::common::convert_number($values->{$entity_value}->{ $self->{connector}->{perfcounter_cache}->{'cpu.usagemhz.average'}->{key} . ':' }));

$data->{$entity_value}->{'interval_min'} = $interval_min;
$data->{$entity_value}->{'cpu.usage.average'} = $total_cpu_average;
$data->{$entity_value}->{'cpu.usagemhz.average'} = $total_cpu_mhz_average;
}

centreon::vmware::common::set_response(data => $data);
}

1;
27 changes: 17 additions & 10 deletions centreon/vmware/cmdcpuhost.pm
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,25 @@ sub run {
return if (!defined($result));

my @instances = ('*');
my $values = centreon::vmware::common::generic_performance_values_historic($self->{connector},
$result,
[{'label' => 'cpu.usage.average', 'instances' => \@instances},
{'label' => 'cpu.usagemhz.average', 'instances' => \@instances}],
$self->{connector}->{perfcounter_speriod},
sampling_period => $self->{sampling_period}, time_shift => $self->{time_shift},
skip_undef_counter => 1, multiples => 1, multiples_result_by_entity => 1);
my $values = centreon::vmware::common::generic_performance_values_historic(
$self->{connector},
$result,
[
{ label => 'cpu.usage.average', 'instances' => \@instances},
{ label => 'cpu.usagemhz.average', 'instances' => \@instances}
],
$self->{connector}->{perfcounter_speriod},
sampling_period => $self->{sampling_period},
time_shift => $self->{time_shift},
skip_undef_counter => 1, multiples => 1, multiples_result_by_entity => 1
);
return if (centreon::vmware::common::performance_errors($self->{connector}, $values) == 1);

my $interval_min = centreon::vmware::common::get_interval_min(speriod => $self->{connector}->{perfcounter_speriod},
sampling_period => $self->{sampling_period}, time_shift => $self->{time_shift});

my $interval_min = centreon::vmware::common::get_interval_min(
speriod => $self->{connector}->{perfcounter_speriod},
sampling_period => $self->{sampling_period}, time_shift => $self->{time_shift}
);

my $data = {};
foreach my $entity_view (@$result) {
my $entity_value = $entity_view->{mo_ref}->{value};
Expand Down
28 changes: 17 additions & 11 deletions centreon/vmware/cmdcpuvm.pm
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,29 @@ sub run {
return if (!defined($result));

my @instances = ('*');
my $values = centreon::vmware::common::generic_performance_values_historic($self->{connector},
$result,
[{'label' => 'cpu.usage.average', 'instances' => \@instances},
{'label' => 'cpu.usagemhz.average', 'instances' => \@instances},
{'label' => 'cpu.ready.summation', 'instances' => \@instances}],
$self->{connector}->{perfcounter_speriod},
sampling_period => $self->{sampling_period}, time_shift => $self->{time_shift},
skip_undef_counter => 1, multiples => 1, multiples_result_by_entity => 1);
my $values = centreon::vmware::common::generic_performance_values_historic(
$self->{connector},
$result,
[
{'label' => 'cpu.usage.average', 'instances' => \@instances},
{'label' => 'cpu.usagemhz.average', 'instances' => \@instances},
{'label' => 'cpu.ready.summation', 'instances' => \@instances}
],
$self->{connector}->{perfcounter_speriod},
sampling_period => $self->{sampling_period}, time_shift => $self->{time_shift},
skip_undef_counter => 1, multiples => 1, multiples_result_by_entity => 1
);
return if (centreon::vmware::common::performance_errors($self->{connector}, $values) == 1);

my $interval_sec = $self->{connector}->{perfcounter_speriod};
if (defined($self->{sampling_period}) && $self->{sampling_period} ne '') {
$interval_sec = $self->{sampling_period};
}
my $interval_min = centreon::vmware::common::get_interval_min(speriod => $self->{connector}->{perfcounter_speriod},
sampling_period => $self->{sampling_period}, time_shift => $self->{time_shift});

my $interval_min = centreon::vmware::common::get_interval_min(
speriod => $self->{connector}->{perfcounter_speriod},
sampling_period => $self->{sampling_period}, time_shift => $self->{time_shift}
);

my $data = {};
foreach my $entity_view (@$result) {
my $entity_value = $entity_view->{mo_ref}->{value};
Expand Down
4 changes: 4 additions & 0 deletions centreon/vmware/cmddatastoreusage.pm
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ sub run {

next if (centreon::vmware::common::is_accessible(accessible => $entity_view->summary->accessible) == 0);

if (defined($self->{refresh})) {
$entity_view->RefreshDatastore();
}

# capacity 0...
if ($entity_view->summary->capacity <= 0) {
$data->{$entity_value}->{size} = 0;
Expand Down
Loading

0 comments on commit 1614463

Please sign in to comment.