Skip to content

Commit 06b223f

Browse files
authored
Merge pull request #208679 from MicrosoftDocs/main
Publish to live, Monday 4 AM PST, 8/22
2 parents af4b731 + 6ce06d8 commit 06b223f

33 files changed

+239
-286
lines changed

.openpublishing.redirection.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18319,14 +18319,19 @@
1831918319
"redirect_document_id": false
1832018320
},
1832118321
{
18322-
"source_path_from_root": "/articles/connectors/connectors-create-api-bingsearch.md",
18322+
"source_path_from_root": "/articles/connectors/connectors-create-api-bingsearch.md",
1832318323
"redirect_url": "/connectors/bingsearch",
18324-
"redirect_document_id": false
18324+
"redirect_document_id": false
1832518325
},
1832618326
{
18327-
"source_path_from_root": "/articles/connectors/connectors-create-api-twilio.md",
18328-
"redirect_url": "/connectors/twilio",
18329-
"redirect_document_id": false
18327+
"source_path_from_root": "/articles/connectors/connectors-create-api-twilio.md",
18328+
"redirect_url": "/connectors/twilio",
18329+
"redirect_document_id": false
18330+
},
18331+
{
18332+
"source_path_from_root": "/articles/connectors/connectors-create-api-sendgrid.md",
18333+
"redirect_url": "/connectors/sendgrid",
18334+
"redirect_document_id": false
1833018335
},
1833118336
{
1833218337
"source_path_from_root": "/articles/connectors/connectors-schema-migration.md",

articles/active-directory/saas-apps/toc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1456,7 +1456,9 @@
14561456
- name: Meta Networks Connector
14571457
href: metanetworksconnector-tutorial.md
14581458
- name: Metatask
1459-
href: metatask-tutorial.md
1459+
href: metatask-tutorial.md
1460+
- name: Meta Work Accounts
1461+
href: meta-work-accounts-tutorial.md
14601462
- name: Mevisio
14611463
href: mevisio-tutorial.md
14621464
- name: Michigan Data Hub Single Sign-On

articles/automation/automation-hrw-run-runbooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ There are two ways to use the Managed Identities in Hybrid Runbook Worker script
163163
164164
---
165165
166-
**An Arc-enabled server running as a Hybrid Runbook Worker** already has a built-in System Managed Identity assigned to it which can be used for authentication.
166+
**An Arc-enabled server or Arc-enabled VMware vSphere VM** running as a Hybrid Runbook Worker already has a built-in System Managed Identity assigned to it which can be used for authentication.
167167
168168
1. You can grant this Managed Identity access to resources in your subscription in the Access control (IAM) blade for the resource by adding the appropriate role assignment.
169169

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ ms.custom: devx-track-azurepowershell
1212

1313
Runbooks in Azure Automation might not have access to resources in other clouds or in your on-premises environment because they run on the Azure cloud platform. You can use the Hybrid Runbook Worker feature of Azure Automation to run runbooks directly on the machine hosting the role and against resources in the environment to manage those local resources. Runbooks are stored and managed in Azure Automation and then delivered to one or more assigned machines.
1414

15-
Azure Automation provides native integration of the Hybrid Runbook Worker role through the Azure virtual machine (VM) extension framework. The Azure VM agent is responsible for management of the extension on Azure VMs on Windows and Linux VMs, and on non-Azure machines through the Arc-enabled servers Connected Machine agent. Now there are two Hybrid Runbook Workers installation platforms supported by Azure Automation.
16-
15+
Azure Automation provides native integration of the Hybrid Runbook Worker role through the Azure virtual machine (VM) extension framework. The Azure VM agent is responsible for management of the extension on Azure VMs on Windows and Linux VMs, and [Azure Connected Machine agent](../azure-arc/servers/agent-overview.md) on Non-Azure machines including [Azure Arc-enabled Servers](../azure-arc/servers/overview.md) and [Azure Arc-enabled VMware vSphere](../azure-arc/vmware-vsphere/overview.md). Now there are two Hybrid Runbook Workers installation platforms supported by Azure Automation.
16+
1717
| Platform | Description |
1818
|---|---|
1919
|**Extension-based (V2)** |Installed using the [Hybrid Runbook Worker VM extension](./extension-based-hybrid-runbook-worker-install.md), without any dependency on the Log Analytics agent reporting to an Azure Monitor Log Analytics workspace. **This is the recommended platform**.|
2020
|**Agent-based (V1)** |Installed after the [Log Analytics agent](../azure-monitor/agents/log-analytics-agent.md) reporting to an Azure Monitor [Log Analytics workspace](../azure-monitor/logs/log-analytics-workspace-overview.md) is completed.|
2121

22-
23-
:::image type="content" source="./media/automation-hybrid-runbook-worker/hybrid-worker-group-platform.png" alt-text="Hybrid worker group showing platform field":::
22+
:::image type="content" source="./media/automation-hybrid-runbook-worker/hybrid-worker-group-platform-inline.png" alt-text="Screenshot of hybrid worker group showing platform field." lightbox="./media/automation-hybrid-runbook-worker/hybrid-worker-group-platform-expanded.png":::
2423

2524
Here's a list of benefits available with the extension-based Hybrid Runbook Worker role:
2625

articles/automation/extension-based-hybrid-runbook-worker-install.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ The extension-based onboarding is only for **User** Hybrid Runbook Workers. This
1414

1515
For **System** Hybrid Runbook Worker onboarding, see [Deploy an agent-based Windows Hybrid Runbook Worker in Automation](./automation-windows-hrw-install.md) or [Deploy an agent-based Linux Hybrid Runbook Worker in Automation](./automation-linux-hrw-install.md).
1616

17-
You can use the user Hybrid Runbook Worker feature of Azure Automation to run runbooks directly on an Azure machine or a non-Azure machine through servers registered with [Azure Arc-enabled servers](../azure-arc/servers/overview.md). From the machine or server that's hosting the role, you can run runbooks directly against it and against resources in the environment to manage those local resources.
1817

18+
You can use the user Hybrid Runbook Worker feature of Azure Automation to run runbooks directly on an Azure or non-Azure machine, including [Azure Arc-enabled servers](../azure-arc/servers/overview.md) and [Arc-enabled VMware vSphere](../azure-arc/vmware-vsphere/overview.md). From the machine or server that's hosting the role, you can run runbooks directly against it and against resources in the environment to manage those local resources.
1919
Azure Automation stores and manages runbooks and then delivers them to one or more chosen machines. After you successfully deploy a runbook worker, review [Run runbooks on a Hybrid Runbook Worker](automation-hrw-run-runbooks.md) to learn how to configure your runbooks to automate processes in your on-premises datacenter or other cloud environment.
2020

2121

@@ -28,8 +28,8 @@ Azure Automation stores and manages runbooks and then delivers them to one or mo
2828

2929
- Two cores
3030
- 4 GB of RAM
31-
- The system-assigned managed identity must be enabled on the Azure virtual machine or Arc-enabled server. If the system-assigned managed identity isn't enabled, it will be enabled as part of the adding process.
32-
- Non-Azure machines must have the Azure Arc-enabled servers agent (the connected machine agent) installed. To install the `AzureConnectedMachineAgent`, see [Connect hybrid machines to Azure from the Azure portal](../azure-arc/servers/onboard-portal.md).
31+
- The system-assigned managed identity must be enabled on the Azure virtual machine, Arc-enabled server or Arc-enabled VMware vSphere VM. If the system-assigned managed identity isn't enabled, it will be enabled as part of the adding process.
32+
- Non-Azure machines must have the [Azure Connected Machine agent](../azure-arc/servers/agent-overview.md) installed. To install the `AzureConnectedMachineAgent`, see [Connect hybrid machines to Azure from the Azure portal](../azure-arc/servers/onboard-portal.md) for Arc-enabled servers or see [Manage VMware virtual machines Azure Arc](../azure-arc/vmware-vsphere/manage-vmware-vms-in-azure.md#enable-guest-management) for Arc-enabled VMware vSphere VMs.
3333

3434
### Supported operating systems
3535

@@ -65,7 +65,7 @@ Azure Automation stores and manages runbooks and then delivers them to one or mo
6565
If you use a proxy server for communication between Azure Automation and machines running the extension-base Hybrid Runbook Worker, ensure that the appropriate resources are accessible. The timeout for requests from the Hybrid Runbook Worker and Automation services is 30 seconds. After three attempts, a request fails.
6666

6767
> [!NOTE]
68-
> You can set up the proxy settings by PowerShell cmdlets or API.
68+
> For Azure VMs and Arc-enabled Servers, you can set up the proxy settings using PowerShell cmdlets or API. This is currently not supported for Arc-enabled VMware vSphere VMs.
6969
7070
To install the extension using cmdlets:
7171

@@ -169,7 +169,7 @@ To create a hybrid worker group in the Azure portal, follow these steps:
169169
- If you select **Default**, the hybrid extension will be installed using the local system account.
170170
- If you select **Custom**, then from the drop-down list, select the credential asset.
171171

172-
1. Select **Next** to advance to the **Hybrid workers** tab. You can select Azure virtual machines or Azure Arc-enabled servers to be added to this Hybrid worker group. If you don't select any machines, an empty Hybrid worker group will be created. You can still add machines later.
172+
1. Select **Next** to advance to the **Hybrid workers** tab. You can select Azure virtual machines, Azure Arc-enabled servers or Azure Arc enabled VMware vSphere to be added to this Hybrid worker group. If you don't select any machines, an empty Hybrid worker group will be created. You can still add machines later.
173173

174174
:::image type="content" source="./media/extension-based-hybrid-runbook-worker-install/basics-tab-portal.png" alt-text="Screenshot showing to enter name and credentials in basics tab.":::
175175

@@ -206,9 +206,9 @@ You can also add machines to an existing hybrid worker group.
206206

207207
1. Select **Add** to add the machine to the group.
208208

209-
Once added, you can see the machine type as Azure virtual machine or Arc-enabled server. The **Platform** field shows the worker as **Agent based (V1)** or **Extension based (V2)**.
209+
After adding, you can see the machine type as Azure virtual machine, Server-Azure Arc or VMware virtual machine-Azure Arc. The **Platform** field shows the worker as **Agent based (V1)** or **Extension based (V2)**.
210210

211-
:::image type="content" source="./media/extension-based-hybrid-runbook-worker-install/hybrid-worker-group-platform.png" alt-text="Platform field showing agent or extension based.":::
211+
:::image type="content" source="./media/extension-based-hybrid-runbook-worker-install/hybrid-worker-group-platform-inline.png" alt-text="Screenshot of platform field showing agent or extension based." lightbox="./media/extension-based-hybrid-runbook-worker-install/hybrid-worker-group-platform-expanded.png":::
212212

213213
## Install Extension-based (V2) on existing Agent-based (V1) Hybrid Worker
214214

@@ -715,4 +715,6 @@ Using [VM insights](../azure-monitor/vm/vminsights-overview.md), you can monitor
715715
716716
- To learn about Azure VM extensions, see [Azure VM extensions and features for Windows](../virtual-machines/extensions/features-windows.md) and [Azure VM extensions and features for Linux](../virtual-machines/extensions/features-linux.md).
717717
718-
- To learn about VM extensions for Arc-enabled servers, see [VM extension management with Azure Arc-enabled servers](../azure-arc/servers/manage-vm-extensions.md).
718+
- To learn about VM extensions for Arc-enabled servers, see [VM extension management with Azure Arc-enabled servers](../azure-arc/servers/manage-vm-extensions.md).
719+
- To learn about VM extensions for Arc-enabled VMware vSphere VMs, see [Manage VMware VMs in Azure through Arc-enabled VMware vSphere](../azure-arc/vmware-vsphere/manage-vmware-vms-in-azure.md).
720+
48.6 KB
Loading
48.6 KB
Loading
11.3 KB
Loading
18.1 KB
Loading

0 commit comments

Comments
 (0)