Merge pull request #45 from centreon/fix-svcdisco-fitler-rules

fix(disco): fix service discovery - filter rules
centreon · Sep 1, 2020 · 29a24ce · 29a24ce
2 parents 6835199 + 9b5b5c2
commit 29a24ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/gorgone/gorgone/modules/centreon/autodiscovery/services/discovery.pm b/gorgone/gorgone/modules/centreon/autodiscovery/services/discovery.pm
@@ -824,7 +824,7 @@ sub launchdiscovery {
     ($status, $message, my $rules) = gorgone::modules::centreon::autodiscovery::services::resources::get_rules(
         class_object_centreon => $self->{class_object_centreon},
         filter_rules => $options{data}->{content}->{filter_rules},
-        force_rule => $options{data}->{content}->{force_rule}
+        force_rule => (defined($options{data}->{content}->{force_rule}) && $options{data}->{content}->{force_rule} =~ /^1$/) ? 1 : 0
     );
     if ($status < 0) {
         $self->send_log_msg_error(token => $options{token}, subname => 'servicediscovery', number => $self->{uuid}, message => $message);

diff --git a/gorgone/gorgone/modules/centreon/autodiscovery/services/resources.pm b/gorgone/gorgone/modules/centreon/autodiscovery/services/resources.pm
@@ -103,9 +103,18 @@ sub get_rules {
     my (%options) = @_;
 
     my $filter = "rule_activate = '1' AND ";
-    if (defined($options{force_rule})) {
+    if (defined($options{force_rule}) && $options{force_rule} == 1) {
         $filter = '';
     }
+    if (defined($options{filter_rules}) && scalar(@{$options{filter_rules}}) > 0) {
+        my $append = '';
+        $filter .= 'rule_alias IN (';
+        foreach my $rule (@{$options{filter_rules}}) {
+            $filter .= $append . $options{class_object_centreon}->quote(value => $rule);
+            $append = ', ';
+        }
+        $filter .= ') AND ';
+    }
 
     my ($status, $rules) = $options{class_object_centreon}->custom_execute(
         request =>