Skip to content

Commit 700a071

Browse files
authored
Merge pull request #301496 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents ed6e48b + d9f83d9 commit 700a071

13 files changed

+366
-331
lines changed

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

Lines changed: 4 additions & 1 deletion
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: 04/30/2025
5+
ms.date: 06/18/2025
66
ms.service: azure-backup
77
ms.custom:
88
- ignite-2023
@@ -65,6 +65,9 @@ The extension pods aren't exempt, and require the Microsoft Entra pod identity t
6565

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

68+
>[!Note]
69+
>Ensure that you use the latest Terraform script version. [Learn more](quick-kubernetes-backup-terraform.md#prerequisites).
70+
6871
```azurecli-interactive
6972
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
7073
```

articles/backup/azure-kubernetes-service-cluster-manage-backups.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.custom:
77
- devx-track-azurecli
88
- ignite-2023
99
- ignite-2024
10-
ms.date: 01/16/2025
10+
ms.date: 06/18/2025
1111
author: jyothisuri
1212
ms.author: jsuri
1313
---
@@ -22,8 +22,9 @@ In addition, it helps to describe how to manage backup for the Azure Kubernetes
2222

2323
## Resource provider registrations
2424

25-
- You must register these resource providers on the subscription before initiating any backup and restore operation.
26-
- Once the registration is complete, you can perform backup and restore operations on all the cluster under the subscription.
25+
Resource Provider registration is required for installing the Backup Extension, and initiating any backup and restore operation. You can do this registration as a Subscription Owner. Generally, the Resource Provider is already registered in an Azure subscription. If not, register the `Microsoft.KubernetesConfiguration` resource provider.
26+
27+
After the registration is complete, you can perform backup and restore operations on all the cluster under the subscription.
2728

2829
### Register the Backup Extension
2930

articles/backup/backup-azure-arm-restore-vms.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Restore VMs by using the Azure portal using Azure Backup
33
description: Restore an Azure virtual machine from a recovery point by using the Azure portal, including the Cross Region Restore feature.
44
ms.reviewer: nikhilsarode
55
ms.topic: how-to
6-
ms.date: 06/12/2025
6+
ms.date: 06/18/2025
77
ms.service: azure-backup
88
author: jyothisuri
99
ms.author: jsuri
@@ -121,7 +121,8 @@ As one of the [restore options](#restore-options), you can create a VM quickly w
121121
1. Select **Restore** to trigger the restore operation.
122122

123123
>[!Note]
124-
>Before you modify any NSG settings, ensure the VM restore operation is complete. Learn about [tracking the restore operation](#track-the-restore-operation).
124+
>- Before you modify any NSG settings, ensure the VM restore operation is complete. Learn about [tracking the restore operation](#track-the-restore-operation).
125+
>- During an Alternate Location Restore (Create new VM), the restored VM retains the same SKU as the original VM at the time of the recovery point creation. Any SKU changes made after the backup date don't reflect in the restored VM.
125126
126127
## Restore disks
127128

articles/backup/backup-azure-restore-files-from-vm.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Recover files and folders from Azure VM backup
33
description: In this article, learn how to recover files and folders from an Azure virtual machine recovery point.
44
ms.topic: how-to
5-
ms.date: 10/16/2024
5+
ms.date: 06/18/2025
66
ms.custom: references_regions
77
ms.service: azure-backup
88
author: jyothisuri
@@ -141,6 +141,7 @@ If you run the script on a computer with restricted access, ensure there's acces
141141
- `https://pod01-rec2.GEO-NAME.backup.windowsazure.us` (For Azure US Government) or `AzureBackup` service tag in NSG
142142
- `https://pod01-rec2.GEO-NAME.backup.windowsazure.de` (For Azure Germany) or `AzureBackup` service tag in NSG
143143
- Public DNS resolution on port 53 (outbound)
144+
- The access requirement of the Microsoft Entra ID are `*.microsoft.com`, `*.windowsazure.com`, and `*.windows.net` on port 443 (outbound).
144145

145146
> [!NOTE]
146147
> Proxies may not support iSCSI protocol or give access to port 3260. Hence it is strongly recommended to run this script on machines which have direct access as required above and not on the machines which will redirect to proxy.

articles/iot/iot-overview-security.md

Lines changed: 91 additions & 58 deletions
Large diffs are not rendered by default.

articles/sentinel/TOC.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,14 @@
300300
href: connect-logstash-data-connection-rules.md
301301
- name: Connection instructions for service
302302
items:
303-
- name: Amazon Web Services logs
304-
href: connect-aws.md
305-
- name: AWS S3 WAF logs
306-
href: connect-aws-s3-waf.md
307-
- name: CloudWatch events via Lambda function
308-
href: cloudwatch-lambda-function.yml
303+
- name: Amazon Web Services
304+
items:
305+
- name: Connect Microsoft Sentinel to AWS
306+
href: connect-aws-configure-environment.md
307+
- name: AWS service logs
308+
href: connect-aws.md
309+
- name: AWS S3 WAF logs
310+
href: connect-aws-s3-waf.md
309311
- name: Cisco FTD firewall
310312
href: cisco-ftd-firewall.md
311313
- name: Google Cloud Platform connectors

articles/sentinel/aws-s3-troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The relevant logs don't exist in the S3 bucket.
5252
### Solution: Search for logs and export logs if needed
5353

5454
1. In AWS, open the S3 bucket, search for the relevant folder according to the required logs, and check if there are any log files inside the folder.
55-
1. If the data doesn't exist, there’s an issue with the AWS configuration. In this case, you need to [configure an AWS service to export logs to an S3 bucket](connect-aws.md?tabs=s3#configure-an-aws-service-to-export-logs-to-an-s3-bucket).
55+
1. If the data doesn't exist, there’s an issue with the AWS configuration. In this case, you need to [configure an AWS service to export logs to an S3 bucket](connect-aws-configure-environment.md#configure-aws-services-to-export-logs-to-an-s3-bucket).
5656

5757
### Cause 3: The S3 data didn't arrive at the SQS
5858

articles/sentinel/business-applications/deploy-power-platform-solution.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,11 @@ Before deploying the Microsoft Sentinel solution for Microsoft Business Apps, en
4141

4242
- Microsoft Dataverse
4343
- Microsoft Power Platform Admin Activity
44-
4544
- Microsoft Power Automate
46-
45+
46+
> [!NOTE]
47+
> The Dynamics 365 Finance and Operations connector is also included as part of the solution. For more information, see [Deploy for Dynamics 365 Finance and Operations](../dynamics-365/deploy-dynamics-365-finance-operations-solution.md).
48+
4749
1. For each data connector, on the side pane, select **Open connector page > Connect**.
4850

4951
## Configure data collection for Dataverse

articles/sentinel/cloudwatch-lambda-function.yml

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)