Skip to content

Commit 6172c3e

Browse files
authored
Merge pull request #273083 from MicrosoftDocs/main
4/23/2024 AM Publish
2 parents 2b45873 + 5318453 commit 6172c3e

File tree

47 files changed

+406
-330
lines changed

Some content is hidden

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

47 files changed

+406
-330
lines changed

articles/ai-studio/how-to/deploy-models-llama.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ manager: scottpolly
66
ms.service: azure-ai-studio
77
ms.topic: how-to
88
ms.date: 3/6/2024
9-
ms.reviewer: fasantia
10-
ms.author: mopeakande
11-
author: msakande
9+
ms.reviewer: shubhiraj
10+
reviewer: shubhirajMsft
11+
ms.author: ssalgado
12+
author: ssalgadodev
1213
ms.custom: [references_regions]
1314
---
1415

@@ -244,7 +245,7 @@ __Body__
244245
{
245246
"prompt": "What's the distance to the moon?",
246247
"temperature": 0.8,
247-
"max_tokens": 512,
248+
"max_tokens": 512
248249
}
249250
```
250251

articles/ai-studio/how-to/fine-tune-model-llama.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ manager: scottpolly
66
ms.service: azure-ai-studio
77
ms.topic: how-to
88
ms.date: 12/11/2023
9-
ms.reviewer: eur
10-
ms.author: mopeakande
11-
author: msakande
9+
ms.reviewer: shubhiraj
10+
reviewer: shubhirajMsft
11+
ms.author: ssalgado
12+
author: ssalgadodev
1213
ms.custom: references_regions
1314
---
1415

articles/automation/python-packages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Manage Python 2 packages in Azure Automation
33
description: This article tells how to manage Python 2 packages in Azure Automation.
44
services: automation
55
ms.subservice: process-automation
6-
ms.date: 08/21/2023
6+
ms.date: 04/23/2024
77
ms.topic: conceptual
88
ms.custom: devx-track-python
99
---

articles/azure-arc/vmware-vsphere/enable-guest-management-at-scale.md

Lines changed: 125 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Install Arc agent at scale for your VMware VMs
33
description: Learn how to enable guest management at scale for Arc enabled VMware vSphere VMs.
44
ms.topic: how-to
5-
ms.date: 03/27/2024
5+
ms.date: 04/23/2024
66
ms.service: azure-arc
77
ms.subservice: azure-arc-vmware-vsphere
88
author: Farha-Bano
@@ -25,13 +25,16 @@ Ensure the following before you install Arc agents at scale for VMware VMs:
2525
- The user account must have permissions listed in Azure Arc VMware Administrator role.
2626
- All the target machines are:
2727
- Powered on and the resource bridge has network connectivity to the host running the VM.
28-
- Running a [supported operating system](../servers/prerequisites.md#supported-operating-systems).
28+
- Running a [supported operating system](../servers/prerequisites.md#supported-operating-systems).c
29+
- VMware tools are installed on the machines. If VMware tools aren't installed, enable guest management operation is grayed out in the portal.
30+
>[!Note]
31+
>You can use the [out-of-band method](./enable-guest-management-at-scale.md#approach-d-install-arc-agents-at-scale-using-out-of-band-approach) to install Arc agents if VMware tools aren't installed.
2932
- Able to connect through the firewall to communicate over the internet, and [these URLs](../servers/network-requirements.md#urls) aren't blocked.
3033

31-
> [!NOTE]
32-
> If you're using a Linux VM, the account must not prompt for login on sudo commands. To override the prompt, from a terminal, run `sudo visudo`, and add `<username> ALL=(ALL) NOPASSWD:ALL` at the end of the file. Ensure you replace `<username>`. <br> <br>If your VM template has these changes incorporated, you won't need to do this for the VM created from that template.
34+
> [!NOTE]
35+
> If you're using a Linux VM, the account must not prompt for login on sudo commands. To override the prompt, from a terminal, run `sudo visudo`, and add `<username> ALL=(ALL) NOPASSWD:ALL` at the end of the file. Ensure you replace `<username>`. <br> <br>If your VM template has these changes incorporated, you won't need to do this for the VM created from that template.
3336
34-
## Install Arc agents at scale from portal
37+
## Approach A: Install Arc agents at scale from portal
3538

3639
An admin can install agents for multiple machines from the Azure portal if the machines share the same administrator credentials.
3740

@@ -53,6 +56,123 @@ An admin can install agents for multiple machines from the Azure portal if the m
5356
> [!NOTE]
5457
> For Windows VMs, the account must be part of local administrator group; and for Linux VM, it must be a root account.
5558
59+
## Approach B: Install Arc agents using AzCLI commands
60+
61+
The following Azure CLI commands can be used to install Arc agents.
62+
63+
```azurecli
64+
az connectedvmware vm guest-agent enable --password
65+
66+
--resource-group
67+
68+
--username
69+
70+
--vm-name
71+
72+
[--https-proxy]
73+
74+
[--no-wait]
75+
```
76+
77+
## Approach C: Install Arc agents at scale using helper script
78+
79+
Arc agent installation can be automated using the helper script built using the AzCLI command provided [here](./enable-guest-management-at-scale.md#approach-b-install-arc-agents-using-azcli-commands). Download this [helper script](https://aka.ms/arcvmwarebatchenable) to enable VMs and install Arc agents at scale. In a single ARM deployment, the helper script can enable and install Arc agents on 200 VMs.
80+
81+
### Features of the script
82+
83+
- Creates a log file (vmware-batch.log) for tracking its operations.
84+
85+
- Generates a list of Azure portal links to all the deployments created `(all-deployments-<timestamp>.txt)`.
86+
87+
- Creates ARM deployment files `(vmw-dep-<timestamp>-<batch>.json)`.
88+
89+
- Can enable up to 200 VMs in a single ARM deployment if guest management is enabled, else enables 400 VMs.
90+
91+
- Supports running as a cron job to enable all the VMs in a vCenter.
92+
93+
- Allows for service principal authentication to Azure for automation.
94+
95+
Before running this script, install az cli and the `connectedvmware` extension.
96+
97+
### Prerequisites
98+
99+
Before running this script, install:
100+
101+
- Azure CLI from [here](/cli/azure/install-azure-cli).
102+
103+
- The `connectedvmware` extension for Azure CLI: Install it by running `az extension add --name connectedvmware`.
104+
105+
### Usage
106+
107+
1. Download the script to your local machine.
108+
109+
2. Open a PowerShell terminal and navigate to the directory containing the script.
110+
111+
3. Run the following command to allow the script to run, as it's an unsigned script (if you close the session before you complete all the steps, run this command again for the new session): `Set-ExecutionPolicy -Scope Process -ExecutionPolicy Bypass`.
112+
113+
4. Run the script with the required parameters. For example, `.\arcvmware-batch-enablement.ps1 -VCenterId "<vCenterId>" -EnableGuestManagement -VMCountPerDeployment 3 -DryRun`. Replace `<vCenterId>` with the ARM ID of your vCenter.
114+
115+
### Parameters
116+
117+
- `VCenterId`: The ARM ID of the vCenter where the VMs are located.
118+
119+
- `EnableGuestManagement`: If this switch is specified, the script will enable guest management on the VMs.
120+
121+
- `VMCountPerDeployment`: The number of VMs to enable per ARM deployment. The maximum value is 200 if guest management is enabled, else it's 400.
122+
123+
- `DryRun`: If this switch is specified, the script will only create the ARM deployment files. Else, the script will also deploy the ARM deployments.
124+
125+
### Running as a Cron Job
126+
127+
You can set up this script to run as a cron job using the Windows Task Scheduler. Here's a sample script to create a scheduled task:
128+
129+
```azurecli
130+
$action = New-ScheduledTaskAction -Execute 'powershell.exe' -Argument '-File "C:\Path\To\vmware-batch-enable.ps1" -VCenterId "<vCenterId>" -EnableGuestManagement -VMCountPerDeployment 3 -DryRun'
131+
$trigger = New-ScheduledTaskTrigger -Daily -At 3am
132+
Register-ScheduledTask -Action $action -Trigger $trigger -TaskName "EnableVMs"
133+
```
134+
135+
Replace `<vCenterId>` with the ARM ID of your vCenter.
136+
137+
To unregister the task, run the following command:
138+
139+
```azurecli
140+
Unregister-ScheduledTask -TaskName "EnableVMs"
141+
```
142+
143+
## Approach D: Install Arc agents at scale using out-of-band approach
144+
145+
Arc agents can be installed directly on machines without relying on VMware tools or APIs. By following the out-of-band approach, first onboard the machines as Arc-enabled Server resources with Resource type as Microsoft.HybridCompute/machines. After that, perform **Link to vCenter** operation to update the machine's Kind property as VMware, enabling virtual lifecycle operations.
146+
147+
1. **Connect the machines as Arc-enabled Server resources:** Install Arc agents using Arc-enabled Server scripts.
148+
149+
You can use any of the following automation approaches to install Arc agents at scale:
150+
151+
- [Install Arc agents at scale using a Service Principal](../servers/onboard-service-principal.md).
152+
- [Install Arc agents at scale using Configuration Manager script](../servers/onboard-configuration-manager-powershell.md).
153+
- [Install Arc agents at scale with a Configuration Manager custom task sequence](../servers/onboard-configuration-manager-custom-task.md).
154+
- [Install Arc agents at scale using Group policy](../servers/onboard-group-policy-powershell.md).
155+
- [Install Arc agents at scale using Ansible playbook](../servers/onboard-ansible-playbooks.md).
156+
157+
2. **Link Arc-enabled Server resources to the vCenter:** The following commands will update the Kind property of Hybrid Compute machines as **VMware**. Linking the machines to vCenter will enable virtual lifecycle operations and power cycle operations (start, stop, etc.) on the machines.
158+
159+
- The following command scans all the Arc for Server machines that belong to the vCenter in the specified subscription and links the machines with that vCenter.
160+
161+
```azurecli
162+
az connectedvmware vm create-from-machines --subscription contoso-sub --vcenter-id /subscriptions/fedcba98-7654-3210-0123-456789abcdef/resourceGroups/contoso-rg-2/providers/Microsoft.HybridCompute/vcenters/contoso-vcenter
163+
```
164+
165+
- The following command scans all the Arc for Server machines that belong to the vCenter in the specified Resource Group and links the machines with that vCenter.
166+
167+
```azurecli
168+
az connectedvmware vm create-from-machines --resource-group contoso-rg --vcenter-id /subscriptions/fedcba98-7654-3210-0123-456789abcdef/resourceGroups/contoso-rg-2/providers/Microsoft.HybridCompute/vcenters/contoso-vcenter.
169+
```
170+
171+
- The following command can be used to link an individual Arc for Server resource to vCenter.
172+
173+
```azurecli
174+
az connectedvmware vm create-from-machines --resource-group contoso-rg --name contoso-vm --vcenter-id /subscriptions/fedcba98-7654-3210-0123-456789abcdef/resourceGroups/contoso-rg-2/providers/Microsoft.HybridCompute/vcenters/contoso-vcenter
175+
```
56176
57177
## Next steps
58178

articles/azure-arc/vmware-vsphere/support-matrix-for-arc-enabled-vmware-vsphere.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Plan for deployment
33
description: Learn about the support matrix for Arc-enabled VMware vSphere including vCenter Server versions supported, network requirements, and more.
44
ms.topic: how-to
5-
ms.date: 03/27/2024
5+
ms.date: 04/23/2024
66
ms.service: azure-arc
77
ms.subservice: azure-arc-vmware-vsphere
88
author: Farha-Bano
@@ -43,7 +43,7 @@ This account is used for the ongoing operation of Azure Arc-enabled VMware vSphe
4343
4444
### Resource bridge resource requirements
4545

46-
For Arc-enabled VMware vSphere, resource bridge has the following minimum virtual hardware requirements
46+
For Arc-enabled VMware vSphere, resource bridge has the following minimum virtual hardware requirements:
4747

4848
- 16 GB of memory
4949
- 4 vCPUs
@@ -62,6 +62,11 @@ In addition, VMware VSphere requires the following exception:
6262
| **Service** | **Port** | **URL** | **Direction** | **Notes**|
6363
| --- | --- | --- | --- | --- |
6464
| vCenter Server | 443 | URL of the vCenter server | Appliance VM IP and control plane endpoint need outbound connection. | Used to by the vCenter server to communicate with the Appliance VM and the control plane.|
65+
| VMware Cluster Extension | 443 | `azureprivatecloud.azurecr.io` | Appliance VM IPs need outbound connection. | Pull container images for Microsoft.VMWare and Microsoft.AVS Cluster Extension.|
66+
| Azure CLI and Azure CLI Extensions | 443 | `*.blob.core.windows.net` | Management machine needs outbound connection. | Download Azure CLI Installer and Azure CLI extensions.|
67+
| Azure Resource Manager | 443 | `management.azure.com` | Management machine needs outbound connection. | Required to create/update resources in Azure using ARM.|
68+
| Helm Chart for Azure Arc Agents | 443 | `*.dp.kubernetesconfiguration.azure.com` | Management machine needs outbound connection. | Data plane endpoint for downloading the configuration information of Arc agents.|
69+
| Azure CLI | 443 | - `login.microsoftonline.com` <br> <br> - `aka.ms` | Management machine needs outbound connection. | Required to fetch and update Azure Resource Manager tokens.|
6570

6671
For a complete list of network requirements for Azure Arc features and Azure Arc-enabled services, see [Azure Arc network requirements (Consolidated)](../network-requirements-consolidated.md).
6772

articles/azure-monitor/agents/azure-monitor-agent-migration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ ms.custom:
1212

1313
# Migrate to Azure Monitor Agent from Log Analytics agent
1414

15-
[Azure Monitor Agent (AMA)](./agents-overview.md) replaces the Log Analytics agent (also known as Microsoft Monitor Agent (MMA) and OMS) for Windows and Linux machines, in Azure and non-Azure environments, including on-premises and third-party clouds. The agent introduces a simplified, flexible method of configuring data dollection using [Data Collection Rules (DCRs)](../essentials/data-collection-rule-overview.md). This article provides guidance on how to implement a successful migration from the Log Analytics agent to Azure Monitor Agent.
15+
[Azure Monitor Agent (AMA)](./agents-overview.md) replaces the Log Analytics agent (also known as Microsoft Monitor Agent (MMA) and OMS) for Windows and Linux machines, in Azure and non-Azure environments, including on-premises and third-party clouds. The agent introduces a simplified, flexible method of configuring data collection using [Data Collection Rules (DCRs)](../essentials/data-collection-rule-overview.md). This article provides guidance on how to implement a successful migration from the Log Analytics agent to Azure Monitor Agent.
1616

1717
If you're currently using the Log Analytics agent with Azure Monitor or [other supported features and services](#migrate-additional-services-and-features), start planning your migration to Azure Monitor Agent by using the information in this article. If you are using the Log Analytics Agent for SCOM, you need to [migrate to the SCOM Agent](../vm/scom-managed-instance-overview.md).
1818

1919
The Log Analytics agent will be [retired on **August 31, 2024**](https://azure.microsoft.com/updates/were-retiring-the-log-analytics-agent-in-azure-monitor-on-31-august-2024/). You can expect the following when you use the MMA or OMS agent after this date.
20-
> - **Data upload**: You can still upload data. At some point when major customer have finished migrating and data volumes significantly drop, upload will be suspended. You can expect this to take at least 6 to 9 months. You will not receive a breaking change notification of the suspension.
20+
> - **Data upload**: You can still upload data. At some point when major customers have finished migrating and data volumes significantly drop, upload will be suspended. You can expect this to take at least 6 to 9 months. You will not receive a breaking change notification of the suspension.
2121
> - **Install or reinstall**: You can still install and reinstall the legacy agents. You will not be able to get support for installing or reinstalling issues.
2222
> - **Customer Support**: You can expect support for MMA/OMS for security issues.
2323
@@ -32,7 +32,7 @@ Before you begin migrating from the Log Analytics agent to Azure Monitor Agent,
3232
### Before you begin
3333

3434
> [!div class="checklist"]
35-
> - **Check the [prerequisites](./azure-monitor-agent-manage.md#prerequisites) for installing Azure Monitor Agent.**<br>To monitor non-Azure and on-premises servers, you must [install the Azure Arc agent](../../azure-arc/servers/agent-overview.md). The Arc agent makes your on-premises servers visible as to Azure as a resource it can target. You won't incur any additional cost for installing the Azure Arc agent.
35+
> - **Check the [prerequisites](./azure-monitor-agent-manage.md#prerequisites) for installing Azure Monitor Agent.**<br>To monitor non-Azure and on-premises servers, you must [install the Azure Arc agent](../../azure-arc/servers/agent-overview.md). The Arc agent makes your on-premises servers visible to Azure as a resource it can target. You won't incur any additional cost for installing the Azure Arc agent.
3636
> - **Understand your current needs.**<br>Use the **Workspace overview** tab of the [AMA Migration Helper](./azure-monitor-agent-migration-tools.md#using-ama-migration-helper) to see connected agents and discover solutions enabled on your Log Analytics workspaces that use legacy agents, including per-solution migration recommendations.
3737
> - **Verify that Azure Monitor Agent can address all of your needs.**<br>Azure Monitor Agent is General Availablity (GA) for data collection and is used for data collection by various Azure Monitor features and other Azure services. For details, see [Supported services and features](#migrate-additional-services-and-features).
3838
> - **Consider installing Azure Monitor Agent together with a legacy agent for a transition period.**<br>Run Azure Monitor Agent alongside the legacy Log Analytics agent on the same machine to continue using existing functionality during evaluation or migration. Keep in mind that running two agents on the same machine doubles resource consumption, including but not limited to CPU, memory, storage space, and network bandwidth.<br>

articles/azure-resource-manager/bicep/add-template-to-azure-pipelines.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ You can use Azure Resource Group Deployment task or Azure CLI task to deploy a B
6363
name: Deploy Bicep files
6464

6565
parameters:
66-
azureServiceConnection: '<your-connection-name>'
66+
- name: azureServiceConnection
67+
type: string
68+
default: '<your-connection-name>'
6769

6870
variables:
6971
vmImageName: 'ubuntu-latest'

0 commit comments

Comments
 (0)