Skip to content

Commit bf90c50

Browse files
authored
Merge pull request #301252 from MicrosoftDocs/main
6/12/2025 AM Publish
2 parents d6c135c + 89bbc5a commit bf90c50

File tree

46 files changed

+269
-736
lines changed

Some content is hidden

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

46 files changed

+269
-736
lines changed

articles/automation/automation-create-standalone-account.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The following table describes the fields on the **Basics** tab.
4848
|---|---|---|
4949
|Subscription|Required |From the drop-down list, select the Azure subscription for the account.|
5050
|Resource group|Required |From the drop-down list, select your existing resource group, or select **Create new**.|
51-
|Automation account name|Required |Enter a name unique for it's location and resource group. Names for Automation accounts that have been deleted might not be immediately available. You can't change the account name once it has been entered in the user interface. |
51+
|Automation account name|Required |Enter a name unique for its location and resource group. Names for Automation accounts that have been deleted might not be immediately available. You can't change the account name once it has been entered in the user interface. |
5252
|Region|Required |From the drop-down list, select a region for the account. For an updated list of locations that you can deploy an Automation account to, see [Products available by region](https://azure.microsoft.com/global-infrastructure/services/?products=automation&regions=all).|
5353

5454
The following image shows a standard configuration for a new Automation account.
@@ -68,7 +68,7 @@ The following table describes the fields on the **Advanced** tab.
6868
|System-assigned |Optional |A Microsoft Entra identity that is tied to the lifecycle of the Automation account. |
6969
|User-assigned |Optional |A managed identity represented as a standalone Azure resource that is managed separately from the resources that use it.|
7070

71-
You can chose to enable managed identities later, and the Automation account is created without one. To enable a managed identity after the account is created, see [Enable managed identity](enable-managed-identity-for-automation.md). If you select both options, for the user-assigned identity, select the **Add user assigned identities** option. On the **Select user assigned managed identity** page, select a subscription and add one or more user-assigned identities created in that subscription to assign to the Automation account.
71+
You can choose to enable managed identities later, and the Automation account is created without one. To enable a managed identity after the account is created, see [Enable managed identity](enable-managed-identity-for-automation.md). If you select both options, for the user-assigned identity, select the **Add user assigned identities** option. On the **Select user assigned managed identity** page, select a subscription and add one or more user-assigned identities created in that subscription to assign to the Automation account.
7272

7373
The following image shows a standard configuration for a new Automation account.
7474

@@ -109,7 +109,7 @@ When the Automation account is successfully created, several resources are autom
109109
110110
## Manage Automation account keys
111111

112-
When you create an Automation account, Azure generates two 512-bit automation account access keys for that account. These keys are shared access keys that are used as registration keys for registering [DSC nodes](./automation-dsc-onboarding.md#use-dsc-metaconfiguration-to-register-hybrid-machines) as well as [Windows](./automation-windows-hrw-install.md#manual-deployment) and [Linux](./automation-linux-hrw-install.md#manually-run-powershell-commands) Hybrid runbook workers. These keys are only used while registering DSC nodes and Hybrid workers. Existing machines configured as DSC nodes or hybrid workers won’t be affected after rotation of these keys.
112+
When you create an Automation account, Azure generates two 512-bit automation account access keys for that account. These keys are shared access keys that are used as registration keys for registering [DSC nodes](./automation-dsc-onboarding.md#use-dsc-metaconfiguration-to-register-hybrid-machines) These keys are only used while registering DSC nodes. Existing machines configured as DSC nodes or hybrid workers won’t be affected after rotation of these keys.
113113

114114
### View Automation account keys
115115

@@ -124,7 +124,7 @@ You can use any of the two keys to access your Automation account. However, we r
124124

125125
We recommend that you rotate your access keys periodically to keep the Automation account secure. As you have two access keys, you can rotate them using Azure portal or Azure PowerShell cmdlet.
126126

127-
Choose a client
127+
Choose a client:
128128

129129
# [Azure portal](#tab/azureportal)
130130

articles/automation/automation-disaster-recovery.md

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -47,30 +47,12 @@ If the Windows or Linux Hybrid Runbook worker is deployed using the extension-ba
4747
1. [Add](extension-based-hybrid-runbook-worker-install.md?tabs=windows#create-hybrid-worker-group) the same Hybrid Runbook worker to a Hybrid Worker group in the Automation account in the secondary region. The Hybrid worker extension is installed on the machine in the replica of the Automation account.
4848
1. Execute the jobs on the Hybrid Runbook worker created in Step 2.
4949

50-
For Hybrid Runbook worker deployed using the agent-based approach, choose from below:
51-
52-
#### [Windows Hybrid Runbook worker](#tab/win-hrw)
53-
54-
If the Windows Hybrid Runbook worker is deployed using an agent-based approach in a region different from the primary region of failure, follow the steps to continue executing Hybrid jobs:
55-
1. [Uninstall](automation-windows-hrw-install.md#remove-windows-hybrid-runbook-worker) the agent from the Hybrid Runbook worker present in the Automation account in the primary region.
56-
1. [Re-install](automation-windows-hrw-install.md#installation-options) the agent on the same machine in the replica Automation account in the secondary region.
57-
1. You can now execute jobs on the Hybrid Runbook worker created in Step 2.
58-
59-
#### [Linux Hybrid Runbook worker](#tab/linux-hrw)
60-
61-
If the Linux Hybrid Runbook worker is deployed using agent-based approach in a region different from the primary region of failure, follow the below steps to continue executing Hybrid jobs:
62-
1. [Uninstall](automation-linux-hrw-install.md#remove-linux-hybrid-runbook-worker) the agent from the Hybrid Runbook worker present in Automation account in the primary region.
63-
1. [Re-install](automation-linux-hrw-install.md#install-a-linux-hybrid-runbook-worker) the agent on the same machine in the replica Automation account in the secondary region.
64-
1. You can now execute jobs on the Hybrid Runbook worker created in Step 2.
65-
6650
---
6751

6852
### Scenario: Execute jobs on Hybrid Runbook Worker deployed in the primary region of failure
6953
If the Hybrid Runbook worker is deployed in the primary region, and there's a compute failure in that region, the machine won't be available for executing Automation jobs. You must provision a new virtual machine in an alternate region and register it as Hybrid Runbook Worker in Automation account in the secondary region.
7054

7155
- See the installation steps in [how to deploy an extension-based Windows or Linux User Hybrid Runbook Worker](extension-based-hybrid-runbook-worker-install.md?tabs=windows#create-hybrid-worker-group).
72-
- See the installation steps in [how to deploy an agent-based Windows Hybrid Worker](automation-windows-hrw-install.md#installation-options).
73-
- See the installation steps in [how to deploy an agent-based Linux Hybrid Worker](automation-linux-hrw-install.md#install-a-linux-hybrid-runbook-worker).
7456

7557
## Script to migrate Automation account assets from one region to another
7658

@@ -83,7 +65,6 @@ You can use these scripts for migration of Automation account assets from the ac
8365
1. Ensure that the system assigned managed identities of the primary Automation account have contributor access to the subscription it belongs to.
8466
1. Ensure that the primary Automation account's managed identity has Contributor access with read and write permissions to the Automation account in secondary region. To enable, provide the necessary permissions in secondary Automation account's managed identities. [Learn more](../role-based-access-control/quickstart-assign-role-user-portal.md).
8567
1. Ensure that the script has access to the Automation account assets in primary region. Hence, it should be executed as a runbook in that Automation account for successful migration.
86-
1. If the primary Automation account is deployed using a Run as account, then it must be switched to Managed Identity before migration. [Learn more](migrate-run-as-accounts-managed-identity.md).
8768
1. Modules required are:
8869

8970
- Az.Accounts version 2.8.0

articles/automation/automation-hybrid-runbook-worker.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,10 @@ To control the distribution of runbooks on Hybrid Runbook Workers and when or ho
9191

9292
## Hybrid Runbook Worker installation
9393

94-
The process to install a user Hybrid Runbook Worker depends on the operating system. The table below defines the deployment types.
95-
96-
|Operating System |Deployment Types |
97-
|---------|---------|
98-
|Windows | [Automated](automation-windows-hrw-install.md#automated-deployment)<br>[Manual](automation-windows-hrw-install.md#manual-deployment). |
99-
|Linux | [Manual](automation-linux-hrw-install.md#install-a-linux-hybrid-runbook-worker) |
100-
|Either | For user Hybrid Runbook Workers, see [Deploy an extension-based Windows or Linux user Hybrid Runbook Worker in Automation](./extension-based-hybrid-runbook-worker-install.md). This is the recommended method. |
94+
To install, see [Deploy an extension-based Windows or Linux user Hybrid Runbook Worker in Automation](./extension-based-hybrid-runbook-worker-install.md).
10195

10296
>[!NOTE]
103-
> Hybrid Runbook Worker is currently not supported on VM Scale Sets.
97+
> Hybrid Runbook Worker is currently not supported on Azure Virtual Machine Scale Sets.
10498
10599
## <a name="network-planning"></a>Network planning
106100

@@ -120,8 +114,8 @@ Azure Automation supports Azure virtual network service tags, starting with the
120114

121115
The service tag for the Azure Automation service only provides IPs used for the following scenarios:
122116

123-
* Trigger webhooks from within your virtual network
124-
* Allow Hybrid Runbook Workers or State Configuration agents on your VNet to communicate with the Automation service
117+
* Trigger webhooks from within your virtual network.
118+
* Allow Hybrid Runbook Workers or State Configuration agents on your VNet to communicate with the Automation service.
125119

126120
>[!NOTE]
127121
>The service tag **GuestAndHybridManagement** currently doesn't support runbook job execution in an Azure sandbox, only directly on a Hybrid Runbook Worker.

0 commit comments

Comments
 (0)