Skip to content

Commit 73bfb9b

Browse files
Merge branch 'MicrosoftDocs:main' into lakshmisha-new-residency-update2
2 parents 8b2b358 + 41389f0 commit 73bfb9b

6 files changed

+26
-29
lines changed

articles/backup/azure-kubernetes-service-backup-troubleshoot.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Troubleshoot Azure Kubernetes Service backup
33
description: Symptoms, causes, and resolutions of the Azure Kubernetes Service backup and restore operations.
44
ms.topic: troubleshooting
5-
ms.date: 02/28/2024
5+
ms.date: 02/29/2024
66
ms.service: backup
77
ms.custom:
88
- ignite-2023
@@ -63,10 +63,10 @@ The extension pods aren't exempt, and require the Microsoft Entra pod identity t
6363
kubectl get Azurepodidentityexceptions --all-namespaces
6464
```
6565

66-
3. To assign the *Storage Account Contributor* role to the extension identity, run the following command:
66+
3. To assign the *Storage Blob Data Contributor* role to the extension identity, run the following command:
6767

6868
```azurecli-interactive
69-
az role assignment create --assignee-object-id $(az k8s-extension show --name azure-aks-backup --cluster-name aksclustername --resource-group aksclusterresourcegroup --cluster-type managedClusters --query aksAssignedIdentity.principalId --output tsv) --role 'Storage Account Contributor' --scope /subscriptions/subscriptionid/resourceGroups/storageaccountresourcegroup/providers/Microsoft.Storage/storageAccounts/storageaccountname
69+
az role assignment create --assignee-object-id $(az k8s-extension show --name azure-aks-backup --cluster-name aksclustername --resource-group aksclusterresourcegroup --cluster-type managedClusters --query aksAssignedIdentity.principalId --output tsv) --role 'Storage Blob Data Contributor' --scope /subscriptions/subscriptionid/resourceGroups/storageaccountresourcegroup/providers/Microsoft.Storage/storageAccounts/storageaccountname
7070
```
7171

7272
### Scenario 3
@@ -192,13 +192,13 @@ These error codes appear due to issues based on the Backup extension installed i
192192

193193
### UserErrorExtensionMSIMissingPermissionsOnBackupStorageLocation
194194

195-
**Cause**: The Backup extension should have the *Storage Account Contributor* role on the Backup Storage Location (storage account). The Extension Identity gets this role assigned.
195+
**Cause**: The Backup extension should have the *Storage Blob Data Contributor* role on the Backup Storage Location (storage account). The Extension Identity gets this role assigned.
196196

197197
**Recommended action**: If this role is missing, then use Azure portal or CLI to reassign this missing permission on the storage account.
198198

199199
### UserErrorBackupStorageLocationNotReady
200200

201-
**Cause**: During extension installation, a Backup Storage Location is to be provided as input that includes a storage account and blob container. The Backup extension should have *Storage Account Contributor* role on the Backup Storage Location (storage account). The Extension Identity gets this role assigned.
201+
**Cause**: During extension installation, a Backup Storage Location is to be provided as input that includes a storage account and blob container. The Backup extension should have *Storage Blob Data Contributor* role on the Backup Storage Location (storage account). The Extension Identity gets this role assigned.
202202

203203
**Recommended action**: The error appears if the Extension Identity doesn't have right permissions to access the storage account. This error appears if AKS backup extension is installed the first time when configuring protection operation. This happens for the time taken for the granted permissions to propagate to the AKS backup extension. As a workaround, wait an hour and retry the protection configuration. Otherwise, use Azure portal or CLI to reassign this missing permission on the storage account.
204204

articles/defender-for-cloud/file-integrity-monitoring-enable-log-analytics.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ The **Changes** tab (shown below) lists all changes for the workspace during the
174174
Use wildcards to simplify tracking across directories. The following rules apply when you configure folder monitoring using wildcards:
175175

176176
- Wildcards are required for tracking multiple files.
177-
- Wildcards can only be used in the last segment of a path, such as `C:\folder\file` or` /etc/*.conf`
177+
- Wildcards can only be used in the last segment of a path, such as `C:\folder\file` or `/etc/*.conf`
178178
- If an environment variable includes a path that isn't valid, validation succeeds but the path fails when inventory runs.
179179
- When setting the path, avoid general paths such as `c:\*.*`, which results in too many folders being traversed.
180180

@@ -239,7 +239,7 @@ File Integrity Monitoring data resides within the Azure Log Analytics/Configurat
239239
240240
In the following example, we're retrieving all changes in the last 14 days in the categories of registry and files:
241241
242-
```
242+
```kusto
243243
ConfigurationChange
244244
| where TimeGenerated > ago(14d)
245245
| where ConfigChangeType in ('Registry', 'Files')
@@ -251,7 +251,7 @@ File Integrity Monitoring data resides within the Azure Log Analytics/Configurat
251251
1. Remove **Files** from the **where** clause.
252252
1. Remove the summarization line and replace it with an ordering clause:
253253
254-
```
254+
```kusto
255255
ConfigurationChange
256256
| where TimeGenerated > ago(14d)
257257
| where ConfigChangeType in ('Registry')

articles/defender-for-cloud/file-integrity-monitoring-overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ Defender for Cloud provides the following list of recommended items to monitor b
6060

6161
## Next steps
6262

63-
In this article, you learned about File Integrity Monitoring (FIM) in Defender for Cloud.
63+
In this article, you learned about File Integrity Monitoring (FIM) in Defender for Cloud.
6464

6565
Next, you can:
6666

6767
- [Enable File Integrity Monitoring when using the Azure Monitor Agent](file-integrity-monitoring-enable-ama.md)
68-
- [Enable File Integrity Monitoring when using the Log Analytics agent](file-integrity-monitoring-enable-log-analytics.md)
68+
- [Enable File Integrity Monitoring when using the Log Analytics agent](file-integrity-monitoring-enable-log-analytics.md)

articles/defender-for-cloud/github-action.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Configure the Microsoft Security DevOps GitHub action
3-
description: Learn how to configure the Microsoft Security DevOps GitHub action.
3+
description: Learn how to configure the Microsoft Security DevOps GitHub action to enhance your project's security and DevOps processes.
44
ms.date: 06/18/2023
55
ms.topic: how-to
66
---
@@ -105,10 +105,10 @@ Microsoft Security DevOps uses the following Open Source tools:
105105
name: alerts
106106
path: ${{ steps.msdo.outputs.sarifFile }}
107107
```
108+
108109
> [!NOTE]
109110
> For additional tool configuration options, see [the Microsoft Security DevOps wiki](https://github.com/microsoft/security-devops-action/wiki)
110111
111-
112112
1. Select **Start commit**
113113
114114
:::image type="content" source="media/msdo-github-action/start-commit.png" alt-text="Screenshot showing you where to select start commit.":::
@@ -141,7 +141,7 @@ Code scanning findings will be filtered by specific MSDO tools in GitHub. These
141141
142142
- Learn how to [deploy apps from GitHub to Azure](/azure/developer/github/deploy-to-azure).
143143
144-
## Next steps
144+
## Related content
145145
146146
Learn more about [DevOps security in Defender for Cloud](defender-for-devops-introduction.md).
147147

articles/defender-for-cloud/governance-rules.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Drive remediation of security recommendations with governance rules in Microsoft Defender for Cloud
2+
title: Drive remediation of recommendations with governance rules
33
description: Learn how to drive remediation of security recommendations with governance rules in Microsoft Defender for Cloud
44
services: defender-for-cloud
55
ms.service: defender-for-cloud
@@ -37,8 +37,7 @@ For tracking, you can review the progress of the remediation tasks by subscripti
3737

3838
- The [Defender Cloud Security Posture Management (CSPM) plan](concept-cloud-security-posture-management.md) must be enabled.
3939
- You need **Contributor**, **Security Admin**, or **Owner** permissions on the Azure subscriptions.
40-
- For AWS accounts and GCP projects, you need **Contributor**, **Security Admin**, or **Owner** permissions on the Defender for Cloud AWS or GCP connectors.
41-
40+
- For AWS accounts and GCP projects, you need **Contributor**, **Security Admin**, or **Owner** permissions on the Defender for Cloud AWS or GCP connectors.
4241

4342
## Define a governance rule
4443

@@ -68,7 +67,7 @@ For tracking, you can review the progress of the remediation tasks by subscripti
6867
1. Specify how recommendations are impacted by the rule.
6968

7069
- **By severity** - The rule assigns the owner and due date to any recommendation in the subscription that doesn't already have them assigned.
71-
- **By specific recommendations** - Select the specific built-in or custom recommendations that the rule applies to.
70+
- **By specific recommendations** - Select the specific built-in or custom recommendations that the rule applies to.
7271

7372
:::image type="content" source="./media/governance-rules/create-rule-conditions.png" alt-text="Screenshot of page for adding conditions for a governance rule." lightbox="media/governance-rules/create-rule-conditions.png":::
7473

@@ -106,11 +105,11 @@ You can view the effect of government rules in your environment.
106105
1. You can search for rules, or filter rules.
107106

108107
- Filter on **Environment** to identify rules for Azure, AWS, and GCP.
109-
108+
110109
- Filter on rule name, owner, or time between the recommendation being issued and due date.
111-
110+
112111
- Filter on **Grace period** to find MCSB recommendations that won't affect your secure score.
113-
112+
114113
- Identify by status.
115114

116115
:::image type="content" source="./media/governance-rules/view-filter-rules.png" alt-text="Screenshot of page for viewing and filtering rules." lightbox="media/governance-rules/view-filter-rules.png":::
@@ -131,6 +130,6 @@ The governance report lets you select subscriptions that have governance rules a
131130

132131
From the governance report, you can drill down into recommendations by scope, display name, priority, remediation timeframe, owner type, owner details, grace period and cloud.
133132

134-
## Next steps
133+
## Next step
135134

136135
Learn how to [Implement security recommendations](implement-security-recommendations.md).

articles/defender-for-cloud/harden-docker-hosts.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Review Docker host hardening recommendations
3-
description: How-to protect your Docker hosts and verify they're compliant with the CIS Docker benchmark
3+
description: How to protect your Docker hosts and verify they're compliant with the CIS Docker benchmark with Microsoft Defender for Cloud.
44
author: dcurwin
55
ms.author: dacurwin
66
ms.topic: how-to
@@ -26,21 +26,20 @@ When vulnerabilities are found, they're grouped inside a single recommendation.
2626
|Required roles and permissions:|**Reader** on the workspace to which the host connects|
2727
|Clouds:|:::image type="icon" source="./media/icons/yes-icon.png"::: Commercial clouds<br>:::image type="icon" source="./media/icons/yes-icon.png"::: National (Azure Government, Microsoft Azure operated by 21Vianet)<br>:::image type="icon" source="./media/icons/yes-icon.png"::: Connected AWS accounts|
2828

29-
3029
## Identify and remediate security vulnerabilities in your Docker configuration
3130

3231
1. From Defender for Cloud's menu, open the **Recommendations** page.
3332

3433
1. Filter to the recommendation **Vulnerabilities in container security configurations should be remediated** and select the recommendation.
3534

36-
The recommendation page shows the affected resources (Docker hosts).
35+
The recommendation page shows the affected resources (Docker hosts).
3736

3837
:::image type="content" source="./media/monitor-container-security/docker-host-vulnerabilities-found.png" alt-text="Recommendation to remediate vulnerabilities in container security configurations.":::
3938

4039
> [!NOTE]
41-
> Machines that aren't running Docker will be shown in the **Not applicable resources** tab. They'll appear in Azure Policy as Compliant.
40+
> Machines that aren't running Docker will be shown in the **Not applicable resources** tab. They'll appear in Azure Policy as Compliant.
4241
43-
1. To view and remediate the CIS controls that a specific host failed, select the host you want to investigate.
42+
1. To view and remediate the CIS controls that a specific host failed, select the host you want to investigate.
4443

4544
> [!TIP]
4645
> If you started at the asset inventory page and reached this recommendation from there, select the **Take action** button on the recommendation page.
@@ -55,9 +54,8 @@ When vulnerabilities are found, they're grouped inside a single recommendation.
5554

5655
1. When you're sure the command is appropriate and ready for your host, select **Run**.
5756

57+
## Next step
5858

59-
## Next steps
60-
61-
Docker hardening is just one aspect of Defender for Cloud's container security features.
59+
Docker hardening is just one aspect of Defender for Cloud's container security features.
6260

6361
Learn more [Container security in Defender for Cloud](defender-for-containers-introduction.md).

0 commit comments

Comments
 (0)