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

better management of multiple counters

This commit is contained in:
garnier-quentin 2020-04-01 12:33:33 +02:00 committed by Lotfi zaouche
parent 8165d2bf81
commit 8a1fe49154
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
centreon-plugins/centreon/plugins/templates/counter.pm
View File

@ -309,7 +309,7 @@ sub run_instances {
$self->{lproblems} = 0; $self->{lproblems} = 0;
$self->{multiple} = 1; $self->{multiple} = 1;
if (scalar(keys %{$self->{$options{config}->{name}}}) == 1) { if (scalar(keys %{$self->{$options{config}->{name}}}) <= 1) {
$self->{multiple} = 0; $self->{multiple} = 0;
} }
@ -401,7 +401,7 @@ sub run_group {
my $multiple = 1; my $multiple = 1;
return if (scalar(keys %{$self->{$options{config}->{name}}}) <= 0); return if (scalar(keys %{$self->{$options{config}->{name}}}) <= 0);
if (scalar(keys %{$self->{$options{config}->{name}}}) == 1) { if (scalar(keys %{$self->{$options{config}->{name}}}) <= 1) {
$multiple = 0; $multiple = 0;
} }
@ -478,7 +478,7 @@ sub run_multiple_instances {
my $no_message_multiple = 1; my $no_message_multiple = 1;
my $multiple = 1; my $multiple = 1;
if (scalar(keys %{$self->{$options{config}->{name}}}) == 1) { if (scalar(keys %{$self->{$options{config}->{name}}}) <= 1) {
$multiple = 0; $multiple = 0;
} }
@ -580,13 +580,15 @@ sub run_multiple {
my ($self, %options) = @_; my ($self, %options) = @_;
my $multiple = 1; my $multiple = 1;
if (scalar(keys %{$self->{$options{config}->{name}}}) == 1) { if (scalar(keys %{$self->{$options{config}->{name}}}) <= 1) {
$multiple = 0; $multiple = 0;
} }
if ($multiple == 1) { if ($multiple == 1) {
$self->{output}->output_add(severity => 'OK', $self->{output}->output_add(
short_msg => $options{config}->{message_multiple}); severity => 'OK',
short_msg => $options{config}->{message_multiple}
);
} }
foreach my $instance (sort keys %{$self->{$options{config}->{name}}}) { foreach my $instance (sort keys %{$self->{$options{config}->{name}}}) {