From 03deb67cf66f1db7e54dc68d01531ac2432805e5 Mon Sep 17 00:00:00 2001
From: omercier <32134301+omercier@users.noreply.github.com>
Date: Tue, 5 Aug 2025 16:22:56 +0200
Subject: [PATCH] fix(packaging): reorganize common code for azure  (#5679)

because ApplicationInsights fatpacked plugin (and others) lacked a module

Refs: CTOR-1193
---
 .../pkg.json                                                  | 2 +-
 .../centreon-plugin-Cloud-Azure-Compute-Aks-Api/pkg.json      | 2 +-
 .../centreon-plugin-Cloud-Azure-Compute-Disk-Api/pkg.json     | 2 +-
 .../pkg.json                                                  | 1 +
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 1 +
 .../pkg.json                                                  | 2 +-
 .../centreon-plugin-Cloud-Azure-Database-MariaDB-Api/pkg.json | 1 +
 .../centreon-plugin-Cloud-Azure-Database-Redis-Api/pkg.json   | 1 +
 .../pkg.json                                                  | 1 +
 .../pkg.json                                                  | 1 +
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 1 +
 .../pkg.json                                                  | 1 +
 .../pkg.json                                                  | 1 +
 .../pkg.json                                                  | 3 ++-
 .../pkg.json                                                  | 1 +
 .../pkg.json                                                  | 4 ++--
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 1 +
 .../centreon-plugin-Cloud-Azure-Network-CDN-Api/pkg.json      | 1 +
 .../pkg.json                                                  | 2 +-
 .../centreon-plugin-Cloud-Azure-Network-Firewall-Api/pkg.json | 2 +-
 .../pkg.json                                                  | 1 +
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 2 +-
 .../centreon-plugin-Cloud-Azure-Network-PublicIP-Api/pkg.json | 2 +-
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 2 +-
 .../pkg.json                                                  | 1 +
 .../centreon-plugin-Cloud-Azure-Web-AppService-Api/pkg.json   | 1 +
 .../pkg.json                                                  | 1 +
 .../centreon-plugin-Cloud-Azure-Web-SignalR-Api/pkg.json      | 1 +
 .../azure/classicstorage/storageaccount/mode/discovery.pm     | 2 +-
 src/cloud/azure/common/appservice/mode/discovery.pm           | 2 +-
 .../azure/{management/monitor/mode => common}/discovery.pm    | 2 +-
 .../{management/monitor/mode => common}/discoverytenant.pm    | 4 ++--
 src/cloud/azure/compute/aks/mode/discovery.pm                 | 2 +-
 src/cloud/azure/compute/disk/mode/discovery.pm                | 2 +-
 src/cloud/azure/compute/virtualmachine/mode/discovery.pm      | 2 +-
 src/cloud/azure/compute/vmscalesets/mode/discovery.pm         | 2 +-
 src/cloud/azure/database/cosmosdb/mode/discovery.pm           | 2 +-
 src/cloud/azure/database/elasticpool/mode/discovery.pm        | 2 +-
 src/cloud/azure/database/mariadb/mode/discovery.pm            | 2 +-
 src/cloud/azure/database/redis/mode/discovery.pm              | 2 +-
 src/cloud/azure/database/sqldatabase/mode/discovery.pm        | 2 +-
 src/cloud/azure/database/sqlmanagedinstance/mode/discovery.pm | 2 +-
 src/cloud/azure/database/sqlserver/mode/discovery.pm          | 2 +-
 src/cloud/azure/datafactory/factories/mode/discovery.pm       | 2 +-
 src/cloud/azure/devtools/appconfiguration/mode/discovery.pm   | 2 +-
 src/cloud/azure/integration/servicebus/mode/discovery.pm      | 2 +-
 src/cloud/azure/management/apimanagement/mode/discovery.pm    | 2 +-
 .../azure/management/applicationinsights/mode/discovery.pm    | 2 +-
 src/cloud/azure/management/automation/mode/discovery.pm       | 2 +-
 src/cloud/azure/management/discover/plugin.pm                 | 4 ++--
 src/cloud/azure/management/monitor/plugin.pm                  | 4 ++--
 src/cloud/azure/management/recovery/mode/discovery.pm         | 2 +-
 src/cloud/azure/network/appgateway/mode/discovery.pm          | 2 +-
 src/cloud/azure/network/cdn/mode/discovery.pm                 | 2 +-
 src/cloud/azure/network/expressroute/mode/discovery.pm        | 2 +-
 src/cloud/azure/network/firewall/mode/discovery.pm            | 2 +-
 src/cloud/azure/network/frontdoor/mode/discovery.pm           | 2 +-
 src/cloud/azure/network/loadbalancer/mode/discovery.pm        | 2 +-
 src/cloud/azure/network/networkinterface/mode/discovery.pm    | 2 +-
 src/cloud/azure/network/publicip/mode/discovery.pm            | 2 +-
 src/cloud/azure/network/trafficmanager/mode/discovery.pm      | 2 +-
 src/cloud/azure/network/virtualnetwork/mode/discovery.pm      | 2 +-
 src/cloud/azure/network/vpngateway/mode/discovery.pm          | 2 +-
 src/cloud/azure/security/keyvault/mode/discovery.pm           | 2 +-
 src/cloud/azure/storage/acr/mode/discovery.pm                 | 2 +-
 src/cloud/azure/storage/storageaccount/mode/discovery.pm      | 2 +-
 src/cloud/azure/storage/storagesync/mode/discovery.pm         | 2 +-
 src/cloud/azure/web/appserviceplan/mode/discovery.pm          | 2 +-
 src/cloud/azure/web/signalr/mode/discovery.pm                 | 2 +-
 tests/resources/spellcheck/stopwords.txt                      | 3 +++
 82 files changed, 89 insertions(+), 68 deletions(-)
 rename src/cloud/azure/{management/monitor/mode => common}/discovery.pm (98%)
 rename src/cloud/azure/{management/monitor/mode => common}/discoverytenant.pm (98%)

diff --git a/packaging/centreon-plugin-Cloud-Azure-ClassicStorage-StorageAccount-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-ClassicStorage-StorageAccount-Api/pkg.json
index ab4d08781..b9781c75a 100644
--- a/packaging/centreon-plugin-Cloud-Azure-ClassicStorage-StorageAccount-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-ClassicStorage-StorageAccount-Api/pkg.json
@@ -6,7 +6,7 @@
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
         "cloud/azure/common/storageaccount/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/classicstorage/storageaccount/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Compute-Aks-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Compute-Aks-Api/pkg.json
index 5fa289145..46f5561ee 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Compute-Aks-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Compute-Aks-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/compute/aks/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Compute-Disk-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Compute-Disk-Api/pkg.json
index b5d1f3552..7d1edea34 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Compute-Disk-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Compute-Disk-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/compute/disk/"
     ]
 }
diff --git a/packaging/centreon-plugin-Cloud-Azure-Compute-Functions-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Compute-Functions-Api/pkg.json
index 71c4610c6..b47ee7fad 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Compute-Functions-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Compute-Functions-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_compute_functions_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/compute/functions/",
diff --git a/packaging/centreon-plugin-Cloud-Azure-Compute-VirtualMachine-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Compute-VirtualMachine-Api/pkg.json
index ef07eb074..fe17934f0 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Compute-VirtualMachine-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Compute-VirtualMachine-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/compute/virtualmachine/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Compute-Vmscalesets-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Compute-Vmscalesets-Api/pkg.json
index 8ffb1eea4..300183c9c 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Compute-Vmscalesets-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Compute-Vmscalesets-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/compute/vmscalesets/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-DataFactory-Factories-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-DataFactory-Factories-Api/pkg.json
index 70522df8e..8d130c676 100644
--- a/packaging/centreon-plugin-Cloud-Azure-DataFactory-Factories-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-DataFactory-Factories-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/datafactory/factories/"
     ]
 }
diff --git a/packaging/centreon-plugin-Cloud-Azure-Database-CosmosDb-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Database-CosmosDb-Api/pkg.json
index 87086d446..b15af0113 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Database-CosmosDb-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Database-CosmosDb-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_database_cosmosdb_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/database/cosmosdb/"
diff --git a/packaging/centreon-plugin-Cloud-Azure-Database-Elasticpool-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Database-Elasticpool-Api/pkg.json
index 5a68b219a..1674b46ea 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Database-Elasticpool-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Database-Elasticpool-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/database/elasticpool/"
     ]
 }
diff --git a/packaging/centreon-plugin-Cloud-Azure-Database-MariaDB-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Database-MariaDB-Api/pkg.json
index 3777a8e19..3593b33d6 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Database-MariaDB-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Database-MariaDB-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_database_mariadb_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/database/mariadb/"
diff --git a/packaging/centreon-plugin-Cloud-Azure-Database-Redis-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Database-Redis-Api/pkg.json
index e17953a36..2ed839f20 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Database-Redis-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Database-Redis-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_database_redis_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/database/redis/"
diff --git a/packaging/centreon-plugin-Cloud-Azure-Database-SqlDatabase-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Database-SqlDatabase-Api/pkg.json
index 4ab218f9b..8605ac291 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Database-SqlDatabase-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Database-SqlDatabase-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_database_sqldatabase_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/database/sqldatabase/"
diff --git a/packaging/centreon-plugin-Cloud-Azure-Database-SqlManagedInstance-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Database-SqlManagedInstance-Api/pkg.json
index 17b6e18de..2ed8f07c2 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Database-SqlManagedInstance-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Database-SqlManagedInstance-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_database_sqlmanagedinstance_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/database/sqlmanagedinstance/"
diff --git a/packaging/centreon-plugin-Cloud-Azure-Database-SqlServer-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Database-SqlServer-Api/pkg.json
index 023a14817..984dd9baa 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Database-SqlServer-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Database-SqlServer-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/database/sqlserver/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-DevTools-AppConfiguration-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-DevTools-AppConfiguration-Api/pkg.json
index 068c2e5b6..7cdb39a7f 100644
--- a/packaging/centreon-plugin-Cloud-Azure-DevTools-AppConfiguration-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-DevTools-AppConfiguration-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_devtools_appconfiguration_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/devtools/appconfiguration/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Integration-ServiceBus-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Integration-ServiceBus-Api/pkg.json
index 050870177..c2b6121da 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Integration-ServiceBus-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Integration-ServiceBus-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_integration_servicebus_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/integration/servicebus/"
diff --git a/packaging/centreon-plugin-Cloud-Azure-Management-ApiManagement-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Management-ApiManagement-Api/pkg.json
index ed5573188..501f6ca1d 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Management-ApiManagement-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Management-ApiManagement-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_management_apimanagement_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/management/apimanagement/"
diff --git a/packaging/centreon-plugin-Cloud-Azure-Management-ApplicationInsights-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Management-ApplicationInsights-Api/pkg.json
index fecc42ccc..09a23a906 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Management-ApplicationInsights-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Management-ApplicationInsights-Api/pkg.json
@@ -5,6 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/applicationinsights/"
+        "cloud/azure/management/applicationinsights/",
+        "cloud/azure/common/discovery.pm"
     ]
 }
diff --git a/packaging/centreon-plugin-Cloud-Azure-Management-Automation-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Management-Automation-Api/pkg.json
index 58f74ed78..6e18d2cab 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Management-Automation-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Management-Automation-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_management_automation_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/",
         "cloud/azure/management/automation/"
diff --git a/packaging/centreon-plugin-Cloud-Azure-Management-Discover-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Management-Discover-Api/pkg.json
index 70f7c4781..78312685e 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Management-Discover-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Management-Discover-Api/pkg.json
@@ -5,8 +5,8 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
-        "cloud/azure/management/monitor/mode/discoverytenant.pm",
+        "cloud/azure/common/discovery.pm",
+        "cloud/azure/common/discoverytenant.pm",
         "cloud/azure/management/discover/"
     ]
 }
diff --git a/packaging/centreon-plugin-Cloud-Azure-Management-Recovery-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Management-Recovery-Api/pkg.json
index cbd3f0a4b..e5741357d 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Management-Recovery-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Management-Recovery-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/management/recovery/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Management-Resource-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Management-Resource-Api/pkg.json
index 3026b3c7f..be59ab8f8 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Management-Resource-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Management-Resource-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/resource/"
     ]
 }
diff --git a/packaging/centreon-plugin-Cloud-Azure-Network-AppGateway-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Network-AppGateway-Api/pkg.json
index 7ef169fb4..b23dc342f 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Network-AppGateway-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Network-AppGateway-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_network_appgateway_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/network/appgateway/"
diff --git a/packaging/centreon-plugin-Cloud-Azure-Network-CDN-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Network-CDN-Api/pkg.json
index 75c82968f..2b960b734 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Network-CDN-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Network-CDN-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_network_cdn_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/network/cdn/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Network-ExpressRoute-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Network-ExpressRoute-Api/pkg.json
index 61e0a93ef..7bd4b5a91 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Network-ExpressRoute-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Network-ExpressRoute-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/network/expressroute/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Network-Firewall-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Network-Firewall-Api/pkg.json
index 01541fb76..f721ce19e 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Network-Firewall-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Network-Firewall-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/network/firewall/"
     ]
 }
diff --git a/packaging/centreon-plugin-Cloud-Azure-Network-FrontDoor-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Network-FrontDoor-Api/pkg.json
index edef59a3c..7f4da9779 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Network-FrontDoor-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Network-FrontDoor-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_network_frontdoor_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/network/frontdoor/"
diff --git a/packaging/centreon-plugin-Cloud-Azure-Network-LoadBalancer-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Network-LoadBalancer-Api/pkg.json
index 4f823e935..31e3cad73 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Network-LoadBalancer-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Network-LoadBalancer-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/network/loadbalancer/"
     ]
 }
diff --git a/packaging/centreon-plugin-Cloud-Azure-Network-NetworkInterface-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Network-NetworkInterface-Api/pkg.json
index 7f8a7653f..8f455ab7b 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Network-NetworkInterface-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Network-NetworkInterface-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/network/networkinterface/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Network-PublicIP-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Network-PublicIP-Api/pkg.json
index 4b8e0cc83..8fa774640 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Network-PublicIP-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Network-PublicIP-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/network/publicip/"
     ]
 }
diff --git a/packaging/centreon-plugin-Cloud-Azure-Network-TrafficManager-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Network-TrafficManager-Api/pkg.json
index 4c93e1dc0..075d12ca2 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Network-TrafficManager-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Network-TrafficManager-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/network/trafficmanager/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Network-VirtualNetwork-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Network-VirtualNetwork-Api/pkg.json
index 4942c0fee..fdbb66a1d 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Network-VirtualNetwork-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Network-VirtualNetwork-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/network/virtualnetwork/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Network-VpnGateway-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Network-VpnGateway-Api/pkg.json
index 536b5f19b..7ee75a6d1 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Network-VpnGateway-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Network-VpnGateway-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/network/vpngateway/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Security-KeyVault-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Security-KeyVault-Api/pkg.json
index 1c1fd8e92..3f5527ec4 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Security-KeyVault-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Security-KeyVault-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/security/keyvault/"
     ]
 }
diff --git a/packaging/centreon-plugin-Cloud-Azure-Storage-ContainerRegistry-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Storage-ContainerRegistry-Api/pkg.json
index d17c97b66..ce3bd0207 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Storage-ContainerRegistry-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Storage-ContainerRegistry-Api/pkg.json
@@ -5,7 +5,7 @@
     "files": [
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/storage/acr/"
     ]
 }
diff --git a/packaging/centreon-plugin-Cloud-Azure-Storage-StorageAccount-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Storage-StorageAccount-Api/pkg.json
index 3d9b59a15..7dc75890f 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Storage-StorageAccount-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Storage-StorageAccount-Api/pkg.json
@@ -6,7 +6,7 @@
         "centreon/plugins/script_custom.pm",
         "cloud/azure/custom/",
         "cloud/azure/common/storageaccount/",
-        "cloud/azure/management/monitor/mode/discovery.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/management/monitor/mode/health.pm",
         "cloud/azure/storage/storageaccount/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Storage-StorageSync-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Storage-StorageSync-Api/pkg.json
index 4ad359b92..2c4020831 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Storage-StorageSync-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Storage-StorageSync-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_storage_storagesync_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/storage/storagesync/"
     ]
diff --git a/packaging/centreon-plugin-Cloud-Azure-Web-AppService-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Web-AppService-Api/pkg.json
index 570108b1f..72a509110 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Web-AppService-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Web-AppService-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_web_appservice_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/web/appservice/",
diff --git a/packaging/centreon-plugin-Cloud-Azure-Web-AppServicePlan-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Web-AppServicePlan-Api/pkg.json
index 43987dee2..f0564254e 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Web-AppServicePlan-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Web-AppServicePlan-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_web_appserviceplan_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/web/appserviceplan/"
diff --git a/packaging/centreon-plugin-Cloud-Azure-Web-SignalR-Api/pkg.json b/packaging/centreon-plugin-Cloud-Azure-Web-SignalR-Api/pkg.json
index ef1d30023..302d2e35d 100644
--- a/packaging/centreon-plugin-Cloud-Azure-Web-SignalR-Api/pkg.json
+++ b/packaging/centreon-plugin-Cloud-Azure-Web-SignalR-Api/pkg.json
@@ -4,6 +4,7 @@
     "plugin_name": "centreon_azure_web_signalr_api.pl",
     "files": [
         "centreon/plugins/script_custom.pm",
+        "cloud/azure/common/discovery.pm",
         "cloud/azure/custom/",
         "cloud/azure/management/monitor/mode/",
         "cloud/azure/web/signalr/"
diff --git a/src/cloud/azure/classicstorage/storageaccount/mode/discovery.pm b/src/cloud/azure/classicstorage/storageaccount/mode/discovery.pm
index bae7e0e3e..8f385c52e 100644
--- a/src/cloud/azure/classicstorage/storageaccount/mode/discovery.pm
+++ b/src/cloud/azure/classicstorage/storageaccount/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::classicstorage::storageaccount::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/common/appservice/mode/discovery.pm b/src/cloud/azure/common/appservice/mode/discovery.pm
index 87ef8b36d..26e48ab8f 100644
--- a/src/cloud/azure/common/appservice/mode/discovery.pm
+++ b/src/cloud/azure/common/appservice/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::common::appservice::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/management/monitor/mode/discovery.pm b/src/cloud/azure/common/discovery.pm
similarity index 98%
rename from src/cloud/azure/management/monitor/mode/discovery.pm
rename to src/cloud/azure/common/discovery.pm
index ceb0233c5..c89725274 100644
--- a/src/cloud/azure/management/monitor/mode/discovery.pm
+++ b/src/cloud/azure/common/discovery.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package cloud::azure::management::monitor::mode::discovery;
+package cloud::azure::common::discovery;
 
 use base qw(centreon::plugins::mode);
 
diff --git a/src/cloud/azure/management/monitor/mode/discoverytenant.pm b/src/cloud/azure/common/discoverytenant.pm
similarity index 98%
rename from src/cloud/azure/management/monitor/mode/discoverytenant.pm
rename to src/cloud/azure/common/discoverytenant.pm
index 748edbe4f..2e95b33e9 100644
--- a/src/cloud/azure/management/monitor/mode/discoverytenant.pm
+++ b/src/cloud/azure/common/discoverytenant.pm
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-package cloud::azure::management::monitor::mode::discoverytenant;
+package cloud::azure::common::discoverytenant;
 
 use base qw(centreon::plugins::mode);
 
@@ -142,4 +142,4 @@ Prettify JSON output.
 
 =back
 
-=cut
\ No newline at end of file
+=cut
diff --git a/src/cloud/azure/compute/aks/mode/discovery.pm b/src/cloud/azure/compute/aks/mode/discovery.pm
index 634954959..5932cce47 100644
--- a/src/cloud/azure/compute/aks/mode/discovery.pm
+++ b/src/cloud/azure/compute/aks/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::compute::aks::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/compute/disk/mode/discovery.pm b/src/cloud/azure/compute/disk/mode/discovery.pm
index fa2c5bb3e..e61d91100 100644
--- a/src/cloud/azure/compute/disk/mode/discovery.pm
+++ b/src/cloud/azure/compute/disk/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::compute::disk::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/compute/virtualmachine/mode/discovery.pm b/src/cloud/azure/compute/virtualmachine/mode/discovery.pm
index 712dc1855..e0c7ca95e 100644
--- a/src/cloud/azure/compute/virtualmachine/mode/discovery.pm
+++ b/src/cloud/azure/compute/virtualmachine/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::compute::virtualmachine::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/compute/vmscalesets/mode/discovery.pm b/src/cloud/azure/compute/vmscalesets/mode/discovery.pm
index 69d0043d8..17b594772 100644
--- a/src/cloud/azure/compute/vmscalesets/mode/discovery.pm
+++ b/src/cloud/azure/compute/vmscalesets/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::compute::vmscalesets::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/database/cosmosdb/mode/discovery.pm b/src/cloud/azure/database/cosmosdb/mode/discovery.pm
index d737fbce0..9ee1c5287 100644
--- a/src/cloud/azure/database/cosmosdb/mode/discovery.pm
+++ b/src/cloud/azure/database/cosmosdb/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::database::cosmosdb::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/database/elasticpool/mode/discovery.pm b/src/cloud/azure/database/elasticpool/mode/discovery.pm
index 6867df326..65e97b5fd 100644
--- a/src/cloud/azure/database/elasticpool/mode/discovery.pm
+++ b/src/cloud/azure/database/elasticpool/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::database::elasticpool::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/database/mariadb/mode/discovery.pm b/src/cloud/azure/database/mariadb/mode/discovery.pm
index f8f5948a0..63bb21586 100644
--- a/src/cloud/azure/database/mariadb/mode/discovery.pm
+++ b/src/cloud/azure/database/mariadb/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::database::mariadb::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/database/redis/mode/discovery.pm b/src/cloud/azure/database/redis/mode/discovery.pm
index 0bec7a5fe..097a41649 100644
--- a/src/cloud/azure/database/redis/mode/discovery.pm
+++ b/src/cloud/azure/database/redis/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::database::redis::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/database/sqldatabase/mode/discovery.pm b/src/cloud/azure/database/sqldatabase/mode/discovery.pm
index 150f31788..caeb97fb8 100644
--- a/src/cloud/azure/database/sqldatabase/mode/discovery.pm
+++ b/src/cloud/azure/database/sqldatabase/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::database::sqldatabase::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/database/sqlmanagedinstance/mode/discovery.pm b/src/cloud/azure/database/sqlmanagedinstance/mode/discovery.pm
index 85c59b8ed..bb2c53f19 100644
--- a/src/cloud/azure/database/sqlmanagedinstance/mode/discovery.pm
+++ b/src/cloud/azure/database/sqlmanagedinstance/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::database::sqlmanagedinstance::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/database/sqlserver/mode/discovery.pm b/src/cloud/azure/database/sqlserver/mode/discovery.pm
index 2ee4a19a6..54dbf158c 100644
--- a/src/cloud/azure/database/sqlserver/mode/discovery.pm
+++ b/src/cloud/azure/database/sqlserver/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::database::sqlserver::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/datafactory/factories/mode/discovery.pm b/src/cloud/azure/datafactory/factories/mode/discovery.pm
index 21308c50d..bb4e86e4d 100644
--- a/src/cloud/azure/datafactory/factories/mode/discovery.pm
+++ b/src/cloud/azure/datafactory/factories/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::datafactory::factories::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/devtools/appconfiguration/mode/discovery.pm b/src/cloud/azure/devtools/appconfiguration/mode/discovery.pm
index bdddc4811..5afa4aef7 100644
--- a/src/cloud/azure/devtools/appconfiguration/mode/discovery.pm
+++ b/src/cloud/azure/devtools/appconfiguration/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::devtools::appconfiguration::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/integration/servicebus/mode/discovery.pm b/src/cloud/azure/integration/servicebus/mode/discovery.pm
index 29317c728..cef130895 100644
--- a/src/cloud/azure/integration/servicebus/mode/discovery.pm
+++ b/src/cloud/azure/integration/servicebus/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::integration::servicebus::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/management/apimanagement/mode/discovery.pm b/src/cloud/azure/management/apimanagement/mode/discovery.pm
index 581e5de5c..d6aed77bf 100644
--- a/src/cloud/azure/management/apimanagement/mode/discovery.pm
+++ b/src/cloud/azure/management/apimanagement/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::management::apimanagement::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/management/applicationinsights/mode/discovery.pm b/src/cloud/azure/management/applicationinsights/mode/discovery.pm
index 1631f4fdd..dddcdf47b 100644
--- a/src/cloud/azure/management/applicationinsights/mode/discovery.pm
+++ b/src/cloud/azure/management/applicationinsights/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::management::applicationinsights::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/management/automation/mode/discovery.pm b/src/cloud/azure/management/automation/mode/discovery.pm
index 0e5be295b..3e6ec37f3 100644
--- a/src/cloud/azure/management/automation/mode/discovery.pm
+++ b/src/cloud/azure/management/automation/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::management::automation::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/management/discover/plugin.pm b/src/cloud/azure/management/discover/plugin.pm
index a0646504a..4b31e7b10 100644
--- a/src/cloud/azure/management/discover/plugin.pm
+++ b/src/cloud/azure/management/discover/plugin.pm
@@ -31,8 +31,8 @@ sub new {
 
     $self->{version} = '1.0';
     %{$self->{modes}} = (
-        'discovery'              => 'cloud::azure::management::monitor::mode::discovery',
-        'discovery-tenant'       => 'cloud::azure::management::monitor::mode::discoverytenant'
+        'discovery'              => 'cloud::azure::common::discovery',
+        'discovery-tenant'       => 'cloud::azure::common::discoverytenant'
     );
 
     $self->{custom_modes}->{azcli} = 'cloud::azure::custom::azcli';
diff --git a/src/cloud/azure/management/monitor/plugin.pm b/src/cloud/azure/management/monitor/plugin.pm
index 658be8163..a0743acb3 100644
--- a/src/cloud/azure/management/monitor/plugin.pm
+++ b/src/cloud/azure/management/monitor/plugin.pm
@@ -32,8 +32,8 @@ sub new {
     $self->{version} = '1.0';
     %{$self->{modes}} = (
         'alert'                  => 'cloud::azure::management::monitor::mode::alert',
-        'discovery'              => 'cloud::azure::management::monitor::mode::discovery',
-        'discovery-tenant'       => 'cloud::azure::management::monitor::mode::discoverytenant',
+        'discovery'              => 'cloud::azure::common::discovery',
+        'discovery-tenant'       => 'cloud::azure::common::discoverytenant',
         'get-metrics'            => 'cloud::azure::management::monitor::mode::getmetrics',
         'health'                 => 'cloud::azure::management::monitor::mode::health'
     );
diff --git a/src/cloud/azure/management/recovery/mode/discovery.pm b/src/cloud/azure/management/recovery/mode/discovery.pm
index e0b5714fc..452b4cfd7 100644
--- a/src/cloud/azure/management/recovery/mode/discovery.pm
+++ b/src/cloud/azure/management/recovery/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::management::recovery::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/network/appgateway/mode/discovery.pm b/src/cloud/azure/network/appgateway/mode/discovery.pm
index 5a4af392e..3a5e65f36 100644
--- a/src/cloud/azure/network/appgateway/mode/discovery.pm
+++ b/src/cloud/azure/network/appgateway/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::network::appgateway::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/network/cdn/mode/discovery.pm b/src/cloud/azure/network/cdn/mode/discovery.pm
index 1f8c87b2e..6bad4bfef 100644
--- a/src/cloud/azure/network/cdn/mode/discovery.pm
+++ b/src/cloud/azure/network/cdn/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::network::cdn::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/network/expressroute/mode/discovery.pm b/src/cloud/azure/network/expressroute/mode/discovery.pm
index c171160cf..72ca83115 100644
--- a/src/cloud/azure/network/expressroute/mode/discovery.pm
+++ b/src/cloud/azure/network/expressroute/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::network::expressroute::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/network/firewall/mode/discovery.pm b/src/cloud/azure/network/firewall/mode/discovery.pm
index 24c29875f..33fbc6a1a 100644
--- a/src/cloud/azure/network/firewall/mode/discovery.pm
+++ b/src/cloud/azure/network/firewall/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::network::firewall::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/network/frontdoor/mode/discovery.pm b/src/cloud/azure/network/frontdoor/mode/discovery.pm
index ee1278b8e..c6ee443c7 100644
--- a/src/cloud/azure/network/frontdoor/mode/discovery.pm
+++ b/src/cloud/azure/network/frontdoor/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::network::frontdoor::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/network/loadbalancer/mode/discovery.pm b/src/cloud/azure/network/loadbalancer/mode/discovery.pm
index 0c218d4e8..ccb332225 100644
--- a/src/cloud/azure/network/loadbalancer/mode/discovery.pm
+++ b/src/cloud/azure/network/loadbalancer/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::network::loadbalancer::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/network/networkinterface/mode/discovery.pm b/src/cloud/azure/network/networkinterface/mode/discovery.pm
index 58d704e19..fbf9305a4 100644
--- a/src/cloud/azure/network/networkinterface/mode/discovery.pm
+++ b/src/cloud/azure/network/networkinterface/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::network::networkinterface::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/network/publicip/mode/discovery.pm b/src/cloud/azure/network/publicip/mode/discovery.pm
index 0a7cbd927..fb58168e2 100644
--- a/src/cloud/azure/network/publicip/mode/discovery.pm
+++ b/src/cloud/azure/network/publicip/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::network::publicip::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/network/trafficmanager/mode/discovery.pm b/src/cloud/azure/network/trafficmanager/mode/discovery.pm
index f48b66200..6fbf86556 100644
--- a/src/cloud/azure/network/trafficmanager/mode/discovery.pm
+++ b/src/cloud/azure/network/trafficmanager/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::network::trafficmanager::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/network/virtualnetwork/mode/discovery.pm b/src/cloud/azure/network/virtualnetwork/mode/discovery.pm
index 5c1002ed7..ff24f9db4 100644
--- a/src/cloud/azure/network/virtualnetwork/mode/discovery.pm
+++ b/src/cloud/azure/network/virtualnetwork/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::network::virtualnetwork::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/network/vpngateway/mode/discovery.pm b/src/cloud/azure/network/vpngateway/mode/discovery.pm
index 327f48873..96ab1d284 100644
--- a/src/cloud/azure/network/vpngateway/mode/discovery.pm
+++ b/src/cloud/azure/network/vpngateway/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::network::vpngateway::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/security/keyvault/mode/discovery.pm b/src/cloud/azure/security/keyvault/mode/discovery.pm
index a00e1e9d6..e85b0945a 100644
--- a/src/cloud/azure/security/keyvault/mode/discovery.pm
+++ b/src/cloud/azure/security/keyvault/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::security::keyvault::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/storage/acr/mode/discovery.pm b/src/cloud/azure/storage/acr/mode/discovery.pm
index b0c96e5ef..140e6239b 100644
--- a/src/cloud/azure/storage/acr/mode/discovery.pm
+++ b/src/cloud/azure/storage/acr/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::storage::acr::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/storage/storageaccount/mode/discovery.pm b/src/cloud/azure/storage/storageaccount/mode/discovery.pm
index 1e01fbea6..a7af32e76 100644
--- a/src/cloud/azure/storage/storageaccount/mode/discovery.pm
+++ b/src/cloud/azure/storage/storageaccount/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::storage::storageaccount::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/storage/storagesync/mode/discovery.pm b/src/cloud/azure/storage/storagesync/mode/discovery.pm
index 99ca74045..b6d72e65f 100644
--- a/src/cloud/azure/storage/storagesync/mode/discovery.pm
+++ b/src/cloud/azure/storage/storagesync/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::storage::storagesync::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/web/appserviceplan/mode/discovery.pm b/src/cloud/azure/web/appserviceplan/mode/discovery.pm
index f483e763d..44a33e767 100644
--- a/src/cloud/azure/web/appserviceplan/mode/discovery.pm
+++ b/src/cloud/azure/web/appserviceplan/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::web::appserviceplan::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/src/cloud/azure/web/signalr/mode/discovery.pm b/src/cloud/azure/web/signalr/mode/discovery.pm
index c4388dfb0..f1597dc1d 100644
--- a/src/cloud/azure/web/signalr/mode/discovery.pm
+++ b/src/cloud/azure/web/signalr/mode/discovery.pm
@@ -20,7 +20,7 @@
 
 package cloud::azure::web::signalr::mode::discovery;
 
-use base qw(cloud::azure::management::monitor::mode::discovery);
+use base qw(cloud::azure::common::discovery);
 
 use strict;
 use warnings;
diff --git a/tests/resources/spellcheck/stopwords.txt b/tests/resources/spellcheck/stopwords.txt
index 6a65907fd..4a03fcd3b 100644
--- a/tests/resources/spellcheck/stopwords.txt
+++ b/tests/resources/spellcheck/stopwords.txt
@@ -40,6 +40,7 @@ blocked-by-uf
 BPL
 --cacert-file
 cardtemperature
+CDN
 centreon
 Centreon
 centreonvault
@@ -99,6 +100,7 @@ Fortigate
 Fortinet
 FQDN
 FreeBSD
+FrontDoor
 frsevent
 GCP
 --get-param
@@ -258,6 +260,7 @@ scenarii
 --scope-datacenter
 SFOS
 sfp.temperature
+SignalR
 sinr
 --skip-ssl-check
 SkyHigh