diff --git a/pandora_console/include/class/CredentialStore.class.php b/pandora_console/include/class/CredentialStore.class.php index adf9d6ed06..616c56d0cb 100644 --- a/pandora_console/include/class/CredentialStore.class.php +++ b/pandora_console/include/class/CredentialStore.class.php @@ -875,7 +875,7 @@ class CredentialStore extends Wizard 'AWS' => __('Aws'), 'AZURE' => __('Azure'), 'SAP' => __('SAP'), - // 'GOOGLE' => __('Google'), + 'GOOGLE' => __('Google'), ], 'selected' => (isset($values['product']) ? $values['product'] : 'CUSTOM'), 'disabled' => (bool) $values['product'], diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php index d32dacb1fe..7d955973c0 100644 --- a/pandora_console/include/constants.php +++ b/pandora_console/include/constants.php @@ -618,7 +618,8 @@ define('DISCOVERY_CLOUD_AZURE_COMPUTE', 8); define('DISCOVERY_DEPLOY_AGENTS', 9); define('DISCOVERY_APP_SAP', 10); define('DISCOVERY_APP_DB2', 11); - +define('DISCOVERY_APP_MICROSOFT_SQL_SERVER', 12); +define('DISCOVERY_CLOUD_GCP_COMPUTE_ENGINE', 13); // Force task build tmp results. define('DISCOVERY_REVIEW', 0); @@ -637,6 +638,7 @@ define('DISCOVERY_SCRIPT_IPMI_RECON', 4); // Discovery task descriptions. define('CLOUDWIZARD_AZURE_DESCRIPTION', 'Discovery.Cloud.Azure.Compute'); define('CLOUDWIZARD_AWS_DESCRIPTION', 'Discovery.Cloud.AWS.EC2'); +define('CLOUDWIZARD_GOOGLE_DESCRIPTION', 'Discovery.Cloud.GCP'); define('CLOUDWIZARD_VMWARE_DESCRIPTION', 'Discovery.App.VMware'); // Background options. diff --git a/pandora_server/lib/PandoraFMS/Recon/Base.pm b/pandora_server/lib/PandoraFMS/Recon/Base.pm index 1f6e13f2e6..aaf60eb581 100644 --- a/pandora_server/lib/PandoraFMS/Recon/Base.pm +++ b/pandora_server/lib/PandoraFMS/Recon/Base.pm @@ -38,9 +38,11 @@ use constant { DISCOVERY_CLOUD_AWS_EC2 => 6, DISCOVERY_CLOUD_AWS_RDS => 7, DISCOVERY_CLOUD_AZURE_COMPUTE => 8, + DISCOVERY_CLOUD_GCP_COMPUTE_ENGINE => 13, DISCOVERY_DEPLOY_AGENTS => 9, DISCOVERY_APP_SAP => 10, DISCOVERY_APP_DB2 => 11, + DISCOVERY_APP_MICROSOFT_SQL_SERVER => 12, DISCOVERY_REVIEW => 0, DISCOVERY_STANDARD => 1, DISCOVERY_RESULTS => 2,