Refactor code structure for improved readability and maintainability

Author: artafres

Solutions/CiscoUmbrella/Data Connectors/CiscoUmbrella_CCP/CiscoUmbrella_DataConnectorDefinition.json

@@ -1,21 +1,21 @@
 {
   "name": "CiscoUmbrellaConnector",
-  "apiVersion": "2022-09-01-preview",
+  "apiVersion": "2025-09-01",
   "type": "Microsoft.SecurityInsights/dataConnectorDefinitions",
   "location": "{{location}}",
   "kind": "Customizable",
   "properties": {
     "connectorUiConfig": {
       "id": "CiscoUmbrellaConnector",
       "title": "Cisco Umbrella (via Codeless Connector Framework)",
-      "publisher": "Cisco",
+      "publisher": "Microsoft",
       "descriptionMarkdown": "The Cisco Cloud Security solution for Microsoft Sentinel enables you to ingest [Cisco Secure Access](https://securitydocs.cisco.com/secure-access-sub-landing-page) and [Cisco Umbrella](https://securitydocs.cisco.com/umbrella-sub-landing-page) logs stored in Cisco-managed Amazon S3 Bucket into Microsoft Sentinel using the Amazon S3 REST API. Refer to [Cisco Cloud Security log management documentation](https://securitydocs.cisco.com/docs/csa/olh/118897.dita) for more information.",
       "graphQueriesTableName": "CiscoUmbrellaAdminAudit_CL",
       "graphQueries": [
         {
           "metricName": "Total Admin Audit Logs received",
           "legend": "Cisco Admin Audit Logs",
-          "baseQuery": "{{graphQueriesTableName}}"
+          "baseQuery": "CiscoUmbrellaAdminAudit_CL"
         },
         {
           "metricName": "Total Cloud Firewall Logs received",
@@ -66,7 +66,7 @@
       "sampleQueries": [
         {
           "description": "Get sample of Cisco Admin Audit Logs",
-          "query": "{{graphQueriesTableName}} | take 10"
+          "query": "CiscoUmbrellaAdminAudit_CL | take 10"
         },
         {
           "description": "Get sample of Cisco Cloud Firewall Logs",
@@ -107,8 +107,8 @@
       ],
       "dataTypes": [
         {
-          "name": "{{graphQueriesTableName}}",
-          "lastDataReceivedQuery": "{{graphQueriesTableName}}\n | where TimeGenerated > ago(12h) | summarize Time = max(TimeGenerated)\n | where isnotempty(Time)"
+          "name": "CiscoUmbrellaAdminAudit_CL",
+          "lastDataReceivedQuery": "CiscoUmbrellaAdminAudit_CL\n | where TimeGenerated > ago(12h) | summarize Time = max(TimeGenerated)\n | where isnotempty(Time)"
         },
         {
           "name": "CiscoUmbrellaCloudFirewall_CL",
@@ -153,7 +153,7 @@
         }
       ],
       "availability": {
-        "isPreview": true,
+        "isPreview": false,
         "status": 1
       },
       "permissions": {

Solutions/CiscoUmbrella/Data/Solution_CiscoUmbrella.json

@@ -46,7 +46,7 @@
     "Playbooks/CiscoUmbrellaPlaybooks/CiscoUmbrella-GetDomainInfo/azuredeploy.json"
   ],
   "BasePath": "C:\\GitHub\\Azure-Sentinel\\Solutions\\CiscoUmbrella",
-  "Version": "3.1.0",
+  "Version": "3.2.0",
   "Metadata": "SolutionMetadata.json",
   "TemplateSpec": true
 }