[AZINTS-1972] move logic into ui definition template instead of deplo…

…y template
DataDog · Nov 20, 2023 · a8b90ca · a8b90ca
1 parent 2382a96
commit a8b90ca
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/azure/deploy-to-azure/azure-integration/CreateUIDefinition-managementgroups.json b/azure/deploy-to-azure/azure-integration/CreateUIDefinition-managementgroups.json
@@ -334,7 +334,7 @@
       "automute": "[steps('datadogConfig').metrics.automute]",
       "custom_metrics_enabled": "[steps('datadogConfig').metrics.custom_metrics_enabled]",
       "resource_collection_enabled": "[steps('datadogConfig').resourceCollection.resource_collection_enabled]",
-      "cspm_enabled": "[steps('datadogConfig').resourceCollection.cspm_enabled]"
+      "cspm_enabled": "[and(steps('datadogConfig').resourceCollection.cspm_enabled, steps('datadogConfig').resourceCollection.resource_collection_enabled)]"
     }
   }
 }
diff --git a/azure/deploy-to-azure/azure-integration/CreateUIDefinition.json b/azure/deploy-to-azure/azure-integration/CreateUIDefinition.json
@@ -308,8 +308,8 @@
       "containerAppFilters": "[steps('datadogConfig').integrationConfig.containerAppFilters]",
       "automute": "[steps('datadogConfig').integrationConfig.automute]",
       "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]"
+      "resource_collection_enabled": "[steps('datadogConfig').resourceCollection.resource_collection_enabled]",
+      "cspm_enabled": "[and(steps('datadogConfig').resourceCollection.cspm_enabled, steps('datadogConfig').resourceCollection.resource_collection_enabled)]"
     }
   }
 }
diff --git a/azure/deploy-to-azure/azure-integration/azuredeploy-managementgroups.json b/azure/deploy-to-azure/azure-integration/azuredeploy-managementgroups.json
@@ -178,7 +178,7 @@
                         "value": "[parameters('resource_collection_enabled')]"
                     },
                     "cspm_enabled": {
-                        "value": "[and(parameters('cspm_enabled'), parameters('resource_collection_enabled'))]"
+                        "value": "[parameters('cspm_enabled')]"
                     },
                     "custom_metrics_enabled": {
                         "value": "[parameters('custom_metrics_enabled')]"

diff --git a/azure/deploy-to-azure/azure-integration/azuredeploy.json b/azure/deploy-to-azure/azure-integration/azuredeploy.json
@@ -207,7 +207,7 @@
                     },
                     {
                         "name": "cspm_enabled",
-                        "value": "[and(parameters('cspm_enabled'), parameters('resource_collection_enabled'))]"
+                        "value": "[parameters('cspm_enabled')]"
                     },
                     {
                         "name": "custom_metrics_enabled",