Skip to content

Commit 63114a0

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 9ba96b5 + fd9dd29 commit 63114a0

24 files changed

+162
-133
lines changed

articles/backup/backup-azure-backup-server-vmware.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up VMware VMs with Azure Backup Server
33
description: In this article, learn how to use Azure Backup Server to back up VMware VMs running on a VMware vCenter/ESXi server.
44
ms.topic: how-to
5-
ms.date: 11/07/2023
5+
ms.date: 02/22/2024
66
author: AbhishekMallick-MS
77
ms.author: v-abhmallick
88
ms.service: azure-backup

articles/backup/install-mars-agent.md

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Install the Microsoft Azure Recovery Services (MARS) agent
33
description: Learn how to install the Microsoft Azure Recovery Services (MARS) agent to back up Windows machines.
44
ms.topic: how-to
5-
ms.date: 11/07/2023
5+
ms.date: 10/25/2024
66
ms.service: azure-backup
77
author: AbhishekMallick-MS
88
ms.author: v-abhmallick
@@ -11,7 +11,7 @@ ms.author: v-abhmallick
1111

1212
# Install the Azure Backup MARS agent
1313

14-
This article explains how to install the Microsoft Azure Recovery Services (MARS) agent. MARS is also known as the Azure Backup agent.
14+
This article describes how to install the Microsoft Azure Recovery Services (MARS) agent. MARS is also known as the Azure Backup agent.
1515

1616
## About the MARS agent
1717

@@ -26,10 +26,12 @@ The data that's available for backup depends on where the agent is installed.
2626
> [!NOTE]
2727
> Generally, you back up an Azure VM by using an Azure Backup extension on the VM. This method backs up the entire VM. If you want to back up specific files and folders on the VM, install and use the MARS agent alongside the extension. For more information, see [Architecture of a built-in Azure VM backup](backup-architecture.md#architecture-built-in-azure-vm-backup).
2828
29-
![Backup process steps](./media/backup-configure-vault/initial-backup-process.png)
29+
![Screenshot shows the Backup workflow.](./media/backup-configure-vault/initial-backup-process.png)
3030

3131
## Before you start
3232

33+
Before you install the MARS agent, ensure that you have performed the following actions:
34+
3335
* Learn how [Azure Backup uses the MARS agent to back up Windows machines](backup-architecture.md#architecture-direct-backup-of-on-premises-windows-server-machines-or-azure-vm-files-or-folders).
3436
* Learn about the [backup architecture](backup-architecture.md#architecture-back-up-to-dpmmabs) that runs the MARS agent on a secondary MABS or Data Protection Manager server.
3537
* Review [what's supported and what you can back up](backup-support-matrix-mars-agent.md) by the MARS agent.
@@ -48,15 +50,15 @@ By default, vaults use [geo-redundant storage (GRS)](../storage/common/storage-r
4850
* If the vault is your primary backup mechanism, we recommend that you use GRS.
4951
* You can use [locally redundant storage (LRS)](../storage/common/storage-redundancy.md#locally-redundant-storage) to reduce Azure storage costs.
5052

51-
To modify the storage replication type:
53+
To modify the storage replication type, follow these steps:
5254

5355
1. In the new vault, select **Properties** under the **Settings** section.
5456

5557
1. On the **Properties** page, under **Backup Configuration**, select **Update**.
5658

5759
1. Select the storage replication type, and select **Save**.
5860

59-
![Update Backup Configuration](./media/backup-afs/backup-configuration.png)
61+
![Screenshot shows how to update the Backup Configuration.](./media/backup-afs/backup-configuration.png)
6062

6163
> [!NOTE]
6264
> You can't modify the storage replication type after the vault is set up and contains backup items. If you want to do this, you need to re-create the vault.
@@ -80,46 +82,48 @@ If you've already installed the agent on any machines, ensure you're running the
8082

8183
1. In the vault, under **Getting Started**, select **Backup**.
8284

83-
![Open the backup goal](./media/backup-try-azure-backup-in-10-mins/open-backup-settings.png)
85+
![Screenshot shows how to open the backup goal.](./media/backup-try-azure-backup-in-10-mins/open-backup-settings.png)
8486

8587
1. Under **Where is your workload running?**, select **On-premises**. Select this option even if you want to install the MARS agent on an Azure VM.
8688
1. Under **What do you want to back up?**, select **Files and folders**. You can also select **System State**. Many other options are available, but these options are supported only if you're running a secondary backup server. Select **Prepare Infrastructure**.
8789

88-
![Configure files and folders](./media/backup-try-azure-backup-in-10-mins/set-file-folder.png)
90+
![Screenshot shows the configuration of files and folders.](./media/backup-try-azure-backup-in-10-mins/set-file-folder.png)
8991

9092
1. For **Prepare infrastructure**, under **Install Recovery Services agent**, download the MARS agent.
9193

92-
![Prepare the infrastructure](./media/backup-try-azure-backup-in-10-mins/choose-agent-for-server-client.png)
94+
![Screenshot shows how to prepare the infrastructure.](./media/backup-try-azure-backup-in-10-mins/choose-agent-for-server-client.png)
9395

9496
1. In the download menu, select **Save**. By default, the *MARSagentinstaller.exe* file is saved to your Downloads folder.
9597

9698
1. Select **Already download or using the latest Recovery Services Agent**, and then download the vault credentials.
9799

98-
![Download vault credentials](./media/backup-try-azure-backup-in-10-mins/download-vault-credentials.png)
100+
![Screenshot shows how to download the vault credentials.](./media/backup-try-azure-backup-in-10-mins/download-vault-credentials.png)
99101

100102
1. Select **Save**. The file is downloaded to your Downloads folder. You can't open the vault credentials file.
101103

102104
## Install and register the agent
103105

106+
To install and register the MARRS agent, follow these steps:
107+
104108
1. Run the *MARSagentinstaller.exe* file on the machines that you want to back up.
105109
1. In the MARS Agent Setup Wizard, select **Installation Settings**. There, choose where to install the agent, and choose a location for the cache. Then select **Next**.
106110
* Azure Backup uses the cache to store data snapshots before sending them to Azure.
107111
* The cache location should have free space equal to at least 5 percent of the size of the data you'll back up.
108112

109-
![Choose installation settings in the MARS Agent Setup Wizard](./media/backup-configure-vault/mars1.png)
113+
![Screenshot shows how to choose installation settings in the MARS Agent Setup Wizard.](./media/backup-configure-vault/mars1.png)
110114

111115
1. For **Proxy Configuration**, specify how the agent that runs on the Windows machine will connect to the internet. Then select **Next**.
112116

113117
* If you use a custom proxy, specify any necessary proxy settings and credentials.
114118
* Remember that the agent needs access to [specific URLs](#before-you-start).
115119

116-
![Set up internet access in the MARS wizard](./media/backup-configure-vault/mars2.png)
120+
![Screenshot shows how to set up internet access in the MARS wizard.](./media/backup-configure-vault/mars2.png)
117121

118122
1. For **Installation**, review the prerequisites, and select **Install**.
119123
1. After the agent is installed, select **Proceed to Registration**.
120124
1. In **Register Server Wizard** > **Vault Identification**, browse to and select the credentials file that you downloaded. Then select **Next**.
121125

122-
![Add vault credentials by using the Register Server Wizard](./media/backup-configure-vault/register1.png)
126+
![Screenshot shows how to add vault credentials by using the Register Server Wizard.](./media/backup-configure-vault/register1.png)
123127

124128
1. On the **Encryption Setting** page, specify a passphrase that will be used to encrypt and decrypt backups for the machine. [Learn more](backup-azure-file-folder-backup-faq.yml#what-characters-are-allowed-for-the-passphrase-) about the allowed passphrase characters.
125129

@@ -130,7 +134,7 @@ If you've already installed the agent on any machines, ensure you're running the
130134

131135
After granting the required permissions, you can save the passphrase to the Key Vault by copying the *Key Vault URI* from the Azure portal and to the Register Server Wizard.
132136

133-
:::image type="content" source="./media/backup-configure-vault/encryption-settings-passphrase-to-encrypt-decrypt-backups.png" alt-text="Screenshot showing to specify a passphrase to be used to encrypt and decrypt backups for machines.":::
137+
:::image type="content" source="./media/backup-configure-vault/encryption-settings-passphrase-to-encrypt-decrypt-backups.png" alt-text="Screenshot shows how to specify a passphrase to be used to encrypt and decrypt backups for machines.":::
134138

135139
1. Select **Finish**. The agent is now installed, and your machine is registered to the vault. You're ready to configure and schedule your backup.
136140

@@ -139,6 +143,6 @@ If you've already installed the agent on any machines, ensure you're running the
139143
>[!Note]
140144
>We recommend to save your passphrase in an alternate secure location, such as the Azure key vault. Microsoft can't recover the data without the passphrase. [Learn](save-backup-passphrase-securely-in-azure-key-vault.md) how to store a secret in a Key Vault.
141145
142-
## Next steps
146+
## Next step
143147

144148
Learn how to [Back up Windows machines by using the Azure Backup MARS agent](backup-windows-with-mars-agent.md)

articles/backup/quick-backup-aks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Quickstart: Configure an Azure Kubernetes Services cluster backup"
33
description: Learn how to configure backup for an Azure Kubernetes Service (AKS) cluster, and then use Azure Backup to back up specific items in the cluster.
44
ms.topic: quickstart
5-
ms.date: 11/14/2023
5+
ms.date: 10/01/2024
66
ms.service: azure-backup
77
ms.custom:
88
- ignite-2023

articles/bastion/bastion-faq.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,7 @@ Azure Bastion doesn't move or store customer data out of the region it's deploye
3131

3232
### <a name="az"></a>Does Azure Bastion support availability zones?
3333

34-
[!INCLUDE [Availability Zones description and supported regions](../../includes/bastion-availability-zones-description.md)]
35-
36-
If you aren't able to select a zone, you might have selected an Azure region that doesn't yet support availability zones.
37-
38-
For more information about availability zones, see [Availability Zones](../reliability/availability-zones-overview.md?tabs=azure-cli).
34+
For information on availability zone support in Azure Bastion, see [Reliability in Azure Bastion](../reliability/reliability-bastion.md).
3935

4036
### <a name="vwan"></a>Does Azure Bastion support Virtual WAN?
4137

articles/bastion/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ You can also find the latest Bastion updates and subscribe to the RSS feed [here
2626
|Feature | [Graphical session recording](session-recording.md) | Graphical session recording is now in public preview in all regions that Bastion is available in. | June 2024 | Can't currently be used with native client.
2727
| Feature | [Private Only Bastion](private-only-deployment.md)| Private Only Bastion is now in public preview in all regions that Bastion is available in.| June 2024 | N/A|
2828
| SKU | [Bastion Premium SKU](bastion-overview.md#sku)| Bastion Premium SKU is now in public preview in all regions that Bastion is available in. | June 2024 | N/A|
29-
|Feature | [Availability Zones for Bastion](../reliability/reliability-bastion.md?toc=/azure/bastion/TOC.json) |Availability Zones is now in public preview as a customer-enabled feature in select regions. | May 2024 | See available region list [here](../reliability/reliability-bastion.md?toc=%2Fazure%2Fbastion%2FTOC.json#prerequisites).
29+
|Feature | [Availability Zones for Bastion](../reliability/reliability-bastion.md?toc=/azure/bastion/TOC.json) |Availability Zones is now in public preview as a customer-enabled feature in select regions. | May 2024 | See available region list [here](../reliability/reliability-bastion.md?toc=%2Fazure%2Fbastion%2FTOC.json#regions-supported).
3030
|SKU | [Bastion Developer SKU](quickstart-developer-sku.md) | Bastion Developer SKU is now in GA for select regions. | May 2024 | See available region list [here](quickstart-developer-sku.md#about-the-developer-sku).
3131

3232

articles/communication-services/quickstarts/manage-teams-identity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ The service principal of the Contoso application in the Fabrikam tenant is creat
107107
You can see that the status of the Communication Services Teams.ManageCalls and Teams.ManageChats permissions are *Granted for {Directory_name}*.
108108

109109

110-
If you run into the issue "The app is trying to access a service '00001111-aaaa-2222-bbbb-3333cccc4444'(Azure Communication Services) that your organization '{GUID}' lacks a service principal for. Contact your IT Admin to review the configuration of your service subscriptions or consent to the application to create the required service principal." your Microsoft Entra tenant lacks a service principal for the Azure Communication Services application. To fix this issue, use PowerShell as a Microsoft Entra administrator to connect to your tenant. Replace `Tenant_ID` with an ID of your Microsoft Entra tenancy.
110+
If you run into the issue "The app is trying to access a service '1fd5118e-2576-4263-8130-9503064c837a'(Azure Communication Services) that your organization '{GUID}' lacks a service principal for. Contact your IT Admin to review the configuration of your service subscriptions or consent to the application to create the required service principal." your Microsoft Entra tenant lacks a service principal for the Azure Communication Services application. To fix this issue, use PowerShell as a Microsoft Entra administrator to connect to your tenant. Replace `Tenant_ID` with an ID of your Microsoft Entra tenancy.
111111

112112
You will require **Application.ReadWrite.All** as shown below.
113113

@@ -125,7 +125,7 @@ Install-Module Microsoft.Graph
125125
Then execute the following command to add a service principal to your tenant. Do not modify the GUID of the App ID.
126126

127127
```script
128-
New-MgServicePrincipal -AppId "00001111-aaaa-2222-bbbb-3333cccc4444"
128+
New-MgServicePrincipal -AppId "1fd5118e-2576-4263-8130-9503064c837a"
129129
```
130130

131131

articles/communications-gateway/connect-operator-connect.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ To add the Project Synergy application:
9090
1. Run the following cmdlet, replacing *`<TenantID>`* with the tenant ID you noted down in step 5.
9191
```powershell
9292
Connect-AzureAD -TenantId "<TenantID>"
93-
New-AzureADServicePrincipal -AppId 00001111-aaaa-2222-bbbb-3333cccc4444 -DisplayName "Operator Connect"
93+
New-AzureADServicePrincipal -AppId eb63d611-525e-4a31-abd7-0cb33f679599 -DisplayName "Operator Connect"
9494
```
9595
9696
## Assign an Admin user to the Project Synergy application
@@ -161,7 +161,7 @@ Do the following steps in the tenant that contains your Project Synergy applicat
161161
1. Run the following PowerShell commands. These commands add the following roles for Azure Communications Gateway: `TrunkManagement.Read`, `TrunkManagement.Write`, `partnerSettings.Read`, `NumberManagement.Read`, `NumberManagement.Write`, `Data.Read`, `Data.Write`.
162162
```powershell
163163
# Get the Service Principal ID for Project Synergy (Operator Connect)
164-
$projectSynergyApplicationId = "00001111-aaaa-2222-bbbb-3333cccc4444"
164+
$projectSynergyApplicationId = "eb63d611-525e-4a31-abd7-0cb33f679599"
165165
$projectSynergyEnterpriseApplication = Get-MgServicePrincipal -Filter "AppId eq '$projectSynergyApplicationId'" # "Application.Read.All"
166166
167167
# Required Operator Connect - Project Synergy Roles
@@ -170,7 +170,7 @@ Do the following steps in the tenant that contains your Project Synergy applicat
170170
$partnerSettingsRead = "d6b0de4a-aab5-4261-be1b-0e1800746fb2"
171171
$numberManagementRead = "130ecbe2-d1e6-4bbd-9a8d-9a7a909b876e"
172172
$numberManagementWrite = "752b4e79-4b85-4e33-a6ef-5949f0d7d553"
173-
$dataRead = "00001111-aaaa-2222-bbbb-3333cccc4444"
173+
$dataRead = "eb63d611-525e-4a31-abd7-0cb33f679599"
174174
$dataWrite = "98d32f93-eaa7-4657-b443-090c23e69f27"
175175
$requiredRoles = $trunkManagementRead, $trunkManagementWrite, $partnerSettingsRead, $numberManagementRead, $numberManagementWrite, $dataRead, $dataWrite
176176
@@ -223,13 +223,13 @@ Go to the [Operator Connect homepage](https://operatorconnect.microsoft.com/) an
223223
224224
You must enable Azure Communications Gateway within the Operator Connect or Teams Phone Mobile environment. This process requires configuring your environment with two Application IDs:
225225
- The Application ID of the system-assigned managed identity that you found in [Find the Application ID for your Azure Communication Gateway resource](#find-the-application-id-for-your-azure-communication-gateway-resource). This Application ID allows Azure Communications Gateway to use the roles that you set up in [Set up application roles for Azure Communications Gateway](#set-up-application-roles-for-azure-communications-gateway).
226-
- A standard Application ID for an automatically created AzureCommunicationsGateway enterprise application. This ID is always `11112222-bbbb-3333-cccc-4444dddd5555`.
226+
- A standard Application ID for an automatically created AzureCommunicationsGateway enterprise application. This ID is always `8502a0ec-c76d-412f-836c-398018e2312b`.
227227
228228
To add the Application IDs:
229229
230230
1. Log into the [Operator Connect portal](https://operatorconnect.microsoft.com/operator/configuration).
231231
1. Add a new **Application Id** for the Application ID that you found for the managed identity.
232-
1. Add a second **Application Id** for the value `11112222-bbbb-3333-cccc-4444dddd5555`.
232+
1. Add a second **Application Id** for the value `8502a0ec-c76d-412f-836c-398018e2312b`.
233233
234234
## Register your deployment's domain name in Microsoft Entra
235235

articles/confidential-computing/quick-create-confidential-vm-arm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Use this example to create a custom parameter file for a Linux-based confidentia
170170
171171
```Powershell
172172
Connect-Graph -Tenant "your tenant ID" Application.ReadWrite.All
173-
New-MgServicePrincipal -AppId 00001111-aaaa-2222-bbbb-3333cccc4444 -DisplayName "Confidential VM Orchestrator"
173+
New-MgServicePrincipal -AppId bf7b6499-ff71-4aa2-97a4-f372087be7f0 -DisplayName "Confidential VM Orchestrator"
174174
```
175175
176176
1. Set up your Azure key vault. For how to use an Azure Key Vault Managed HSM instead, see the next step.
@@ -194,7 +194,7 @@ Use this example to create a custom parameter file for a Linux-based confidentia
194194
1. Give `Confidential VM Orchestrator` permissions to `get` and `release` the key vault.
195195
196196
```azurecli-interactive
197-
$cvmAgent = az ad sp show --id "00001111-aaaa-2222-bbbb-3333cccc4444" | Out-String | ConvertFrom-Json
197+
$cvmAgent = az ad sp show --id "bf7b6499-ff71-4aa2-97a4-f372087be7f0" | Out-String | ConvertFrom-Json
198198
az keyvault set-policy --name $KeyVault --object-id $cvmAgent.Id --key-permissions get release
199199
```
200200
@@ -210,7 +210,7 @@ Use this example to create a custom parameter file for a Linux-based confidentia
210210
1. Give `Confidential VM Orchestrator` permissions to managed HSM.
211211
212212
```azurecli-interactive
213-
$cvmAgent = az ad sp show --id "00001111-aaaa-2222-bbbb-3333cccc4444" | Out-String | ConvertFrom-Json
213+
$cvmAgent = az ad sp show --id "bf7b6499-ff71-4aa2-97a4-f372087be7f0" | Out-String | ConvertFrom-Json
214214
az keyvault role assignment create --hsm-name $hsm --assignee $cvmAgent.Id --role "Managed HSM Crypto Service Release User" --scope /keys/$KeyName
215215
```
216216

articles/confidential-computing/quick-create-confidential-vm-azure-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,15 +86,15 @@ To create a confidential [disk encryption set](/azure/virtual-machines/linux/dis
8686
For this step you need to be a Global Admin or you need to have the User Access Administrator RBAC role. [Install Microsoft Graph SDK](/powershell/microsoftgraph/installation) to execute the commands below.
8787
```Powershell
8888
Connect-Graph -Tenant "your tenant ID" Application.ReadWrite.All
89-
New-MgServicePrincipal -AppId 00001111-aaaa-2222-bbbb-3333cccc4444 -DisplayName "Confidential VM Orchestrator"
89+
New-MgServicePrincipal -AppId bf7b6499-ff71-4aa2-97a4-f372087be7f0 -DisplayName "Confidential VM Orchestrator"
9090
```
9191
2. Create an Azure Key Vault using the [az keyvault create](/cli/azure/keyvault) command. For the pricing tier, select Premium (includes support for HSM backed keys). Make sure that you have an owner role in this key vault.
9292
```azurecli-interactive
9393
az keyvault create -n keyVaultName -g myResourceGroup --enabled-for-disk-encryption true --sku premium --enable-purge-protection true --enable-rbac-authorization false
9494
```
9595
3. Give `Confidential VM Orchestrator` permissions to `get` and `release` the key vault.
9696
```Powershell
97-
$cvmAgent = az ad sp show --id "00001111-aaaa-2222-bbbb-3333cccc4444" | Out-String | ConvertFrom-Json
97+
$cvmAgent = az ad sp show --id "bf7b6499-ff71-4aa2-97a4-f372087be7f0" | Out-String | ConvertFrom-Json
9898
az keyvault set-policy --name keyVaultName --object-id $cvmAgent.Id --key-permissions get release
9999
```
100100
4. Create a key in the key vault using [az keyvault key create](/cli/azure/keyvault). For the key type, use RSA-HSM.

0 commit comments

Comments
 (0)