Skip to content

Commit 416ab6e

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into bastion-ddos
2 parents 1ade244 + b3c1bb7 commit 416ab6e

File tree

41 files changed

+523
-302
lines changed

Some content is hidden

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

41 files changed

+523
-302
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,12 @@
386386
"branch": "main",
387387
"branch_mapping": {}
388388
},
389+
{
390+
"path_to_root": "azureml-examples-mavaisma-r-azureml",
391+
"url": "https://github.com/azure/azureml-examples",
392+
"branch": "mavaisma-r-azureml",
393+
"branch_mapping": {}
394+
},
389395
{
390396
"path_to_root": "azureml-examples-v2samplesreorg",
391397
"url": "https://github.com/azure/azureml-examples",

articles/active-directory-b2c/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
- name: Authentication library
6767
href: ../active-directory/develop/msal-overview.md?bc=%2fazure%2factive-directory-b2c%2fbread%2ftoc.json&toc=%2fazure%2factive-directory-b2c%2fTOC.json
6868
displayName: MSAL, client library, Microsoft Authentication Library
69-
- name: Azure AD B2C global identitiy framework
69+
- name: Azure AD B2C global identity framework
7070
items:
7171
- name: Global identity solutions
7272
href: azure-ad-b2c-global-identity-solutions.md

articles/azure-monitor/logs/logs-data-export.md

Lines changed: 131 additions & 137 deletions
Large diffs are not rendered by default.

articles/azure-monitor/logs/move-workspace.md

Lines changed: 50 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ ms.custom: devx-track-azurepowershell
1010

1111
---
1212

13-
# Move a Log Analytics workspace to different subscription or resource group
13+
# Move a Log Analytics workspace to a different subscription or resource group
1414

15-
In this article, you'll learn the steps to move Log Analytics workspace to another resource group or subscription in the same region. You can learn more about moving Azure resources through the Azure portal, PowerShell, the Azure CLI, or the REST API. at [Move resources to a new resource group or subscription](../../azure-resource-manager/management/move-resource-group-and-subscription.md).
15+
In this article, you'll learn the steps to move a Log Analytics workspace to another resource group or subscription in the same region. To learn more about how to move Azure resources through the Azure portal, PowerShell, the Azure CLI, or the REST API, see [Move resources to a new resource group or subscription](../../azure-resource-manager/management/move-resource-group-and-subscription.md).
1616

1717
> [!IMPORTANT]
18-
> You can't move a workspace to a different region using this procedure. Follow [move a Log Analytics workspace to another region](./move-workspace-region.md) article to move workspace across regions.
18+
> You can't move a workspace to a different region by using this procedure. Follow the steps in the article [Move a Log Analytics workspace to another region](./move-workspace-region.md) to move a workspace across regions.
1919
20-
## Verify Active Directory tenant
20+
## Verify the Azure Active Directory tenant
2121
The workspace source and destination subscriptions must exist within the same Azure Active Directory tenant. Use Azure PowerShell to verify that both subscriptions have the same tenant ID.
2222

2323
```powershell
@@ -26,96 +26,99 @@ The workspace source and destination subscriptions must exist within the same Az
2626
```
2727

2828
## Workspace move considerations
29-
- Managed solutions that are installed in the workspace will be moved in this operation.
30-
- The move operation requires that there are no Linked Services to workspace. Solutions that rely on Linked Services must be removed prior to the move, including Automation account. These solutions must be removed before you can unlink your automation account. Data collection for the solutions will stop, their tables removed from UI, but data remains in workspace per tables retention period. When adding solutions after the move, ingestion is restored and tables become visible with data.
31-
- Update Management
32-
- Change Tracking
29+
30+
Consider these points before you move a Log Analytics workspace:
31+
32+
- Managed solutions that are installed in the workspace will be moved in this operation.
33+
- The move operation requires that no services can be linked to the workspace. Solutions that rely on linked services must be removed prior to the move, including an Azure Automation account. These solutions must be removed before you can unlink your Automation account. Data collection for the solutions will stop and their tables will be removed from the UI, but data will remain in the workspace per the table retention period. When you add solutions after the move, ingestion is restored and tables become visible with data. Linked services include:
34+
- Update management
35+
- Change tracking
3336
- Start/Stop VMs during off-hours
3437
- Microsoft Defender for Cloud
35-
- Workspace keys (both primary and secondary) are re-generated with workspace move operation. If you keep a copy of your workspace keys in key vault, update them with the new keys generated after the workspace move.
36-
- Connected [MMA agents](../agents/log-analytics-agent.md) remain connected and keep sending data to the workspace after the move. [AMA agents](../agents/azure-monitor-agent-overview.md) via DCR will be disconnected during the move and should be reconfigured after the move.
38+
- Workspace keys (both primary and secondary) are regenerated with a workspace move operation. If you keep a copy of your workspace keys in Azure Key Vault, update them with the new keys generated after the workspace is moved.
39+
- Connected [Log Analytics agents](../agents/log-analytics-agent.md) remain connected and keep sending data to the workspace after the move. [Azure Monitor Agent](../agents/azure-monitor-agent-overview.md) will be disconnected via data collection rules during the move and should be reconfigured after the move.
3740

3841
>[!IMPORTANT]
3942
> **Microsoft Sentinel customers**
40-
> - Currently, after Microsoft Sentinel is deployed on a workspace, moving the workspace to another resource group or subscription isn't supported.
41-
> - If you have already moved the workspace, disable all active rules under **Analytics** and re-enable them after five minutes. This should be an effective solution in most cases, though, to reiterate, it is unsupported and undertaken at your own risk.
42-
> - It could take Azure Resource Manager a few hours to complete and solutions may be unresponsive during the operation.
43-
>
44-
> **Re-create alerts**
45-
> - All alerts must be re-created because the permissions are based on workspace Resource ID, which changes during a workspace move or resource name change. Alerts in workspaces created after 1-June 2019, or in workspaces that were [upgraded from legacy Log Analytics alert API to scheduledQueryRules API](../alerts/alerts-log-api-switch.md) can be exported in template and deployed after the move. You can [check if scheduledQueryRules API is used for alerts in your workspace](../alerts/alerts-log-api-switch.md#check-switching-status-of-workspace). Alternatively, you can configure alerts manually in target workspace
43+
> - Currently, after Microsoft Sentinel is deployed on a workspace, moving the workspace to another resource group or subscription isn't supported.
44+
> - If you've already moved the workspace, disable all active rules under **Analytics** and reenable them after five minutes. This solution should be effective in most cases, although it's unsupported and undertaken at your own risk.
45+
> - It could take Azure Resource Manager a few hours to complete. Solutions might be unresponsive during the operation.
46+
>
47+
> **Re-create alerts:** All alerts must be re-created because the permissions are based on the workspace resource ID, which changes during a workspace move or resource name change. Alerts in workspaces created after June 1, 2019, or in workspaces that were [upgraded from the legacy Log Analytics Alert API to the scheduledQueryRules API](../alerts/alerts-log-api-switch.md) can be exported in templates and deployed after the move. You can [check if the scheduledQueryRules API is used for alerts in your workspace](../alerts/alerts-log-api-switch.md#check-switching-status-of-workspace). Alternatively, you can configure alerts manually in the target workspace.
4648
>
47-
> **Update resource paths**
48-
> - After a workspace move, any Azure or external resources that point to the workspace must be reviewed and updated to point to the new resource target path.
49-
>
50-
> *Examples:*
49+
> **Update resource paths:** After a workspace move, any Azure or external resources that point to the workspace must be reviewed and updated to point to the new resource target path.
50+
>
51+
> Examples:
5152
> - [Azure Monitor alert rules](../alerts/alerts-resource-move.md)
5253
> - Third-party applications
5354
> - Custom scripting
5455
>
5556
56-
### Delete solutions in Azure portal
57-
Use the following procedure to remove the solutions using the Azure portal:
57+
### Delete solutions in the Azure portal
58+
Use the following procedure to remove solutions by using the Azure portal:
5859

59-
1. Open the menu for the resource group that any solutions are installed in.
60-
2. Select the solutions to remove.
61-
3. Click **Delete Resources** and then confirm the resources to be removed by clicking **Delete**.
60+
1. Open the menu for the resource group where any solutions are installed.
61+
1. Select the solutions to remove.
62+
1. Select **Delete Resources** and then confirm the resources to be removed by selecting **Delete**.
6263

63-
[![Delete solutions](media/move-workspace/delete-solutions.png)](media/move-workspace/delete-solutions.png#lightbox)
64+
[![Screenshot that shows deleting solutions.](media/move-workspace/delete-solutions.png)](media/move-workspace/delete-solutions.png#lightbox)
6465

65-
### Delete using PowerShell
66+
### Delete by using PowerShell
6667

67-
To remove the solutions using PowerShell, use the [Remove-AzResource](/powershell/module/az.resources/remove-azresource) cmdlet as shown in the following example:
68+
To remove solutions by using PowerShell, use the [Remove-AzResource](/powershell/module/az.resources/remove-azresource) cmdlet as shown in the following example:
6869

6970
```powershell
7071
Remove-AzResource -ResourceType 'Microsoft.OperationsManagement/solutions' -ResourceName "ChangeTracking(<workspace-name>)" -ResourceGroupName <resource-group-name>
7172
Remove-AzResource -ResourceType 'Microsoft.OperationsManagement/solutions' -ResourceName "Updates(<workspace-name>)" -ResourceGroupName <resource-group-name>
7273
Remove-AzResource -ResourceType 'Microsoft.OperationsManagement/solutions' -ResourceName "Start-Stop-VM(<workspace-name>)" -ResourceGroupName <resource-group-name>
7374
```
7475

75-
### Remove alert rules for Start/Stop VMs solution
76-
To remove **Start/Stop VMs** solution, you also need to remove the alert rules created by the solution. Use the following procedure in the Azure portal to remove these rules.
76+
### Remove alert rules for the Start/Stop VMs solution
77+
To remove the **Start/Stop VMs** solution, you also need to remove the alert rules created by the solution. Use the following procedure in the Azure portal to remove these rules:
7778

7879
1. Open the **Monitor** menu and then select **Alerts**.
79-
2. Click **Manage alert rules**.
80-
3. Select the following three alert rules, and then click **Delete**.
80+
1. Select **Manage alert rules**.
81+
1. Select the following three alert rules, and then select **Delete**:
8182

8283
- AutoStop_VM_Child
8384
- ScheduledStartStop_Parent
8485
- SequencedStartStop_Parent
8586

86-
[![Delete rules](media/move-workspace/delete-rules.png)](media/move-workspace/delete-rules.png#lightbox)
87+
[![Screenshot that shows deleting rules.](media/move-workspace/delete-rules.png)](media/move-workspace/delete-rules.png#lightbox)
8788

88-
## Unlink Automation account
89-
Use the following procedure to unlink the Automation account from the workspace using the Azure portal:
89+
## Unlink the Automation account
90+
Use the following procedure to unlink the Automation account from the workspace by using the Azure portal:
9091

9192
1. Open the **Automation accounts** menu and then select the account to remove.
92-
2. In the **Related Resources** section of the menu, select **Linked workspace**.
93-
3. Click **Unlink workspace** to unlink the workspace from your Automation account.
93+
1. On the **Related Resources** section of the menu, select **Linked workspace**.
94+
1. Select **Unlink workspace** to unlink the workspace from your Automation account.
9495

95-
[![Unlink workspace](media/move-workspace/unlink-workspace.png)](media/move-workspace/unlink-workspace.png#lightbox)
96+
[![Screenshot that shows unlinking a workspace.](media/move-workspace/unlink-workspace.png)](media/move-workspace/unlink-workspace.png#lightbox)
9697

9798
## Move your workspace
9899

100+
Move your workspace by using the Azure portal or PowerShell.
101+
99102
### Azure portal
100-
Use the following procedure to move your workspace using the Azure portal:
103+
Use the following procedure to move your workspace by using the Azure portal:
101104

102105
1. Open the **Log Analytics workspaces** menu and then select your workspace.
103-
2. In the **Overview** page, click **change** next to either **Resource group** or **Subscription**.
104-
3. A new page opens with a list of resources related to the workspace. Select the resources to move to the same destination subscription and resource group as the workspace.
105-
4. Select a destination **Subscription** and **Resource group**. If you're moving the workspace to another resource group in the same subscription, you won't see the **Subscription** option.
106-
5. Click **OK** to move the workspace and selected resources.
106+
1. On the **Overview** page, select **change** next to either **Resource group** or **Subscription name**.
107+
1. A new page opens with a list of resources related to the workspace. Select the resources to move to the same destination subscription and resource group as the workspace.
108+
1. Select a destination **Subscription** and **Resource group**. If you're moving the workspace to another resource group in the same subscription, you won't see the **Subscription** option.
109+
1. Select **OK** to move the workspace and selected resources.
107110

108-
[![Screenshot shows the Overview pane in the Log Analytics workspace with options to change the resource group and subscription name.](media/move-workspace/portal.png)](media/move-workspace/portal.png#lightbox)
111+
[![Screenshot that shows the Overview pane in the Log Analytics workspace with options to change the resource group and subscription name.](media/move-workspace/portal.png)](media/move-workspace/portal.png#lightbox)
109112

110113
### PowerShell
111-
To move your workspace using PowerShell, use the [Move-AzResource](/powershell/module/AzureRM.Resources/Move-AzureRmResource) as in the following example:
114+
To move your workspace by using PowerShell, use the [Move-AzResource](/powershell/module/AzureRM.Resources/Move-AzureRmResource) cmdlet as shown in the following example:
112115

113116
```powershell
114117
Move-AzResource -ResourceId "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/MyResourceGroup01/providers/Microsoft.OperationalInsights/workspaces/MyWorkspace" -DestinationSubscriptionId "00000000-0000-0000-0000-000000000000" -DestinationResourceGroupName "MyResourceGroup02"
115118
```
116119

117120
> [!IMPORTANT]
118-
> After the move operation, removed solutions and Automation account link should be reconfigured to bring the workspace back to its previous state.
121+
> After the move operation, removed solutions and the Automation account link should be reconfigured to bring the workspace back to its previous state.
119122
120123
## Next steps
121-
- For a list of which resources support move, see [Move operation support for resources](../../azure-resource-manager/management/move-support-resources.md).
124+
For a list of which resources support the move operation, see [Move operation support for resources](../../azure-resource-manager/management/move-support-resources.md).

articles/azure-resource-manager/management/move-support-resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1903,7 +1903,7 @@ Before starting your move operation, review the [checklist](./move-resource-grou
19031903
> | sites / premieraddons | **Yes** | **Yes** | No |
19041904
> | sites / slots | **Yes** | **Yes** | No |
19051905
> | sourcecontrols | No | No | No |
1906-
> | staticsites | No | No | No |
1906+
> | staticsites | Yes | Yes | No |
19071907
19081908
## Microsoft.WindowsESU
19091909

articles/communication-services/quickstarts/access-tokens.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Access tokens let Azure Communication Services SDKs [authenticate](../concepts/a
2121
In this quickstart, you'll learn how to use the Azure Communication Services SDKs to create identities and manage your access tokens. For production use cases, we recommend that you generate access tokens on a [server-side service](../concepts/client-and-server-architecture.md).
2222

2323
::: zone pivot="platform-azcli"
24-
[!INCLUDE [Azure CLI](./includes/access-tokens/access-token-azcli.md)]
24+
[!INCLUDE [Azure CLI](./includes/access-tokens/access-token-az-cli.md)]
2525
::: zone-end
2626

2727
::: zone pivot="programming-language-csharp"

articles/communication-services/quickstarts/chat/get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.custom: mode-other
1818
Get started with Azure Communication Services by using the Communication Services Chat SDK to add real-time chat to your application. In this quickstart, we'll use the Chat SDK to create chat threads that allow users to have conversations with one another. To learn more about Chat concepts, visit the [chat conceptual documentation](../../concepts/chat/concepts.md).
1919

2020
::: zone pivot="platform-azcli"
21-
[!INCLUDE [Chat with Azure CLI](./includes/chat-azcli.md)]
21+
[!INCLUDE [Chat with Azure CLI](./includes/chat-az-cli.md)]
2222
::: zone-end
2323

2424
::: zone pivot="programming-language-javascript"

articles/communication-services/quickstarts/create-communication-resource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Get started with Azure Communication Services by provisioning your first Communi
3131
::: zone-end
3232

3333
::: zone pivot="platform-azcli"
34-
[!INCLUDE [Azure CLI](./includes/create-resource-azcli.md)]
34+
[!INCLUDE [Azure CLI](./includes/create-resource-az-cli.md)]
3535
::: zone-end
3636

3737
::: zone pivot="platform-net"

articles/communication-services/quickstarts/identity/access-token-teams-external-users.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Teams external users are authenticated as Azure Communication Services users in
2121
In this quickstart, you'll learn how to use the Azure Communication Services SDKs to create identities and manage your access tokens. For production use cases, we recommend that you generate access tokens on a [server-side service](../../concepts/client-and-server-architecture.md).
2222

2323
::: zone pivot="platform-azcli"
24-
[!INCLUDE [Azure CLI](../includes/access-tokens/access-token-azcli.md)]
24+
[!INCLUDE [Azure CLI](../includes/access-tokens/access-token-az-cli.md)]
2525
::: zone-end
2626

2727
::: zone pivot="programming-language-csharp"

0 commit comments

Comments
 (0)