From 0bad9e9c26b3d91f4738114f9f53237c94c86cd3 Mon Sep 17 00:00:00 2001 From: qgarnier Date: Fri, 13 Nov 2020 16:14:49 +0100 Subject: [PATCH] MON-6317: services discovered flaps (#76) --- .../modules/centreon/autodiscovery/services/discovery.pm | 3 ++- .../modules/centreon/autodiscovery/services/resources.pm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gorgone/gorgone/modules/centreon/autodiscovery/services/discovery.pm b/gorgone/gorgone/modules/centreon/autodiscovery/services/discovery.pm index 9adbb1ad772..69ebb6af84c 100644 --- a/gorgone/gorgone/modules/centreon/autodiscovery/services/discovery.pm +++ b/gorgone/gorgone/modules/centreon/autodiscovery/services/discovery.pm @@ -490,7 +490,8 @@ sub disable_services { return if ($self->{discovery}->{rules}->{ $options{rule_id} }->{rule_disable} != 1 || !defined($self->{discovery}->{rules}->{ $options{rule_id} }->{linked_services}->{ $options{host_id} })); foreach my $service (keys %{$self->{discovery}->{rules}->{ $options{rule_id} }->{linked_services}->{ $options{host_id} }}) { my $service_description = $self->{discovery}->{rules}->{ $options{rule_id} }->{linked_services}->{ $options{host_id} }->{$service}->{service_description}; - if (!defined($options{discovered_services}->{discovered_services}->{$service_description}) && + + if (!defined($options{discovery_svc}->{discovered_services}->{$service_description}) && $self->{discovery}->{rules}->{ $options{rule_id} }->{linked_services}->{ $options{host_id} }->{$service}->{service_activate} == 1) { $self->{logger}->writeLogInfo("$options{logger_pre_message} -> disable service '" . $service_description . "'"); next if ($self->{discovery}->{dry_run} == 1); diff --git a/gorgone/gorgone/modules/centreon/autodiscovery/services/resources.pm b/gorgone/gorgone/modules/centreon/autodiscovery/services/resources.pm index 0975459c375..55d7a2a7634 100644 --- a/gorgone/gorgone/modules/centreon/autodiscovery/services/resources.pm +++ b/gorgone/gorgone/modules/centreon/autodiscovery/services/resources.pm @@ -215,7 +215,7 @@ sub get_rules { $rules->{ $_->[0] }->{linked_services} = {} if (!defined($rules->{ $_->[0] }->{linked_services})); $rules->{ $_->[0] }->{linked_services}->{ $_->[1] } = {} if (!defined($rules->{ $_->[0] }->{linked_services}->{ $_->[1] })); $rules->{ $_->[0] }->{linked_services}->{ $_->[1] }->{ $_->[2] } = { - service_activate => $_->[3], service_description => $_->[3] + service_activate => $_->[3], service_description => $_->[4] }; }