Merge pull request #269503 from rsgel/main

bicep and template fixes

Author: prmerger-automator[bot]

articles/chaos-studio/chaos-studio-bicep.md

@@ -78,7 +78,7 @@ resource vm 'Microsoft.Compute/virtualMachines@2023-03-01' existing = {
 }
 
 // Deploy the Chaos Studio target resource to the Virtual Machine
-resource chaosTarget 'Microsoft.Chaos/targets@2023-11-01' = {
+resource chaosTarget 'Microsoft.Chaos/targets@2024-01-01' = {
   name: 'Microsoft-VirtualMachine'
   location: location
   scope: vm
@@ -98,7 +98,7 @@ resource chaosRoleDefinition 'Microsoft.Authorization/roleDefinitions@2022-04-01
 }
 
 // Define the role assignment for the Chaos experiment
-resource chaosRoleAssignment 'Microsoft.Authorization/roleAssignments@2020-04-01-preview' = {
+resource chaosRoleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
   name: guid(vm.id, chaosExperiment.id, chaosRoleDefinition.id)
   scope: vm
   properties: {
@@ -109,7 +109,7 @@ resource chaosRoleAssignment 'Microsoft.Authorization/roleAssignments@2020-04-01
 }
 
 // Deploy the Chaos Studio experiment resource
-resource chaosExperiment 'Microsoft.Chaos/experiments@2023-11-01' = {
+resource chaosExperiment 'Microsoft.Chaos/experiments@2024-01-01' = {
   name: experimentName
   location: location // Doesn't need to be the same as the Targets & Capabilities location
   identity: {
@@ -128,7 +128,6 @@ resource chaosExperiment 'Microsoft.Chaos/experiments@2023-11-01' = {
         ]
       }
     ]
-    startOnCreation: false // Change this to true if you want to start the experiment on creation
     steps: experimentSteps
   }
 }
@@ -154,7 +153,6 @@ resource chaosExperiment 'Microsoft.Chaos/experiments@2023-11-01' = {
 1. When prompted, enter the following values:
     * **targetName**: the name of an existing Virtual Machine within your resource group that you want to target
     * **experimentName**: the desired name for your Chaos Experiment
-    * **location**: the desired region for the experiment, targets, and capabilities
 1. The template should deploy within a few minutes. Once the deployment is complete, navigate to Chaos Studio in the Azure portal, select **Experiments**, and find the experiment created by the template. Select it, then **Start** the experiment.
 
 ## Next steps

articles/chaos-studio/sample-template-experiment.md

@@ -19,6 +19,10 @@ This article includes sample [Azure Resource Manager templates (ARM templates)](
 
 In this sample, we create a chaos experiment with a single target resource and a single CPU pressure fault. You can modify the experiment by referencing our [REST API](/rest/api/chaosstudio/experiments/create-or-update) and [fault library](chaos-studio-fault-library.md).
 
+## Deploying templates
+
+Once you've reviewed the template and parameter files, learn how to deploy them into your Azure subscription with the [Deploy resources with ARM templates and Azure portal](../azure-resource-manager/templates/deploy-portal.md) article.
+
 ### Template file
 
 ```json
@@ -43,7 +47,7 @@ In this sample, we create a chaos experiment with a single target resource and a
     "chaosTargetResourceId": {
       "type": "string",
       "metadata": {
-        "description": "Resource ID of the chaos target. This is the resource ID of the resource being targeted plus the target proxy resource."
+        "description": "Resource ID of the chaos target. This is the full resource ID of the resource being targeted plus the target proxy resource."
       }
     }
   },
@@ -52,7 +56,7 @@ In this sample, we create a chaos experiment with a single target resource and a
   "resources": [
     {
       "type": "Microsoft.Chaos/experiments",
-      "apiVersion": "2023-11-01",
+      "apiVersion": "2024-01-01",
       "name": "[parameters('experimentName')]",
       "location": "[parameters('location')]",
       "identity": {
@@ -71,7 +75,6 @@ In this sample, we create a chaos experiment with a single target resource and a
             ]
           }
         ],
-        "startOnCreation": "false",
         "steps": [
           {
             "name": "Step1",

articles/chaos-studio/sample-template-targets.md

@@ -19,6 +19,10 @@ This article includes sample [Azure Resource Manager templates (ARM templates)](
 
 In this sample, we add an Azure Cosmos DB instance by using [targets and capabilities](chaos-studio-targets-capabilities.md). To modify the template for any service-direct target and capabilities, see the [fault library](chaos-studio-fault-library.md).
 
+## Deploying templates
+
+Once you've reviewed the template and parameter files, learn how to deploy them into your Azure subscription with the [Deploy resources with ARM templates and Azure portal](../azure-resource-manager/templates/deploy-portal.md) article.
+
 ### Template file
 
 ```json