[AZINTS-1972] Update Subscription level to move resource collection s…

…tuff to be its own section
DataDog · Nov 17, 2023 · d18d4f9 · d18d4f9
1 parent 8123798
commit d18d4f9
Showing 1 changed file with 36 additions and 16 deletions.
diff --git a/azure/deploy-to-azure/azure-integration/CreateUIDefinition.json b/azure/deploy-to-azure/azure-integration/CreateUIDefinition.json
@@ -33,7 +33,6 @@
     "steps": [
       {
         "name": "servicePrincipal",
-        "type": "Microsoft.Common.Section",
         "label": "Service Principal",
         "elements": [
           {
@@ -81,7 +80,6 @@
       },
       {
         "name": "datadogConfig",
-        "type": "Microsoft.Common.Section",
         "label": "Datadog Configuration",
         "elements": [
           {
@@ -248,32 +246,54 @@
                 "toolTip": "Whether or not to use automute for hosts",
                 "defaultValue": "true"
               },
+              {
+                "name": "custom_metrics_enabled",
+                "type": "Microsoft.Common.CheckBox",
+                "label": "Collect Custom Metrics",
+                "toolTip": "This option will enable custom metric collection from all Application Insights instances within the scope of this configuration. These custom metrics will appear in datadog under the namespace <b>application_insights.custom.&lt;METRIC_NAME&gt;</b>.<br> Note that <a target='_blank' href='https://learn.microsoft.com/en-us/azure/azure-monitor/app/standard-metrics/'>Standard</a> App Insights metrics are collected automatically and are available under the <b>azure.insights_components.*</b> namespace."
+              }
+            ],
+            "visible": true
+          },
+          {
+            "name": "resourceCollection",
+            "type": "Microsoft.Common.Section",
+            "label": "Resource Collection",
+            "elements": [
+              {
+                "name": "resource_collection_info",
+                "type": "Microsoft.Common.TextBlock",
+                "options": {
+                  "text": "Collect configuration information about the resources monitored with this App Registration."
+                }
+              },
               {
                 "name": "resource_collection_enabled",
                 "type": "Microsoft.Common.CheckBox",
-                "label": "Resource Collection",
+                "label": "Enable Resource Collection",
                 "toolTip": "When enabled, Datadog collects metadata and configuration info from cloud resources (compute instances, databases, load balancers, etc.) in your Azure environment."
               },
+              {
+                "name": "insights_info",
+                "type": "Microsoft.Common.TextBlock",
+                "options": {
+                  "text": "Where to view insights:"
+                }
+              },
               {
                 "name": "cspm_enabled",
                 "type": "Microsoft.Common.CheckBox",
-                "label": "Cloud Security Management",
+                "label": "• Cloud Security Management:",
                 "toolTip": "When enabled, Datadog's Cloud Security Management product will scan resource configurations for resources monitored by this app registration. Note: This requires Resource Collection to be enabled.",
-                "visible": "[steps('datadogConfig').integrationConfig.resource_collection_enabled]"
+                "visible": "[steps('datadogConfig').resourceCollection.resource_collection_enabled]"
               },
               {
                 "name": "cspm_placeholder",
                 "type": "Microsoft.Common.TextBlock",
-                "visible": "[not(steps('datadogConfig').integrationConfig.resource_collection_enabled)]",
+                "visible": "[not(steps('datadogConfig').resourceCollection.resource_collection_enabled)]",
                 "options": {
-                  "text": "Cloud Security Management: \t \t \t \t \t \t \t \t \t \t \t \t Resource Collection is required to enable this"
+                  "text": "• Cloud Security Management: To enable this, Resource Collection must be enabled"
                 }
-              },
-              {
-                "name": "custom_metrics_enabled",
-                "type": "Microsoft.Common.CheckBox",
-                "label": "Collect Custom Metrics",
-                "toolTip": "This option will enable custom metric collection from all Application Insights instances within the scope of this configuration. These custom metrics will appear in datadog under the namespace <b>application_insights.custom.&lt;METRIC_NAME&gt;</b>.<br> Note that <a target='_blank' href='https://learn.microsoft.com/en-us/azure/azure-monitor/app/standard-metrics/'>Standard</a> App Insights metrics are collected automatically and are available under the <b>azure.insights_components.*</b> namespace."
               }
             ],
             "visible": true
@@ -294,9 +314,9 @@
       "appServicePlanFilters": "[steps('datadogConfig').integrationConfig.appServicePlanFilters]",
       "containerAppFilters": "[steps('datadogConfig').integrationConfig.containerAppFilters]",
       "automute": "[steps('datadogConfig').integrationConfig.automute]",
-      "cspm_enabled": "[steps('datadogConfig').integrationConfig.cspm_enabled]",
-      "resource_collection_enabled": "[steps('datadogConfig').integrationConfig.resource_collection_enabled]",
-      "custom_metrics_enabled": "[steps('datadogConfig').integrationConfig.custom_metrics_enabled]"
+      "custom_metrics_enabled": "[steps('datadogConfig').integrationConfig.custom_metrics_enabled]",
+      "cspm_enabled": "[steps('datadogConfig').resourceCollection.cspm_enabled]",
+      "resource_collection_enabled": "[steps('datadogConfig').resourceCollection.resource_collection_enabled]"
     }
   }
 }