Enh servicedisco api migrate

gorgone/docs/modules/centreon/autodiscovery.md

@@ -6,10 +6,13 @@ This module aims to extend Centreon Autodiscovery server functionalities.
 
 ## Configuration
 
-| Directive       | Description                                                            | Default value |
-|:----------------|:-----------------------------------------------------------------------|:--------------|
-| global\_timeout | Time in seconds before a discovery command is considered timed out     | `300`         |
-| check\_interval | Time in seconds defining frequency at which results will be search for | `15`          |
+| Directive                            | Description                                                                                       | Default value |
+| :----------------------------------- | :------------------------------------------------------------------------------------------------ | :------------ |
+| global\_timeout                      | Time in seconds before a discovery command is considered timed out                                | `300`         |
+| check\_interval                      | Time in seconds defining frequency at which results will be search for                            | `15`          |
+| service\_parrallel\_commands\_poller | Number of commands run simultaneously on each Poller                                              | `8`           |
+| service\_check\_interval             | Time in seconds defining frequency at which results will be search for (for services discoveries) | `15`          |
+| service\_timeout                     | Time in seconds before a service discovery command is considered timed out                        | `90`          |
 
 #### Example
 
@@ -19,6 +22,9 @@ package: "gorgone::modules::centreon::autodiscovery::hooks"
 enable: true
 global_timeout: 60
 check_interval: 10
+service_parrallel_commands_poller: 15
+service_check_interval: 5
+service_timeout: 60
 ```
 
 ## Events
@@ -192,9 +198,9 @@ curl --request POST "https://hostname:8443/api/centreon/autodiscovery/hosts" \
 
 #### Headers
 
-| Header | Value            |
-|:-------|:-----------------|
-| Accept | application/json |
+| Header       | Value            |
+|:-------------|:-----------------|
+| Accept       | application/json |
 
 #### Path variables
 

gorgone/gorgone/class/tpapi/centreonv2.pm

@@ -59,6 +59,16 @@ sub error {
     return $self->{error};
 }
 
+sub get_username {
+    my ($self, %options) = @_;
+
+    if ($self->{is_error} == 1) {
+        return undef;
+    }
+
+    return $self->{username};
+}
+
 sub set_configuration {
     my ($self, %options) = @_;
 
@@ -197,7 +207,8 @@ sub request {
         critical_status => ''
     );
 
-    my $decoded = $self->json_decode(content => $content);
+    my $decoded = undef;
+    $decoded = $self->json_decode(content => $content) if (defined($content) && $content ne "");
 
     # code 403 means forbidden (token not good maybe)
     if ($self->{http}->get_code() == 403) {
@@ -217,8 +228,6 @@ sub request {
         return 1;
     }
 
-    return 1 if (!defined($decoded));
-
     return (0, $decoded);
 }
 
@@ -238,7 +247,7 @@ sub get_monitoring_hosts {
     if (defined($options{search})) {
         $get_param = ['search=' . $options{search}];
     }
-    
+
     return $self->request(
         method => 'GET',
         endpoint => $endpoint,
@@ -253,7 +262,7 @@ sub get_platform_versions {
     return $self->request(
         method => 'GET',
         endpoint => '/platform/versions'
-    );    
+    );
 }
 
 sub get_scheduling_jobs {
@@ -272,6 +281,23 @@ sub get_scheduling_jobs {
     );
 }
 
+sub monitoring_server_generate_reload {
+    my ($self, %options) = @_;
+
+    if (!defined($options{monitoring_server_id})) {
+        $self->{is_error} = 1;
+        $self->{error} = 'monitoring_server_id option missing';
+        return 1;
+    }
+
+    # {protocol}://{server}:{port}/centreon/api/{version}/configuration/monitoring-servers/{monitoring_server_id}/generate-and-reload
+    my $endpoint = '/configuration/monitoring-servers/' . $options{monitoring_server_id} . '/generate-and-reload';
+    return $self->request(
+        method => 'GET',
+        endpoint => $endpoint
+    );
+}
+
 sub DESTROY {
     my ($self) = @_;
 

gorgone/gorgone/modules/centreon/autodiscovery/class.pm

@@ -27,7 +27,6 @@ use warnings;
 use gorgone::standard::library;
 use gorgone::standard::constants qw(:all);
 use gorgone::modules::centreon::autodiscovery::services::discovery;
-use gorgone::class::tpapi::clapi;
 use gorgone::class::tpapi::centreonv2;
 use gorgone::class::sqlquery;
 use gorgone::class::frame;
@@ -69,7 +68,6 @@ sub new {
         $options{config}->{global_timeout} =~ /(\d+)/) ? $1 : 300;
     $connector->{check_interval} = (defined($options{config}->{check_interval}) &&
         $options{config}->{check_interval} =~ /(\d+)/) ? $1 : 15;
-    $connector->{tpapi_clapi_name} = defined($options{config}->{tpapi_clapi}) && $options{config}->{tpapi_clapi} ne '' ? $options{config}->{tpapi_clapi} : 'clapi';
     $connector->{tpapi_centreonv2_name} = defined($options{config}->{tpapi_centreonv2}) && $options{config}->{tpapi_centreonv2} ne '' ? 
         $options{config}->{tpapi_centreonv2} : 'centreonv2';
 
@@ -1056,7 +1054,7 @@ sub action_launchservicediscovery {
     my $svc_discovery = gorgone::modules::centreon::autodiscovery::services::discovery->new(
         module_id => $self->{module_id},
         logger => $self->{logger},
-        tpapi_clapi => $self->{tpapi_clapi},
+        tpapi_centreonv2 => $self->{tpapi_centreonv2},
         internal_socket => $self->{internal_socket},
         config => $self->{config},
         config_core => $self->{config_core},
@@ -1144,10 +1142,6 @@ sub periodic_exec {
 sub run {
     my ($self, %options) = @_;
 
-    $self->{tpapi_clapi} = gorgone::class::tpapi::clapi->new();
-    $self->{tpapi_clapi}->set_configuration(
-        config => $self->{tpapi}->get_configuration(name => $self->{tpapi_clapi_name})
-    );
     $self->{tpapi_centreonv2} = gorgone::class::tpapi::centreonv2->new();
     my ($status) = $self->{tpapi_centreonv2}->set_configuration(
         config => $self->{tpapi}->get_configuration(name => $self->{tpapi_centreonv2_name}),

gorgone/gorgone/modules/centreon/autodiscovery/services/discovery.pm

@@ -41,13 +41,18 @@ sub new {
     $connector->{class_object_centreon} = $options{class_object_centreon};
     $connector->{class_object_centstorage} = $options{class_object_centstorage};
     $connector->{class_autodiscovery} = $options{class_autodiscovery};
-    $connector->{tpapi_clapi} = $options{tpapi_clapi};
+    $connector->{tpapi_centreonv2} = $options{tpapi_centreonv2};
     $connector->{mail_subject} = defined($connector->{config}->{mail_subject}) ? $connector->{config}->{mail_subject} : 'Centreon Auto Discovery';
     $connector->{mail_from} = defined($connector->{config}->{mail_from}) ? $connector->{config}->{mail_from} : 'centreon-autodisco';
+    $connector->{service_parrallel_commands_poller} = (defined($options{config}->{service_parrallel_commands_poller}) &&
+        $options{config}->{service_parrallel_commands_poller} =~ /(\d+)/) ? $1 : 8;
+    $connector->{service_check_interval} = (defined($options{config}->{service_check_interval}) &&
+        $options{config}->{service_check_interval} =~ /(\d+)/) ? $1 : 15;
+    $connector->{service_timeout} = (defined($options{config}->{service_timeout}) &&
+        $options{config}->{service_timeout} =~ /(\d+)/) ? $1 : 90;
 
     $connector->{service_pollers} = {};
     $connector->{audit_user_id} = undef;
-    $connector->{service_parrallel_commands_poller} = 8;
     $connector->{service_current_commands_poller} = {};
     $connector->{finished} = 0;
     $connector->{post_execution} = 0;
@@ -188,17 +193,11 @@ sub restart_pollers {
     my $poller_ids = {};
     foreach my $poller_id (keys %{$self->{discovery}->{pollers_reload}}) {
         $self->{logger}->writeLogInfo("[autodiscovery] -servicediscovery- $self->{uuid} generate poller config '" . $poller_id . "'");
-        $self->send_internal_action({
-            action => 'COMMAND',
-            token => $self->{discovery}->{token} . ':config',
-            data => {
-                content => [
-                    {
-                        command => $self->{tpapi_clapi}->get_applycfg_command(poller_id => $poller_id)
-                    }
-                ]
-            }
-        });
+
+        my ($status, $results) = $self->{tpapi_centreonv2}->monitoring_server_generate_reload(monitoring_server_id => $poller_id);
+        if ($status != 0) {
+            $self->{logger}->writeLogError("[autodiscovery] -servicediscovery- $self->{uuid} cannot generate poller config - " . $self->{tpapi_centreonv2}->error());
+        }
     }
 }
 
@@ -785,8 +784,8 @@ sub service_execute_commands {
                             event => 'SERVICEDISCOVERYLISTENER',
                             target => $poller_id,
                             token => 'svc-disco-' . $self->{uuid} . '-' . $rule_id . '-' . $host_id,
-                            timeout => 120,
-                            log_pace => 15
+                            timeout => $self->{service_timeout} + $self->{service_check_interval} + 15,
+                            log_pace => $self->{service_check_interval}
                         }
                     ]
                 });
@@ -800,7 +799,7 @@ sub service_execute_commands {
                         content => [
                             {
                                 command => $command,
-                                timeout => 90
+                                timeout => $self->{service_timeout}
                             }
                         ]
                     }
@@ -850,13 +849,18 @@ sub launchdiscovery {
         return -1;
     }
 
-    if (!defined($self->{tpapi_clapi}->get_username())) {
-        $self->send_log_msg_error(token => $options{token}, subname => 'servicediscovery', number => $self->{uuid}, message => 'clapi ' . $self->{tpapi_clapi}->error());
+    if (!defined($self->{tpapi_centreonv2}->get_username())) {
+        $self->send_log_msg_error(
+            token => $options{token},
+            subname => 'servicediscovery',
+            number => $self->{uuid},
+            message => 'cannot get api user: ' . $self->{tpapi_centreonv2}->error()
+        );
         return -1;
     }
     ($status, $message, my $user_id) = gorgone::modules::centreon::autodiscovery::services::resources::get_audit_user_id(
         class_object_centreon => $self->{class_object_centreon},
-        clapi_user => $self->{tpapi_clapi}->get_username()
+        user => $self->{tpapi_centreonv2}->get_username()
     );
     if ($status < 0) {
         $self->send_log_msg_error(token => $options{token}, subname => 'servicediscovery', number => $self->{uuid}, message => $message);

gorgone/gorgone/modules/centreon/autodiscovery/services/resources.pm

@@ -85,7 +85,7 @@ sub get_audit_user_id {
 
     my ($status, $contacts) = $options{class_object_centreon}->custom_execute(
         request => 'SELECT contact_id FROM contact WHERE contact_alias = ?',
-        bind_values => [$options{clapi_user}],
+        bind_values => [$options{user}],
         mode => 2
     );
     if ($status == -1) {
@@ -458,7 +458,7 @@ sub get_macros_host {
             my $macro_value = $_->[1];
             my $is_password = $_->[2];
             # Replace macro value if a vault is used
-            if (defined($options{vault_count}) && $options{vault_count} > 0 && defined($is_password) && $is_password == 1) {
+            if (defined($options{vault_count}) && defined($is_password) && $is_password == 1) {
                 set_macro(\%macros, $macro_name, "{" . $macro_name . "::secret::" . $macro_value . "}");
             } else {
                 set_macro(\%macros, $macro_name, $macro_value);