Merge pull request #39 from centreon/master

Merge from master
This commit is contained in:
Simon Bomm 2018-03-11 19:56:40 +01:00 committed by GitHub
commit 3dcf2d7c10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions

View File

@ -251,7 +251,7 @@ sub manage_selection {
my $persistent_storage_size = 0;
my $ephemeral_storage_size = 0;
my $bigstore_size = 0;
foreach my $node (keys $result3) {
foreach my $node (keys %{$result3}) {
if (defined($result3->{$node}->{total_memory})) {
$total_memory = $total_memory + $result3->{$node}->{total_memory};
}

View File

@ -476,7 +476,7 @@ sub manage_selection {
my $result = $options{custom}->get(path => '/v1/bdbs/stats/last?interval='.$options{custom}->get_interval());
my $result2 = $options{custom}->get(path => '/v1/bdbs');
foreach my $database (keys $result) {
foreach my $database (keys %{$result}) {
if (defined($self->{option_results}->{filter_database}) && $self->{option_results}->{filter_database} ne '' &&
$database !~ /$self->{option_results}->{filter_database}/) {
$self->{output}->output_add(long_msg => "skipping database '" . $database . "': no matching filter.", debug => 1);

View File

@ -333,7 +333,7 @@ sub manage_selection {
my $result = $options{custom}->get(path => '/v1/nodes/stats/last?interval='.$options{custom}->get_interval());
my $result2 = $options{custom}->get(path => '/v1/nodes');
foreach my $node (keys $result) {
foreach my $node (keys %{$result}) {
if (defined($self->{option_results}->{filter_node}) && $self->{option_results}->{filter_node} ne '' &&
$node !~ /$self->{option_results}->{filter_node}/) {
$self->{output}->output_add(long_msg => "skipping node '" . $node . "': no matching filter.", debug => 1);

View File

@ -357,7 +357,7 @@ sub manage_selection {
my $result = $options{custom}->get(path => '/v1/shards/stats/last?interval='.$options{custom}->get_interval());
my $result2 = $options{custom}->get(path => '/v1/shards');
foreach my $shard (keys $result) {
foreach my $shard (keys %{$result}) {
if (defined($self->{option_results}->{filter_shard}) && $self->{option_results}->{filter_shard} ne '' &&
$shard !~ /$self->{option_results}->{filter_shard}/) {
$self->{output}->output_add(long_msg => "skipping shard '" . $shard . "': no matching filter.", debug => 1);

View File

@ -338,7 +338,7 @@ sub run {
foreach my $pid (keys %{$self->{results}}) {
my $long_msg = sprintf("Process '%s'", $pid);
for my $key (keys $self->{results}->{$pid}) {
foreach my $key (keys %{$self->{results}->{$pid}}) {
$long_msg .= sprintf(" [%s: %s]", $key, $self->{results}->{$pid}->{$key});
}
$self->{output}->output_add(long_msg => $long_msg);