Merge pull request #183514 from MicrosoftDocs/repo_sync_working_branch

v-alje · web-flow · commit 573435f4bf2f · 2021-12-22T15:11:37.000-08:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
diff --git a/articles/defender-for-cloud/defender-for-containers-enable.md b/articles/defender-for-cloud/defender-for-containers-enable.md
@@ -110,6 +110,7 @@ Request Body:
  
 ```rest
 {
+  "location": "{{Location}}",
   "properties": {
     "securityProfile": {
             "azureDefender": {
@@ -125,6 +126,7 @@ Request body parameters:
 
 | Name                                                                     | Description                                                                              | Mandatory |
 |--------------------------------------------------------------------------|------------------------------------------------------------------------------------------|-----------|
+| location                                                                 | Cluster's location                                                                       | Yes       |
 | properties.securityProfile.azureDefender.enabled                         | Determines whether to enable or disable Microsoft Defender for Containers on the cluster | Yes       |
 | properties.securityProfile.azureDefender.logAnalyticsWorkspaceResourceId | Log Analytics workspace Azure resource ID                                                | Yes       |
 |                                                                          |                                                                                          |           |
@@ -605,11 +607,11 @@ Request body:
  
 ```rest
 {
+  "location": "{{Location}}",
   "properties": {
     "securityProfile": {
             "azureDefender": {
-                "enabled": false,
-                "logAnalyticsWorkspaceResourceId": "" // leave empty
+                "enabled": false
             }
         }
     }
@@ -620,8 +622,8 @@ Request body parameters:
 
 | Name                                                                     | Description                                                                              | Mandatory |
 |--------------------------------------------------------------------------|------------------------------------------------------------------------------------------|-----------|
+| location                                                                 | Cluster's location                                                                       | Yes       |
 | properties.securityProfile.azureDefender.enabled                         | Determines whether to enable or disable Microsoft Defender for Containers on the cluster | Yes       |
-| properties.securityProfile.azureDefender.logAnalyticsWorkspaceResourceId | Log Analytics workspace Azure resource ID                                                | Yes       |
 |                                                                          |                                                                                          |           |
 
 
@@ -646,13 +648,12 @@ The relevant template and parameters to remove the Defender profile from AKS are
         …
         "securityProfile": { 
             "azureDefender": { 
-                "enabled": false, 
-                "logAnalyticsWorkspaceResourceId": "" // leave empty
+                "enabled": false
             }
         },
     }
 }
 
 ---
 
-::: zone-end
+::: zone-end

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ Request Body:`
`110`	`110`
`111`	`111`	```rest
`112`	`112`	`{`
	`113`	`+ "location": "{{Location}}",`
`113`	`114`	`"properties": {`
`114`	`115`	`"securityProfile": {`
`115`	`116`	`"azureDefender": {`
`@@ -125,6 +126,7 @@ Request body parameters:`
`125`	`126`
`126`	`127`	`\| Name \| Description \| Mandatory \|`
`127`	`128`	`\|--------------------------------------------------------------------------\|------------------------------------------------------------------------------------------\|-----------\|`
	`129`	`+\| location \| Cluster's location \| Yes \|`
`128`	`130`	`\| properties.securityProfile.azureDefender.enabled \| Determines whether to enable or disable Microsoft Defender for Containers on the cluster \| Yes \|`
`129`	`131`	`\| properties.securityProfile.azureDefender.logAnalyticsWorkspaceResourceId \| Log Analytics workspace Azure resource ID \| Yes \|`
`130`	`132`	`\| \| \| \|`
`@@ -605,11 +607,11 @@ Request body:`
`605`	`607`
`606`	`608`	```rest
`607`	`609`	`{`
	`610`	`+ "location": "{{Location}}",`
`608`	`611`	`"properties": {`
`609`	`612`	`"securityProfile": {`
`610`	`613`	`"azureDefender": {`
`611`		`- "enabled": false,`
`612`		`- "logAnalyticsWorkspaceResourceId": "" // leave empty`
	`614`	`+ "enabled": false`
`613`	`615`	`}`
`614`	`616`	`}`
`615`	`617`	`}`
`@@ -620,8 +622,8 @@ Request body parameters:`
`620`	`622`
`621`	`623`	`\| Name \| Description \| Mandatory \|`
`622`	`624`	`\|--------------------------------------------------------------------------\|------------------------------------------------------------------------------------------\|-----------\|`
	`625`	`+\| location \| Cluster's location \| Yes \|`
`623`	`626`	`\| properties.securityProfile.azureDefender.enabled \| Determines whether to enable or disable Microsoft Defender for Containers on the cluster \| Yes \|`
`624`		`-\| properties.securityProfile.azureDefender.logAnalyticsWorkspaceResourceId \| Log Analytics workspace Azure resource ID \| Yes \|`
`625`	`627`	`\| \| \| \|`
`626`	`628`
`627`	`629`
`@@ -646,13 +648,12 @@ The relevant template and parameters to remove the Defender profile from AKS are`
`646`	`648`	`…`
`647`	`649`	`"securityProfile": {`
`648`	`650`	`"azureDefender": {`
`649`		`- "enabled": false,`
`650`		`- "logAnalyticsWorkspaceResourceId": "" // leave empty`
	`651`	`+ "enabled": false`
`651`	`652`	`}`
`652`	`653`	`},`
`653`	`654`	`}`
`654`	`655`	`}`
`655`	`656`
`656`	`657`	`---`
`657`	`658`
`658`		`-::: zone-end`
	`659`	`+::: zone-end`