Skip to content

Commit 41d7ddf

Browse files
GitHubber17GitHubber17
authored
Merge pull request #111926 from MicrosoftDocs/master
Merge master to live Sunday 4:00 PM
2 parents a317e70 + 3cdba96 commit 41d7ddf

File tree

57 files changed

+938
-849
lines changed

Some content is hidden

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

57 files changed

+938
-849
lines changed

‎articles/automation/how-to/move-account.md

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Move your Azure Automation account to another subscription
3-
description: This article describes how to move your Automation account to another subscription
3+
description: This article describes how to move your Automation account to another subscription.
44
services: automation
55
ms.service: automation
66
ms.subservice: process-automation
@@ -12,37 +12,39 @@ manager: carmonm
1212
---
1313
# Move your Azure Automation account to another subscription
1414

15-
Azure provides you the ability to move some resources to a new resource group or subscription. You can move resources through the Azure portal, PowerShell, the Azure CLI, or the REST API. To learn more about the process, see [Move resources to a new resource group or subscription](../../azure-resource-manager/management/move-resource-group-and-subscription.md).
15+
Azure Automation allows you to move some resources to a new resource group or subscription. You can move resources through the Azure portal, PowerShell, the Azure CLI, or the REST API. To learn more about the process, see [Move resources to a new resource group or subscription](../../azure-resource-manager/management/move-resource-group-and-subscription.md).
1616

17-
Azure Automation accounts are one of the resources that can be moved. In this article, you'll learn the steps to move Automation accounts to another resource or subscription.
18-
19-
The high-level steps to moving your Automation account are:
17+
Azure Automation accounts are one of the resources that can be moved. In this article, you'll learn the steps to move Automation accounts to another resource or subscription. The high-level steps to moving your Automation account are:
2018

2119
1. Remove your solutions.
2220
2. Unlink your workspace.
2321
3. Move the Automation account.
24-
4. Delete and re-create the Run As accounts.
22+
4. Delete and recreate the Run As accounts.
2523
5. Re-enable your solutions.
2624

25+
>[!NOTE]
26+
>This article has been updated to use the new Azure PowerShell Az module. You can still use the AzureRM module, which will continue to receive bug fixes until at least December 2020. To learn more about the new Az module and AzureRM compatibility, see [Introducing the new Azure PowerShell Az module](https://docs.microsoft.com/powershell/azure/new-azureps-module-az?view=azps-3.5.0). For Az module installation instructions on your Hybrid Runbook Worker, see [Install the Azure PowerShell Module](https://docs.microsoft.com/powershell/azure/install-az-ps?view=azps-3.5.0). For your Automation account, you can update your modules to the latest version using [How to update Azure PowerShell modules in Azure Automation](../automation-update-azure-modules.md).
27+
2728
## Remove solutions
2829

2930
To unlink your workspace from your Automation account, these solutions must be removed from your workspace:
30-
- **Change Tracking and Inventory**
31-
- **Update Management**
32-
- **Start/Stop VMs during off hours**
3331

34-
In your resource group, find each solution and select **Delete**. On the **Delete Resources** page, confirm the resources to be removed, and select **Delete**.
32+
- Change Tracking and Inventory
33+
- Update Management
34+
- Start/Stop VMs during off hours
35+
36+
In your resource group, find each solution and select **Delete**. On the Delete Resources page, confirm the resources to be removed, and select **Delete**.
3537

3638
![Delete solutions from the Azure portal](../media/move-account/delete-solutions.png)
3739

38-
You can accomplish the same task with the [Remove-AzureRmResource](/powershell/module/azurerm.resources/remove-azurermresource) cmdlet as shown in the following example:
40+
You can accomplish the same task with the [Remove-AzResource](https://docs.microsoft.com/powershell/module/Az.Resources/Remove-AzResource?view=azps-3.7.0) cmdlet as shown in the following example:
3941

4042
```azurepowershell-interactive
4143
$workspaceName = <myWorkspaceName>
4244
$resourceGroupName = <myResourceGroup>
43-
Remove-AzureRmResource -ResourceType 'Microsoft.OperationsManagement/solutions' -ResourceName "ChangeTracking($workspaceName)" -ResourceGroupName $resourceGroupName
44-
Remove-AzureRmResource -ResourceType 'Microsoft.OperationsManagement/solutions' -ResourceName "Updates($workspaceName)" -ResourceGroupName $resourceGroupName
45-
Remove-AzureRmResource -ResourceType 'Microsoft.OperationsManagement/solutions' -ResourceName "Start-Stop-VM($workspaceName)" -ResourceGroupName $resourceGroupName
45+
Remove-AzResource -ResourceType 'Microsoft.OperationsManagement/solutions' -ResourceName "ChangeTracking($workspaceName)" -ResourceGroupName $resourceGroupName
46+
Remove-AzResource -ResourceType 'Microsoft.OperationsManagement/solutions' -ResourceName "Updates($workspaceName)" -ResourceGroupName $resourceGroupName
47+
Remove-AzResource -ResourceType 'Microsoft.OperationsManagement/solutions' -ResourceName "Start-Stop-VM($workspaceName)" -ResourceGroupName $resourceGroupName
4648
```
4749

4850
### Additional steps for Start/Stop VMs
@@ -53,7 +55,7 @@ In the Azure portal, go to your resource group and select **Monitoring** > **Ale
5355

5456
![Alerts page showing selection of Manage Alert rules](../media/move-account/alert-rules.png)
5557

56-
On the **Rules** page, you should see a list of the alerts configured in that resource group. The **Start/Stop VMs** solution creates three alert rules:
58+
On the Rules page, you should see a list of the alerts configured in that resource group. The **Start/Stop VMs** solution creates three alert rules:
5759

5860
* AutoStop_VM_Child
5961
* ScheduledStartStop_Parent
@@ -64,20 +66,20 @@ Select these three alert rules, and then select **Delete**. This action will rem
6466
![Rules page requesting confirmation of deletion for selected rules](../media/move-account/delete-rules.png)
6567

6668
> [!NOTE]
67-
> If you don't see any alert rules on the **Rules** page, change the **Status** to show **Disabled** alerts, because you might have disabled them.
69+
> If you don't see any alert rules on the Rules page, change the **Status** to Disabled to show disabled alerts, because you might have disabled them.
6870
6971
When the alert rules are removed, remove the action group that was created for the **Start/Stop VMs** solution notifications.
7072

7173
In the Azure portal, select **Monitor** > **Alerts** > **Manage action groups**.
7274

7375
Select **StartStop_VM_Notification** from the list. On the action group page, select **Delete**.
74-
76+
A
7577
![Action group page, select delete](../media/move-account/delete-action-group.png)
7678

77-
Similarly, you can delete your action group by using PowerShell with the [Remove-AzureRmActionGroup](/powershell/module/azurerm.insights/remove-azurermactiongroup) cmdlet, as seen in the following example:
79+
Similarly, you can delete your action group by using PowerShell with the [Remove-AzActionGroup](https://docs.microsoft.com/powershell/module/az.monitor/remove-azactiongroup?view=azps-3.7.0) cmdlet, as seen in the following example:
7880

7981
```azurepowershell-interactive
80-
Remove-AzureRmActionGroup -ResourceGroupName <myResourceGroup> -Name StartStop_VM_Notification
82+
Remove-AzActionGroup -ResourceGroupName <myResourceGroup> -Name StartStop_VM_Notification
8183
```
8284

8385
## Unlink your workspace
@@ -104,7 +106,7 @@ Go to your Automation account in the new subscription and select **Run as accoun
104106

105107
![Run As accounts are incomplete](../media/move-account/run-as-accounts.png)
106108

107-
Select each Run As account. On the **Properties** page, select **Delete** to delete the Run As account.
109+
Select each Run As account. On the Properties page, select **Delete** to delete the Run As account.
108110

109111
> [!NOTE]
110112
> If you do not have permissions to create or view the Run As accounts, you'll see the following message: `You do not have permissions to create an Azure Run As account (service principal) and grant the Contributor role to the service principal.` To learn about the permissions required to configure a Run As account, see [Permissions required to configure Run As accounts](../manage-runas-account.md#permissions).
@@ -121,7 +123,7 @@ Machines that are onboarded with your solutions will be visible when you've conn
121123

122124
To turn on the **Start/Stop VMs** during off-hours solution, you'll need to redeploy the solution. Under **Related Resources**, select **Start/Stop VMs** > **Learn more about and enable the solution** > **Create** to start the deployment.
123125

124-
On the **Add Solution** page, choose your Log Analytics Workspace and Automation account.
126+
On the Add Solution page, choose your Log Analytics workspace and Automation account.
125127

126128
![Add Solution menu](../media/move-account/add-solution-vm.png)
127129

‎articles/automation/how-to/region-mappings.md

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Azure Automation and Log Analytics workspace mappings
3-
description: This article describes the mappings allowed between an Automation Account and a Log Analytics Workspace to support solution
3+
description: This article describes the mappings allowed between an Automation account and a Log Analytics Workspace to support solution
44
services: automation
55
ms.service: automation
66
ms.subservice: process-automation
@@ -10,9 +10,10 @@ ms.date: 05/20/2019
1010
ms.topic: conceptual
1111
manager: carmonm
1212
---
13+
1314
# Workspace mappings
1415

15-
When enabling solutions like Update Management, Change Tracking and Inventory, or the Start/Stop VMs during off-hours solution, only certain regions are supported for linking a Log Analytics workspace and an Automation Account. This mapping only applies to the Automation Account and the Log Analytics workspace. The resources reporting to your Automation Account or Log Analytics workspace can reside in other regions.
16+
When enabling solutions like Update Management, Change Tracking and Inventory, or Start/Stop VMs during off hours, only certain regions are supported for linking a Log Analytics workspace and an Automation account. This mapping only applies to the Automation account and the Log Analytics workspace. The resources reporting to your Automation account or Log Analytics workspace can reside in other regions.
1617

1718
## Supported mappings
1819

@@ -37,50 +38,47 @@ The following table shows the supported mappings:
3738
|**US Gov**||
3839
|USGovVirginia|USGovVirginia|
3940

40-
<sup>1</sup> EastUS mapping for Log Analytics workspaces to Automation Accounts is not an exact region to region mapping but is the correct mapping.
41+
<sup>1</sup> EastUS mapping for Log Analytics workspaces to Automation accounts is not an exact region to region mapping but is the correct mapping.
4142

42-
<sup>2</sup> Due to capacity restraints the region isn't available when creating new resources. This includes Automation Accounts and Log Analytics workspaces. However, preexisting linked resources in the region should continue to work.
43+
<sup>2</sup> Due to capacity restraints the region isn't available when creating new resources. This includes Automation accounts and Log Analytics workspaces. However, pre-existing linked resources in the region should continue to work.
4344

4445
## Unlink workspace
4546

46-
If you decide you no longer wish to integrate your Automation account with a Log Analytics workspace, you can unlink your account directly from the Azure portal. Before you proceed, you first need to remove the Update Management, Change Tracking and Inventory, or the Start/Stop VMs during off-hours solutions if you are using them. If you do not remove them, this process will be prevented from proceeding. Review the article for the particular solution you have imported to understand the steps required to remove it.
47+
If you decide that you no longer want to integrate your Automation account with a Log Analytics workspace, you can unlink your account directly from the Azure portal. Before proceeding, you first need to remove the Update Management, Change Tracking and Inventory, and Start/Stop VMs during off hours solutions if you are using them. If you do not remove them, you can't complete the unlinking operation. Review the article for the particular solution you've imported to understand the steps required to remove it.
4748

4849
After you remove these solutions, you can perform the following steps to unlink your Automation account.
4950

5051
> [!NOTE]
51-
> Some solutions including earlier versions of the Azure SQL monitoring solution may have created automation assets and may also need to be removed prior to unlinking the workspace.
52+
> Some solutions including earlier versions of the Azure SQL monitoring solution might have created automation assets and might need to be removed prior to unlinking the workspace.
5253
53-
1. From the Azure portal, open your Automation account, and on the Automation account page select **Linked workspace** under the section **Related Resources** on the left.
54+
1. From the Azure portal, open your Automation account. On the Automation account page, select **Linked workspace** under **Related Resources**.
5455

55-
2. On the Unlink workspace page, click **Unlink workspace**. You'll receive a prompt verifying you wish to continue.
56+
2. On the Unlink workspace page, click **Unlink workspace**. You'll receive a prompt verifying if you wish to continue.
5657

5758
3. While Azure Automation attempts to unlink the account your Log Analytics workspace, you can track the progress under **Notifications** from the menu.
5859

59-
If you used the Update Management solution, optionally you may want to remove the following items that are no longer needed after you remove the solution.
60-
61-
* Update schedules - Each will have names that match the update deployments you created)
60+
4. If you used the Update Management solution, optionally you might want to remove the following items that are no longer needed after you remove the solution.
6261

63-
* Hybrid worker groups created for the solution - Each will be named similarly to `machine1.contoso.com_9ceb8108-26c9-4051-b6b3-227600d715c8`).
62+
* Update schedules - Each has a name that matches an update deployment that you created.
63+
* Hybrid worker groups created for the solution - Each has a name similar to `machine1.contoso.com_9ceb8108-26c9-4051-b6b3-227600d715c8`.
6464

65-
If you used the Start/Stop VMs during off-hours solution, optionally you may want to remove the following items that are no longer needed after you remove the solution.
65+
5. If you used the Start/Stop VMs during off hours solution, you can optionally remove the following items that aren't needed after you remove the solution.
6666

67-
* Start and stop VM runbook schedules
68-
* Start and stop VM runbooks
69-
* Variables
67+
* Start and stop VM runbook schedules
68+
* Start and stop VM runbooks
69+
* Variables
7070

71-
Alternatively, you can also unlink your workspace from your Automation Account from your Log Analytics workspace. On your workspace, select **Automation Account** under **Related Resources**. On the Automation Account page, select **Unlink account**.
71+
Alternatively, you can unlink your workspace from your Automation account from your Log Analytics workspace. In the workspace, select **Automation Account** under **Related Resources**. On the Automation Account page, select **Unlink account**.
7272

7373
## Next steps
7474

75-
Learn how to onboard the following solutions:
76-
77-
Update Management and Change Tracking and Inventory:
75+
* Learn how to onboard Update Management and Change Tracking and Inventory solutions:
7876

79-
* From a [virtual machine](../automation-onboard-solutions-from-vm.md)
80-
* From your [Automation account](../automation-onboard-solutions-from-automation-account.md)
81-
* When [browsing multiple machines](../automation-onboard-solutions-from-browse.md)
82-
* From a [runbook](../automation-onboard-solutions.md)
77+
* From a [virtual machine](../automation-onboard-solutions-from-vm.md)
78+
* From your [Automation account](../automation-onboard-solutions-from-automation-account.md)
79+
* When [browsing multiple machines](../automation-onboard-solutions-from-browse.md)
80+
* From a [runbook](../automation-onboard-solutions.md)
8381

84-
Start/Stop VMs during off-hours
82+
* Learn how to onboard the Start/Stop VMs during off hours solution:
8583

86-
* [Deploy Start/Stop VMs during off-hours](../automation-solution-vm-management.md)
84+
* [Deploy Start/Stop VMs during off hours](../automation-solution-vm-management.md)

0 commit comments

Comments
 (0)