Skip to content

Commit 8c07afa

Browse files
authored
Merge pull request #127609 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 525a36d + 840ef9b commit 8c07afa

File tree

5 files changed

+21
-11
lines changed

5 files changed

+21
-11
lines changed

articles/automation/quickstart-create-automation-account-template.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The following table lists the API version for the resources used in this example
5656
|:---|:---|:---|
5757
| [Workspace](/azure/templates/microsoft.operationalinsights/workspaces) | workspaces | 2020-03-01-preview |
5858
| [Automation account](/azure/templates/microsoft.automation/automationaccounts) | automation | 2020-01-13-preview |
59-
| [Workspace Linked services](/azure/templates/microsoft.operationalinsights/workspaces/linkedservices) | worksapces | 2020-03-01-preview |
59+
| [Workspace Linked services](/azure/templates/microsoft.operationalinsights/workspaces/linkedservices) | workspaces | 2020-03-01-preview |
6060

6161
### Before you use the template
6262

@@ -123,4 +123,4 @@ In this quickstart, you created an Automation account, a Log Analytics workspace
123123
To learn more, continue to the tutorials for Azure Automation.
124124

125125
> [!div class="nextstepaction"]
126-
> [Azure Automation tutorials](learn/automation-tutorial-runbook-graphical.md)
126+
> [Azure Automation tutorials](learn/automation-tutorial-runbook-graphical.md)

articles/azure-monitor/learn/dotnetcore-quick-start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ Application Insights can gather telemetry data from any internet-connected appli
100100
When you are done testing, you can delete the resource group and all related resources. To do so follow the steps below.
101101

102102
> [!NOTE]
103-
> If you used an existing resource group the instructions below will not work and you will need to just delete the individual Application Insights resource. Keep in mind anytime you delete a resource group all underyling resources that are members of that group will be deleted.
103+
> If you used an existing resource group the instructions below will not work and you will need to just delete the individual Application Insights resource. Keep in mind anytime you delete a resource group all underlying resources that are members of that group will be deleted.
104104
105105
1. From the left-hand menu in the Azure portal, click **Resource groups** and then click **myResourceGroup**.
106106
2. On your resource group page, click **Delete**, type **myResourceGroup** in the text box, and then click **Delete**.

articles/media-services/live-video-analytics-edge/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Live Video Analytics on IoT Edge release notes - Azure
33
description: This topic provides release notes of Live Video Analytics on IoT Edge releases, improvements, bug fixes, and known issues.
44
ms.topic: conceptual
5-
ms.date: 04/27/2020
5+
ms.date: 08/19/2020
66

77
---
88
# Live Video Analytics on IoT Edge release notes

articles/role-based-access-control/transfer-subscription.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,15 @@ Organizations might have several Azure subscriptions. Each subscription is assoc
2323

2424
This article describes the basic steps you can follow to transfer a subscription to a different Azure AD directory and re-create some of the resources after the transfer.
2525

26+
> [!NOTE]
27+
> For Azure CSP subscriptions, changing the Azure AD directory for the subscription isn't supported.
28+
2629
## Overview
2730

2831
Transferring an Azure subscription to a different Azure AD directory is a complex process that must be carefully planned and executed. Many Azure services require security principals (identities) to operate normally or even manage other Azure resources. This article tries to cover most of the Azure services that depend heavily on security principals, but is not comprehensive.
2932

3033
> [!IMPORTANT]
31-
> Transferring a subscription does require downtime to complete the process.
34+
> In some scenarios, transferring a subscription might require downtime to complete the process. Careful planning is required to assess whether downtime will be required for your migration.
3235
3336
The following diagram shows the basic steps you must follow when you transfer a subscription to a different directory.
3437

@@ -66,17 +69,18 @@ Several Azure resources have a dependency on a subscription or a directory. Depe
6669
| System-assigned managed identities | Yes | Yes | [List managed identities](#list-role-assignments-for-managed-identities) | You must disable and re-enable the managed identities. You must re-create the role assignments. |
6770
| User-assigned managed identities | Yes | Yes | [List managed identities](#list-role-assignments-for-managed-identities) | You must delete, re-create, and attach the managed identities to the appropriate resource. You must re-create the role assignments. |
6871
| Azure Key Vault | Yes | Yes | [List Key Vault access policies](#list-other-known-resources) | You must update the tenant ID associated with the key vaults. You must remove and add new access policies. |
69-
| Azure SQL databases with Azure AD authentication | Yes | No | [Check Azure SQL databases with Azure AD authentication](#list-other-known-resources) | | |
72+
| Azure SQL databases with Azure AD authentication integration enabled | Yes | No | [Check Azure SQL databases with Azure AD authentication](#list-azure-sql-databases-with-azure-ad-authentication) | | |
7073
| Azure Storage and Azure Data Lake Storage Gen2 | Yes | Yes | | You must re-create any ACLs. |
71-
| Azure Data Lake Storage Gen1 | Yes | | | You must re-create any ACLs. |
74+
| Azure Data Lake Storage Gen1 | Yes | Yes | | You must re-create any ACLs. |
7275
| Azure Files | Yes | Yes | | You must re-create any ACLs. |
7376
| Azure File Sync | Yes | Yes | | |
7477
| Azure Managed Disks | Yes | N/A | | |
7578
| Azure Container Services for Kubernetes | Yes | Yes | | |
7679
| Azure Active Directory Domain Services | Yes | No | | |
7780
| App registrations | Yes | Yes | | |
7881

79-
If you are using encryption at rest for a resource, such as a storage account or SQL database, that has a dependency on a key vault that is NOT in the same subscription that is being transferred, it can lead to an unrecoverable scenario. If you have this situation, you should take steps to use a different key vault or temporarily disable customer-managed keys to avoid this unrecoverable scenario.
82+
> [!IMPORTANT]
83+
> If you use encryption at rest for a resource like a storage account or a SQL database and the resource has a dependency on a key vault that is *not* in the subscription that's being transferred, you might get an unrecoverable error. In this situation, use a different key vault or temporarily disable customer-managed keys to avoid an unrecoverable error.
8084
8185
## Prerequisites
8286

@@ -212,8 +216,8 @@ Managed identities do not get updated when a subscription is transferred to anot
212216
213217
When you create a key vault, it is automatically tied to the default Azure Active Directory tenant ID for the subscription in which it is created. All access policy entries are also tied to this tenant ID. For more information, see [Moving an Azure Key Vault to another subscription](../key-vault/general/move-subscription.md).
214218
215-
> [!WARNING]
216-
> If you are using encryption at rest for a resource, such as a storage account or a SQL database, that has a dependency on a key vault that is NOT in the same subscription that is being transferred, it can lead to an unrecoverable scenario. If you have this situation, you should take steps to use a different key vault or temporarily disable customer-managed keys to avoid this unrecoverable scenario.
219+
> [!IMPORTANT]
220+
> If you use encryption at rest for a resource like a storage account or a SQL database and the resource has a dependency on a key vault that is *not* in the subscription that's being transferred, you might get an unrecoverable error. In this situation, use a different key vault or temporarily disable customer-managed keys to avoid an unrecoverable error.
217221
218222
- If you have a key vault, use [az keyvault show](https://docs.microsoft.com/cli/azure/keyvault#az-keyvault-show) to list the access policies. For more information, see [Provide Key Vault authentication with an access control policy](../key-vault/key-vault-group-permissions-for-apps.md).
219223
@@ -223,7 +227,7 @@ When you create a key vault, it is automatically tied to the default Azure Activ
223227
224228
### List Azure SQL databases with Azure AD authentication
225229
226-
- Use [az sql server ad-admin list](https://docs.microsoft.com/cli/azure/sql/server/ad-admin#az-sql-server-ad-admin-list) and the [az graph](https://docs.microsoft.com/cli/azure/ext/resource-graph/graph) extension to see if you are using Azure SQL databases with Azure AD authentication. For more information, see [Configure and manage Azure Active Directory authentication with SQL](../sql-database/sql-database-aad-authentication-configure.md).
230+
- Use [az sql server ad-admin list](https://docs.microsoft.com/cli/azure/sql/server/ad-admin#az-sql-server-ad-admin-list) and the [az graph](https://docs.microsoft.com/cli/azure/ext/resource-graph/graph) extension to see if you are using Azure SQL databases with Azure AD authentication. For more information, see [Configure and manage Azure Active Directory authentication with SQL](../azure-sql/database/authentication-aad-configure.md).
227231
228232
```azurecli
229233
az sql server ad-admin list --ids $(az graph query -q 'resources | where type == "microsoft.sql/servers" | project id' -o tsv | cut -f1)

articles/spring-cloud/spring-cloud-faq.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ Yes.
8484

8585
It depends on the logic of resource providers that own the extension resources. The extension resources of a `Microsoft.AppPlatform` instance do not belong to the same namespace, so the behavior varies by resource provider. For example, the delete/move operation will not cascade to the **diagnostics settings** resources. If a new Azure Spring Cloud instance is provisioned with the same resource ID as the deleted one, or if the previous Azure Spring Cloud instance is moved back, the previous **diagnostics settings** resources continue extending it.
8686

87+
You can delete Spring Cloud's diagnostic settings by using Azure CLI:
88+
89+
```azurecli
90+
az monitor diagnostic-settings delete --name $diagnosticSettingName --resource $azureSpringCloudResourceId
91+
```
92+
8793
## Java runtime and OS versions
8894

8995
### Which versions of Java runtime are supported in Azure Spring Cloud?

0 commit comments

Comments
 (0)