Skip to content

Commit 23f6c7e

Browse files
authored
Merge pull request #282695 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 85e8810 + 489421d commit 23f6c7e

File tree

66 files changed

+729
-189
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+729
-189
lines changed

articles/azure-arc/system-center-virtual-machine-manager/overview.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,4 +92,6 @@ Azure Arc-enabled SCVMM doesn't store/process customer data outside the region t
9292

9393
## Next steps
9494

95-
[Create an Azure Arc VM](create-virtual-machine.md).
95+
96+
- Plan your Arc-enabled SCVMM deployment by reviewing the [support matrix](support-matrix-for-system-center-virtual-machine-manager.md).
97+
- Once ready, [connect your SCVMM management server to Azure Arc using the onboarding script](quickstart-connect-system-center-virtual-machine-manager-to-arc.md).

articles/azure-resource-manager/management/azure-services-resource-providers.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ The resource providers for database services are:
118118

119119
| Resource provider namespace | Azure service |
120120
| --------------------------- | ------------- |
121-
| Microsoft.AzureData | SQL Server registry |
122121
| Microsoft.Cache | [Azure Cache for Redis](../../azure-cache-for-redis/index.yml) |
123122
| Microsoft.DBforMariaDB | [Azure Database for MariaDB](../../mariadb/index.yml) |
124123
| Microsoft.DBforMySQL | [Azure Database for MySQL](../../mysql/index.yml) |
125124
| Microsoft.DBforPostgreSQL | [Azure Database for PostgreSQL](../../postgresql/index.yml) |
126125
| Microsoft.DocumentDB | [Azure Cosmos DB](../../cosmos-db/index.yml) |
127126
| Microsoft.Sql | [Azure SQL Database](/azure/azure-sql/database/index)<br /> [Azure SQL Managed Instance](/azure/azure-sql/managed-instance/index) <br />[Azure Synapse Analytics](/azure/sql-data-warehouse/) |
128127
| Microsoft.SqlVirtualMachine | [SQL Server on Azure Virtual Machines](/azure/azure-sql/virtual-machines/windows/sql-server-on-azure-vm-iaas-what-is-overview) |
128+
| Microsoft.AzureData | [SQL Server enabled by Azure Arc](/sql/sql-server/azure-arc/overview) |
129129

130130
## Developer tools resource providers
131131

@@ -154,7 +154,7 @@ The resource providers for hybrid services are:
154154

155155
| Resource provider namespace | Azure service |
156156
| --------------------------- | ------------- |
157-
| Microsoft.AzureArcData | Azure Arc-enabled data services |
157+
| Microsoft.AzureArcData | [Azure Arc-enabled data services](/azure/azure-arc/data/overview) |
158158
| Microsoft.AzureStackHCI | [Azure Stack HCI](/azure-stack/hci/overview) |
159159
| Microsoft.HybridCompute | [Azure Arc-enabled servers](../../azure-arc/servers/index.yml) |
160160
| Microsoft.Kubernetes | [Azure Arc-enabled Kubernetes](../../azure-arc/kubernetes/index.yml) |

articles/azure-sql-edge/onnx-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: WilliamDAssafMSFT
55
ms.author: wiassaf
66
ms.reviewer: hudequei, randolphwest
77
ms.date: 09/14/2023
8-
ms.service: sql-edge
8+
ms.service: azure-sql-edge
99
ms.subservice: machine-learning
1010
ms.topic: conceptual
1111
keywords: deploy SQL Edge

articles/backup/backup-support-matrix-iaas.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ Managed disks | Supported.
194194
Encrypted disks | Supported.<br/><br/> Azure VMs enabled with Azure Disk Encryption can be backed up (with or without the Microsoft Entra app).<br/><br/> Encrypted VMs can't be recovered at the file or folder level. You must recover the entire VM.<br/><br/> You can enable encryption on VMs that Azure Backup is already protecting. <br><br> You can back up and restore disks encrypted via platform-managed keys or customer-managed keys. You can also assign a disk-encryption set while restoring in the same region. That is, providing a disk-encryption set while performing cross-region restore is currently not supported. However, you can assign the disk-encryption set to the restored disk after the restore is complete.
195195
Disks with a write accelerator enabled | Azure VMs with disk backup for a write accelerator became available in all Azure public regions on May 18, 2022. If disk backup for a write accelerator is not required as part of VM backup, you can choose to remove it by using the [selective disk feature](selective-disk-backup-restore.md). <br><br>**Important** <br> Virtual machines with write accelerator disks need internet connectivity for a successful backup, even though those disks are excluded from the backup.
196196
Disks enabled for access with a private endpoint | Supported.
197+
Disks with both public and private access disabled | Supported.
197198
Backup and restore of deduplicated VMs or disks | Azure Backup doesn't support deduplication. For more information, see [this article](./backup-support-matrix.md#disk-deduplication-support). <br/> <br/> Azure Backup doesn't deduplicate across VMs in the Recovery Services vault. <br/> <br/> If there are VMs in a deduplication state during restore, the files can't be restored because the vault doesn't understand the format. However, you can successfully perform the full VM restore.
198199
Adding a disk to a protected VM | Supported.
199200
Resizing a disk on a protected VM | Supported.

articles/chaos-studio/chaos-studio-tutorial-aks-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ az rest --method get --uri https://management.azure.com/subscriptions/$SUBSCRIPT
214214

215215

216216
```azurecli-interactive
217-
az role assignment create --role "Azure Kubernetes Service Cluster Admin Role" --assignee-object-id $EXPERIMENT_PRINCIPAL_ID --assignee-principal-type "ServicePrincipal" --scope subscriptions/$SUBSCRIPTION_ID/resourceGroups/$resourceGroupName/providers/Microsoft.ContainerService/managedClusters/$AKS_CLUSTER_NAME
217+
az role assignment create --role "Azure Kubernetes Service Cluster Admin Role" --assignee-principal-type "ServicePrincipal" --assignee-object-id $EXPERIMENT_PRINCIPAL_ID --scope subscriptions/$SUBSCRIPTION_ID/resourceGroups/$resourceGroupName/providers/Microsoft.ContainerService/managedClusters/$AKS_CLUSTER_NAME
218218
```
219219

220220
## Run your experiment

0 commit comments

Comments
 (0)