Merge branch 'ent-6377-proyectos-amazon-s3-en-el-discovery' into 'develop'

Minor changes

See merge request artica/pandorafms!3930

pandora_console/godmode/wizards/DiscoveryTaskList.class.php

@@ -713,6 +713,19 @@ class DiscoveryTaskList extends HTML
                         $data[6] .= __('Discovery.Cloud.Aws.RDS');
                     break;
 
+                    case DISCOVERY_CLOUD_AWS_S3:
+                        // Discovery Cloud S3.
+                        $data[6] = html_print_image(
+                            'images/op_network.png',
+                            true,
+                            [
+                                'title' => __('Discovery Cloud S3'),
+                                'class' => 'invert_filter',
+                            ]
+                        ).'  ';
+                        $data[6] .= __('Discovery.Cloud.Aws.S3');
+                    break;
+
                     case DISCOVERY_APP_MYSQL:
                         // Discovery Applications MySQL.
                         $data[6] = html_print_image(
@@ -868,6 +881,7 @@ class DiscoveryTaskList extends HTML
                         && $task['type'] != DISCOVERY_APP_DB2
                         && $task['type'] != DISCOVERY_APP_SAP
                         && $task['type'] != DISCOVERY_CLOUD_AWS_RDS
+                        && $task['type'] != DISCOVERY_CLOUD_AWS_S3
                     ) {
                         if (check_acl($config['id_user'], 0, 'MR')) {
                             $data[9] .= '<a href="#" onclick="show_map('.$task['id_rt'].',\''.$task['name'].'\')">';
@@ -1046,6 +1060,9 @@ class DiscoveryTaskList extends HTML
                         case DISCOVERY_CLOUD_AZURE_COMPUTE:
                         return 'wiz=cloud&mode=azure&ki='.$task['auth_strings'].'&sub=compute&page=0';
 
+                        case DISCOVERY_CLOUD_AWS_S3:
+                        return 'wiz=cloud&mode=amazonws&ki='.$task['auth_strings'].'&sub=s3&page=0';
+
                         default:
                         return 'wiz=cloud';
                     }

pandora_console/include/constants.php

@@ -626,6 +626,7 @@ define('DISCOVERY_APP_SAP', 10);
 define('DISCOVERY_APP_DB2', 11);
 define('DISCOVERY_APP_MICROSOFT_SQL_SERVER', 12);
 define('DISCOVERY_CLOUD_GCP_COMPUTE_ENGINE', 13);
+define('DISCOVERY_CLOUD_AWS_S3', 14);
 
 // Force task build tmp results.
 define('DISCOVERY_REVIEW', 0);

pandora_server/lib/PandoraFMS/DiscoveryServer.pm

@@ -49,7 +49,7 @@ my %PendingTasks :shared;
 my $Sem :shared;
 my $TaskSem :shared;
 
-# IDs from tconfig_os.
+# Some required constants, OS_X from tconfig_os.
 use constant {
   OS_OTHER => 10,
   OS_ROUTER => 17,
@@ -63,17 +63,6 @@ use constant {
   STEP_STATISTICS => 1,
   STEP_APP_SCAN => 2,
   STEP_CUSTOM_QUERIES => 3,
-  DISCOVERY_HOSTDEVICES => 0,
-  DISCOVERY_HOSTDEVICES_CUSTOM => 1,
-  DISCOVERY_CLOUD_AWS => 2,
-  DISCOVERY_APP_VMWARE => 3,
-  DISCOVERY_APP_MYSQL => 4,
-  DISCOVERY_APP_ORACLE => 5,
-  DISCOVERY_CLOUD_AWS_EC2 => 6,
-  DISCOVERY_CLOUD_AWS_RDS => 7,
-  DISCOVERY_CLOUD_AZURE_COMPUTE => 8,
-  DISCOVERY_DEPLOY_AGENTS => 9,
-  DISCOVERY_APP_SAP => 10,
   DISCOVERY_REVIEW => 0,
   DISCOVERY_STANDARD => 1,
   DISCOVERY_RESULTS => 2,

pandora_server/lib/PandoraFMS/Tools.pm

@@ -86,6 +86,7 @@ our @EXPORT = qw(
 	DISCOVERY_APP_ORACLE
 	DISCOVERY_CLOUD_AWS_EC2
 	DISCOVERY_CLOUD_AWS_RDS
+	DISCOVERY_CLOUD_AWS_S3
 	DISCOVERY_CLOUD_AZURE_COMPUTE
 	DISCOVERY_DEPLOY_AGENTS
 	DISCOVERY_APP_SAP
@@ -220,6 +221,7 @@ use constant DISCOVERY_APP_SAP => 10;
 use constant DISCOVERY_APP_DB2 => 11;
 use constant DISCOVERY_APP_MICROSOFT_SQL_SERVER => 12;
 use constant DISCOVERY_CLOUD_GCP_COMPUTE_ENGINE => 13;
+use constant DISCOVERY_CLOUD_AWS_S3 => 14;
 
 # Set OS, OS version and /dev/null
 our $OS = $^O;