Skip to content

Commit 42b2286

Browse files
authored
Merge pull request #273501 from MicrosoftDocs/main
Publish to live, Friday 4 AM PST, 4/26
2 parents 8f98110 + e19a5b5 commit 42b2286

File tree

12 files changed

+90
-61
lines changed

12 files changed

+90
-61
lines changed

articles/azure-signalr/signalr-howto-scale-signalr.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ For a table of service limits, quotas, and constraints in each tier, see [Signal
9595

9696

9797
## Enhanced Large Instance Support with Premium_P2 SKU
98-
The new Premium_P2 SKU (currently in Preview) is designed to facilitate extensive scalability for high-demand scenarios. This SKU allows scaling among 100, 200, 300, 400, 500, 600. 700, 800, 900, 1000 units for a single SignalR Service instance. This enhancement enables the handling of up to **one million** concurrent connections, catering to large-scale, real-time communication needs.
98+
The new Premium_P2 SKU is designed to facilitate extensive scalability for high-demand scenarios. This SKU allows scaling among 100, 200, 300, 400, 500, 600. 700, 800, 900, 1000 units for a single SignalR Service instance. This enhancement enables the handling of up to **one million** concurrent connections, catering to large-scale, real-time communication needs.
9999

100100
You can scale up the SKU to Premium_P2 using Azure portal or Azure CLI.
101101

@@ -116,4 +116,4 @@ Autoscale is supported in Azure SignalR Service Premium Tier.
116116
Multiple endpoints are also supported for scaling, sharding, and cross-region scenarios.
117117

118118
> [!div class="nextstepaction"]
119-
> [scale SignalR Service with multiple instances](./signalr-howto-scale-multi-instances.md)
119+
> [scale SignalR Service with multiple instances](./signalr-howto-scale-multi-instances.md)

articles/azure-web-pubsub/howto-scale-manual-scale.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ For a table of service limits, quotas, and constraints in each tier, see [Web Pu
6969

7070

7171
## Enhanced large instance support with Premium_P2 SKU
72-
The new Premium_P2 SKU (currently in Preview) is designed to facilitate extensive scalability for high-demand scenarios. This SKU allows scaling among 100, 200, 300, 400, 500, 600. 700, 800, 900, 1000 units for a single Web PubSub Service instance. This enhancement enables the handling of up to **one million** concurrent connections, catering to large-scale, real-time communication needs.
72+
The new Premium_P2 SKU is designed to facilitate extensive scalability for high-demand scenarios. This SKU allows scaling among 100, 200, 300, 400, 500, 600. 700, 800, 900, 1000 units for a single Web PubSub Service instance. This enhancement enables the handling of up to **one million** concurrent connections, catering to large-scale, real-time communication needs.
7373

7474
You can scale up the SKU to Premium_P2 using Azure portal or Azure CLI.
7575

@@ -85,4 +85,4 @@ In this guide, you learned about how to scale single Web PubSub Service instance
8585
Autoscale is supported in Azure Web PubSub Service Premium Tier.
8686

8787
> [!div class="nextstepaction"]
88-
> [Automatically scale units of an Azure Web PubSub Service](./howto-scale-autoscale.md)
88+
> [Automatically scale units of an Azure Web PubSub Service](./howto-scale-autoscale.md)

articles/backup/backup-mabs-install-azure-stack.md

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
---
2-
title: Install Azure Backup Server on Azure Stack
3-
description: In this article, learn how to use Azure Backup Server to protect or back up workloads in Azure Stack.
4-
ms.topic: conceptual
5-
ms.date: 04/20/2023
2+
title: Install Azure Backup Server on Azure Stack Hub
3+
description: In this article, learn how to use Azure Backup Server to protect or back up workloads in Azure Stack Hub.
4+
ms.topic: how-to
5+
ms.service: backup
6+
ms.date: 04/22/2024
67
author: AbhishekMallick-MS
78
ms.author: v-abhmallick
89
---
9-
# Install Azure Backup Server on Azure Stack
10+
# Install Azure Backup Server on Azure Stack Hub
1011

11-
This article explains how to install Azure Backup Server on Azure Stack. With Azure Backup Server, you can protect Infrastructure as a Service (IaaS) workloads such as virtual machines running in Azure Stack. A benefit of using Azure Backup Server to protect your workloads is you can manage all workload protection from a single console.
12+
This article explains how to install Azure Backup Server on Azure Stack Hub. With Azure Backup Server, you can protect Infrastructure as a Service (IaaS) workloads such as virtual machines running in Azure Stack Hub. A benefit of using Azure Backup Server to protect your workloads is you can manage all workload protection from a single console.
1213

1314
> [!NOTE]
1415
> To learn about security capabilities, refer to [Azure Backup security features documentation](backup-azure-security-feature.md).
@@ -17,15 +18,15 @@ This article explains how to install Azure Backup Server on Azure Stack. With Az
1718
1819
## Prerequisites for the Azure Backup Server environment
1920

20-
Consider the recommendations in this section when installing Azure Backup Server in your Azure Stack environment. The Azure Backup Server installer checks that your environment has the necessary prerequisites, but you'll save time by preparing before you install.
21+
Consider the recommendations in this section when installing Azure Backup Server in your Azure Stack Hub environment. The Azure Backup Server installer checks that your environment has the necessary prerequisites, but you'll save time by preparing before you install.
2122

2223
### Determining size of virtual machine
2324

24-
To run Azure Backup Server on an Azure Stack virtual machine, use size A2 or larger. For assistance in choosing a virtual machine size, download the [Azure Stack VM size calculator](https://www.microsoft.com/download/details.aspx?id=56832).
25+
To run Azure Backup Server on an Azure Stack Hub virtual machine, use size A2 or larger. For assistance in choosing a virtual machine size, download the [Azure Stack Hub VM size calculator](https://www.microsoft.com/download/details.aspx?id=56832).
2526

26-
### Virtual Networks on Azure Stack virtual machines
27+
### Virtual Networks on Azure Stack Hub virtual machines
2728

28-
All virtual machines used in an Azure Stack workload must belong to the same Azure virtual network and Azure Subscription.
29+
All virtual machines used in an Azure Stack Hub workload must belong to the same Azure virtual network and Azure Subscription.
2930

3031
### Azure Backup Server VM performance
3132

@@ -36,25 +37,25 @@ If shared with other virtual machines, the storage account size and IOPS limits
3637

3738
### Configuring Azure Backup temporary disk storage
3839

39-
Each Azure Stack virtual machine comes with temporary disk storage, which is available to the user as volume `D:\`. The local staging area needed by Azure Backup can be configured to reside in `D:\`, and the cache location can be placed on `C:\`. In this way, no storage needs to be carved away from the data disks attached to the Azure Backup Server virtual machine.
40+
Each Azure Stack Hub virtual machine comes with temporary disk storage, which is available to the user as volume `D:\`. The local staging area needed by Azure Backup can be configured to reside in `D:\`, and the cache location can be placed on `C:\`. In this way, no storage needs to be carved away from the data disks attached to the Azure Backup Server virtual machine.
4041

4142
### Storing backup data on local disk and in Azure
4243

43-
Azure Backup Server stores backup data on Azure disks attached to the virtual machine, for operational recovery. Once the disks and storage space are attached to the virtual machine, Azure Backup Server manages storage for you. The amount of backup data storage depends on the number and size of disks attached to each [Azure Stack virtual machine](/azure-stack/user/azure-stack-storage-overview). Each size of Azure Stack VM has a maximum number of disks that can be attached to the virtual machine. For example, A2 is four disks. A3 is eight disks. A4 is 16 disks. Again, the size and number of disks determines the total backup storage pool.
44+
Azure Backup Server stores backup data on Azure disks attached to the virtual machine, for operational recovery. Once the disks and storage space are attached to the virtual machine, Azure Backup Server manages storage for you. The amount of backup data storage depends on the number and size of disks attached to each [Azure Stack Hub virtual machine](/azure-stack/user/azure-stack-storage-overview). Each size of Azure Stack Hub VM has a maximum number of disks that can be attached to the virtual machine. For example, A2 is four disks. A3 is eight disks. A4 is 16 disks. Again, the size and number of disks determines the total backup storage pool.
4445

4546
> [!IMPORTANT]
4647
> You should **not** retain operational recovery (backup) data on Azure Backup Server-attached disks for more than five days.
4748
>
4849
49-
Storing backup data in Azure reduces backup infrastructure on Azure Stack. If data is more than five days old, it should be stored in Azure.
50+
Storing backup data in Azure reduces backup infrastructure on Azure Stack Hub. If data is more than five days old, it should be stored in Azure.
5051

5152
To store backup data in Azure, create or use a Recovery Services vault. When preparing to back up the Azure Backup Server workload, you [configure the Recovery Services vault](backup-azure-microsoft-azure-backup.md#create-a-recovery-services-vault). Once configured, each time a backup job runs, a recovery point is created in the vault. Each Recovery Services vault holds up to 9999 recovery points. Depending on the number of recovery points created, and how long they're retained, you can retain backup data for many years. For example, you could create monthly recovery points, and retain them for five years.
5253

5354
### Scaling deployment
5455

5556
If you want to scale your deployment, you have the following options:
5657

57-
- Scale up - Increase the size of the Azure Backup Server virtual machine from A series to D series, and increase the local storage [per the Azure Stack virtual machine instructions](/azure-stack/user/azure-stack-manage-vm-disks).
58+
- Scale up - Increase the size of the Azure Backup Server virtual machine from A series to D series, and increase the local storage [per the Azure Stack Hub virtual machine instructions](/azure-stack/user/azure-stack-manage-vm-disks).
5859
- Offload data - send older data to Azure and retain only the newest data on the storage attached to the Azure Backup Server.
5960
- Scale out - Add more Azure Backup Servers to protect the workloads.
6061

@@ -66,9 +67,9 @@ If you want to scale your deployment, you have the following options:
6667

6768
The Azure Backup Server virtual machine must be joined to a domain. A domain user with administrator privileges must install Azure Backup Server on the virtual machine.
6869

69-
## Using an IaaS VM in Azure Stack
70+
## Using an IaaS VM in Azure Stack Hub
7071

71-
When choosing a server for Azure Backup Server, start with a Windows Server 2022 Datacenter or Windows Server 2019 Datacenter gallery image. The article, [Create your first Windows virtual machine in the Azure portal](../virtual-machines/windows/quick-create-portal.md?toc=/azure/virtual-machines/windows/toc.json), provides a tutorial for getting started with the recommended virtual machine. The recommended minimum requirements for the server virtual machine (VM) should be: A2 Standard with two cores and 3.5-GB RAM.
72+
When choosing a server for Azure Backup Server, start with a Windows Server 2022 Datacenter or Windows Server 2019 Datacenter gallery image. The article, [Create your first Windows virtual machine in the Azure portal](../virtual-machines/windows/quick-create-portal.md?toc=/azure/virtual-machines/windows/toc.json), provides a tutorial for getting started with the recommended virtual machine. The recommended minimum requirements for the server virtual machine (VM) should be: A2 Standard with two cores and 3.5-GB RAM. Use DPM\MABS [capacity planner](https://www.microsoft.com/download/details.aspx?id=54301) to get the appropriate RAM size and accordingly choose the IaaS VM size.
7273

7374
Protecting workloads with Azure Backup Server has many nuances. The [protection matrix for MABS](./backup-mabs-protection-matrix.md) helps explain these nuances. Before deploying the machine, read this article completely.
7475

@@ -99,7 +100,7 @@ To edit the storage replication setting:
99100

100101
There are two ways to download the Azure Backup Server installer. You can download the Azure Backup Server installer from the [Microsoft Download Center](https://www.microsoft.com/download/details.aspx?id=55269). You can also download Azure Backup Server installer while you're configuring a Recovery Services vault. The following steps walk you through downloading the installer from the Azure portal while configuring a Recovery Services vault.
101102

102-
1. From your Azure Stack virtual machine, [sign in to your Azure subscription in the Azure portal](https://portal.azure.com/).
103+
1. From your Azure Stack Hub virtual machine, [sign in to your Azure subscription in the Azure portal](https://portal.azure.com/).
103104
2. In the left-hand menu, select **All Services**.
104105

105106
![Choose the All Services option in main menu](./media/backup-mabs-install-azure-stack/click-all-services.png)
@@ -144,7 +145,7 @@ There are two ways to download the Azure Backup Server installer. You can downlo
144145

145146
## Extract Azure Backup Server install files
146147

147-
After you've downloaded all files to your Azure Stack virtual machine, go to the download location. The first phase of installing Azure Backup Server is to extract the files.
148+
After you've downloaded all files to your Azure Stack Hub virtual machine, go to the download location. The first phase of installing Azure Backup Server is to extract the files.
148149

149150
![Download MABS installer](./media/backup-mabs-install-azure-stack/download-mabs-installer.png)
150151

articles/backup/tutorial-backup-vm-at-scale.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
title: Tutorial - Back up multiple Azure virtual machines by using Azure Backup
33
description: In this tutorial, learn how to create a Recovery Services vault, define a backup policy, and simultaneously back up multiple virtual machines.
4-
ms.date: 02/26/2024
4+
ms.date: 04/23/2024
55
ms.topic: tutorial
66
ms.custom: mvc, engagement-fy24
77
ms.service: backup
88
author: AbhishekMallick-MS
99
ms.author: v-abhmallick
1010
---
1111

12-
# Tutotial: Back up multiple virtual machines by using the Azure portal
12+
# Tutorial: Back up multiple virtual machines by using the Azure portal
1313

1414
This tutorial describes how to back up multiple virtual machines by using the Azure portal .
1515

articles/confidential-computing/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ landingContent:
2828
url: overview.md
2929
- text: What products are available?
3030
url: overview-azure-products.md
31-
- text: Choose your confidential computing offering
31+
- text: What can I use this for?
3232
url: use-cases-scenarios.md
3333
- linkListType: quickstart
3434
links:

articles/container-registry/container-registry-tutorial-sign-build-push.md

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ In this tutorial:
4141
cp ./notation /usr/local/bin
4242
```
4343

44-
2. Install the Notation Azure Key Vault plugin `azure-kv` v1.0.2 on a Linux amd64 environment.
44+
2. Install the Notation Azure Key Vault plugin `azure-kv` v1.1.0 on a Linux amd64 environment.
4545

4646
> [!NOTE]
4747
> The URL and SHA256 checksum for the Notation Azure Key Vault plugin can be found on the plugin's [release page](https://github.com/Azure/notation-azure-kv/releases).
4848
4949
```bash
50-
notation plugin install --url https://github.com/Azure/notation-azure-kv/releases/download/v1.0.2/notation-azure-kv_1.0.2_linux_amd64.tar.gz --sha256sum f2b2e131a435b6a9742c202237b9aceda81859e6d4bd6242c2568ba556cee20e
50+
notation plugin install --url https://github.com/Azure/notation-azure-kv/releases/download/v1.1.0/notation-azure-kv_1.1.0_linux_amd64.tar.gz --sha256sum 2fc959bf850275246b044203609202329d015005574fabbf3e6393345e49b884
5151
```
5252
53-
3. List the available plugins and confirm that the `azure-kv` plugin with version `1.0.2` is included in the list.
53+
3. List the available plugins and confirm that the `azure-kv` plugin with version `1.1.0` is included in the list.
5454
5555
```bash
5656
notation plugin ls
@@ -200,6 +200,28 @@ The following steps show how to create a self-signed certificate for testing pur
200200
```bash
201201
notation sign --signature-format cose --id $KEY_ID --plugin azure-kv --plugin-config self_signed=true $IMAGE
202202
```
203+
204+
To authenticate with AKV, by default, the following credential types if enabled will be tried in order:
205+
206+
- [Environment credential](/dotnet/api/azure.identity.environmentcredential)
207+
- [Workload identity credential](/dotnet/api/azure.identity.workloadidentitycredential)
208+
- [Managed identity credential](/dotnet/api/azure.identity.managedidentitycredential)
209+
- [Azure CLI credential](/dotnet/api/azure.identity.azureclicredential)
210+
211+
If you want to specify a credential type, use an additional plugin configuration called `credential_type`. For example, you can explicitly set `credential_type` to `azurecli` for using Azure CLI credential, as demonstrated below:
212+
213+
```bash
214+
notation sign --signature-format cose --id $KEY_ID --plugin azure-kv --plugin-config self_signed=true --plugin-config credential_type=azurecli $IMAGE
215+
```
216+
217+
See below table for the values of `credential_type` for various credential types.
218+
219+
| Credential type | Value for `credential_type` |
220+
| ---------------------------- | -------------------------- |
221+
| Environment credential | `environment` |
222+
| Workload identity credential | `workloadid` |
223+
| Managed identity credential | `managedid` |
224+
| Azure CLI credential | `azurecli` |
203225
204226
5. View the graph of signed images and associated signatures.
205227

articles/container-registry/container-registry-tutorial-sign-trusted-ca.md

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,16 @@ In this article:
5353
cp ./notation /usr/local/bin
5454
```
5555

56-
2. Install the Notation Azure Key Vault plugin `azure-kv` v1.0.2 on a Linux amd64 environment.
56+
2. Install the Notation Azure Key Vault plugin `azure-kv` v1.1.0 on a Linux amd64 environment.
5757

5858
> [!NOTE]
5959
> The URL and SHA256 checksum for the Notation Azure Key Vault plugin can be found on the plugin's [release page](https://github.com/Azure/notation-azure-kv/releases).
6060
6161
```bash
62-
notation plugin install --url https://github.com/Azure/notation-azure-kv/releases/download/v1.0.2/notation-azure-kv_1.0.2_linux_amd64.tar.gz --sha256sum f2b2e131a435b6a9742c202237b9aceda81859e6d4bd6242c2568ba556cee20e
62+
notation plugin install --url https://github.com/Azure/notation-azure-kv/releases/download/v1.1.0/notation-azure-kv_1.1.0_linux_amd64.tar.gz --sha256sum 2fc959bf850275246b044203609202329d015005574fabbf3e6393345e49b884
6363
```
6464
65-
3. List the available plugins and confirm that the `azure-kv` plugin with version `1.0.2` is included in the list.
65+
3. List the available plugins and confirm that the `azure-kv` plugin with version `1.1.0` is included in the list.
6666
6767
```bash
6868
notation plugin ls
@@ -219,6 +219,28 @@ To import the certificate:
219219
notation sign --signature-format cose $IMAGE --id $KEY_ID --plugin azure-kv --plugin-config ca_certs=<ca_bundle_file>
220220
```
221221

222+
To authenticate with AKV, by default, the following credential types if enabled will be tried in order:
223+
224+
- [Environment credential](/dotnet/api/azure.identity.environmentcredential)
225+
- [Workload identity credential](/dotnet/api/azure.identity.workloadidentitycredential)
226+
- [Managed identity credential](/dotnet/api/azure.identity.managedidentitycredential)
227+
- [Azure CLI credential](/dotnet/api/azure.identity.azureclicredential)
228+
229+
If you want to specify a credential type, use an additional plugin configuration called `credential_type`. For example, you can explicitly set `credential_type` to `azurecli` for using Azure CLI credential, as demonstrated below:
230+
231+
```bash
232+
notation sign --signature-format cose --id $KEY_ID --plugin azure-kv --plugin-config credential_type=azurecli $IMAGE
233+
```
234+
235+
See below table for the values of `credential_type` for various credential types.
236+
237+
| Credential type | Value for `credential_type` |
238+
| ---------------------------- | -------------------------- |
239+
| Environment credential | `environment` |
240+
| Workload identity credential | `workloadid` |
241+
| Managed identity credential | `managedid` |
242+
| Azure CLI credential | `azurecli` |
243+
222244
6. View the graph of signed images and associated signatures.
223245

224246
```bash

0 commit comments

Comments
 (0)