Skip to content

Commit 9a9d26f

Browse files
authored
Merge pull request #227624 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents c47fe32 + 8f7a40d commit 9a9d26f

10 files changed

+70
-74
lines changed

articles/aks/kubernetes-service-principal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ If you need to access existing disk resources in another resource group, assign
173173
- Create a [custom role][rbac-custom-role] and define the following role permissions:
174174
- *Microsoft.Compute/disks/read*
175175
- *Microsoft.Compute/disks/write*
176-
- Or, assign the [Storage Account Contributor][rbac-storage-contributor] built-in role on the resource group
176+
- Or, assign the [Virtual Machine Contributor][rbac-disk-contributor] built-in role on the resource group
177177

178178
### Azure Container Instances
179179

@@ -286,7 +286,7 @@ For information on how to update the credentials, see [Update or rotate the cred
286286
[az-aks-update]: /cli/azure/aks#az_aks_update
287287
[rbac-network-contributor]: ../role-based-access-control/built-in-roles.md#network-contributor
288288
[rbac-custom-role]: ../role-based-access-control/custom-roles.md
289-
[rbac-storage-contributor]: ../role-based-access-control/built-in-roles.md#storage-account-contributor
289+
[rbac-disk-contributor]: ../role-based-access-control/built-in-roles.md#virtual-machine-contributor
290290
[az-role-assignment-create]: /cli/azure/role/assignment#az-role-assignment-create
291291
[aks-to-acr]: cluster-container-registry-integration.md
292292
[update-credentials]: update-credentials.md

articles/api-management/export-api-power-platform.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ You can manage your custom connector in your Power Apps or Power Platform enviro
5050

5151
> [!NOTE]
5252
> To call the API from the Power Apps test console, you need to add the `https://make.powerautomate.com` URL as an origin to the [CORS policy](cors-policy.md) in your API Management instance.
53+
>
54+
> Depending on how the custom connector gets used when running Power Apps, you might need to configure additional origins in the CORS policy. You can use developer tools in your browser, tracing in API Management, or Application Insights to investigate CORS issues when running Power Apps.
5355
5456
## Update a custom connector
5557

articles/devtest-labs/samples-cli.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
title: Azure CLI Samples
3-
description: Learn about Azure CLI scripts. With these samples, you can create a virtual machine and then start, stop, and delete it in Azure Lab Services.
3+
description: Learn about Azure CLI scripts. With these samples, you can create a virtual machine and then start, stop, and delete it in Azure DevTest Labs.
44
ms.topic: sample
55
ms.author: rosemalcolm
66
author: RoseHJM
77
ms.date: 02/02/2022
88
---
99

10-
# Azure CLI Samples for Azure Lab Services
10+
# Azure CLI Samples for Azure DevTest Labs
1111

12-
This article includes sample bash scripts built for Azure CLI for Azure Lab Services.
12+
This article includes sample bash scripts built for Azure CLI for Azure DevTest Labs.
1313

1414
| Script | Description |
1515
|---|---|
@@ -59,6 +59,9 @@ This script uses the following commands:
5959

6060
This Azure CLI script stops and deletes a virtual machine in a lab.
6161

62+
> [!CAUTION]
63+
> Deleting VMs and labs is permanent, and cannot be undone.
64+
6265
:::code language="powershell" source="../../cli_scripts/devtest-lab/stop-delete-virtual-machine-in-lab/stop-delete-virtual-machine-in-lab.sh":::
6366

6467
This script uses the following commands:
@@ -72,6 +75,9 @@ This script uses the following commands:
7275

7376
Run the following command to remove the resource group, VM, and all related resources.
7477

78+
> [!CAUTION]
79+
> Deleting the resource group for the lab is permanent, and cannot be undone. This will remove ALL resources under the group and can not be restored.
80+
7581
```azurecli
7682
az group delete --name $resourceGroupName
7783
```

articles/reliability/availability-zones-migration-overview.md

Lines changed: 13 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,10 @@ The table below lists each product that offers migration guidance and/or informa
2323
| **Products** |
2424
| --- |
2525
| [Azure Application Gateway (V2)](migrate-app-gateway-v2.md) |
26-
| [Azure Backup](migrate-recovery-services-vault.md) |
27-
| [Azure Site Recovery](migrate-recovery-services-vault.md) |
28-
| [Azure Storage account](migrate-storage.md) |
29-
| [Azure Storage: Azure Data Lake Storage](migrate-storage.md) |
30-
| [Azure Storage: Disk Storage](migrate-storage.md)|
31-
| [Azure Storage: Blob Storage](migrate-storage.md) |
32-
| [Azure Storage: Managed Disks](migrate-storage.md)|
33-
| [Azure Virtual Machine Scale Sets](migrate-vm.md)|
34-
| [Azure Virtual Machines](migrate-vm.md) |
35-
| Virtual Machines: [Av2-Series](migrate-vm.md) |
36-
| Virtual Machines: [Bs-Series](migrate-vm.md) |
37-
| Virtual Machines: [DSv2-Series](migrate-vm.md) |
38-
| Virtual Machines: [DSv3-Series](migrate-vm.md) |
39-
| Virtual Machines: [Dv2-Series](migrate-vm.md) |
40-
| Virtual Machines: [Dv3-Series](migrate-vm.md) |
41-
| Virtual Machines: [ESv3-Series](migrate-vm.md) |
42-
| Virtual Machines: [Ev3-Series](migrate-vm.md) |
43-
| Virtual Machines: [F-Series](migrate-vm.md) |
44-
| Virtual Machines: [FS-Series](migrate-vm.md) |
45-
| Virtual Machines: [Azure Compute Gallery](migrate-vm.md)|
26+
| [Azure Backup and Azure Site Recovery](migrate-recovery-services-vault.md) |
27+
| [Azure Storage account: Blob Storage, Azure Data Lake Storage, Files Storage](migrate-storage.md) |
28+
| [Azure Storage: Managed Disks](migrate-vm.md)|
29+
| [Azure Virtual Machines and Azure Virtual Machine Scale Sets](migrate-vm.md)|
4630

4731
\*VMs that support availability zones: AV2-series, B-series, DSv2-series, DSv3-series, Dv2-series, Dv3-series, ESv3-series, Ev3-series, F-series, FS-series, FSv2-series, and M-series.
4832

@@ -51,24 +35,19 @@ The table below lists each product that offers migration guidance and/or informa
5135
| **Products** |
5236
| --- |
5337
| [Azure API Management](migrate-api-mgt.md)|
38+
| [Azure App Configuration](migrate-app-configuration.md)|
39+
| [Azure App Service](migrate-app-service.md)|
5440
| [Azure App Service: App Service Environment](migrate-app-service-environment.md)|
5541
| [Azure Cache for Redis](migrate-cache-redis.md)|
56-
| [Azure Container Instances](migrate-container-instances.md) |
57-
| [Azure Database for MySQL - Flexible Server](migrate-database-mysql-flex.md) |
42+
| [Azure Cognitive Search](migrate-search-service.md)|
43+
| [Azure Container Instances](migrate-container-instances.md)|
44+
| [Azure Database for MySQL - Flexible Server](migrate-database-mysql-flex.md)|
5845
| [Azure Monitor: Log Analytics](migrate-monitor-log-analytics.md)|
59-
| Azure Storage: [Files Storage](migrate-storage.md)|
60-
| Virtual Machines: [Azure Dedicated Host](migrate-vm.md) |
61-
| Virtual Machines: [Ddsv4-Series](migrate-vm.md) |
62-
| Virtual Machines: [Ddv4-Series](migrate-vm.md) |
63-
| Virtual Machines: [Dsv4-Series](migrate-vm.md) |
64-
| Virtual Machines: [Dv4-Series](migrate-vm.md) |
65-
| Virtual Machines: [Edsv4-Series](migrate-vm.md) |
66-
| Virtual Machines: [Edv4-Series](migrate-vm.md) |
67-
| Virtual Machines: [Esv4-Series](migrate-vm.md) |
68-
| Virtual Machines: [Ev4-Series](migrate-vm.md) |
69-
| Virtual Machines: [Fsv2-Series](migrate-vm.md) |
70-
| Virtual Machines: [M-Series](migrate-vm.md) |
7146

47+
## Workload and general guidance
48+
| **Workloads** |
49+
| --- |
50+
| [Azure Kubernetes Service (AKS) and MySQL Flexible Server](migrate-workload-aks-mysql.md)|
7251

7352
## Next steps
7453

articles/service-fabric/service-fabric-backuprestoreservice-quickstart-azurecluster.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ First you need to enable the _backup and restore service_ in your cluster. Get t
112112
"parameters": [{
113113
"name": "SecretEncryptionCertThumbprint",
114114
"value": "[Thumbprint]"
115+
},{
116+
"name": "SecretEncryptionCertX509StoreName",
117+
"value": "My"
115118
}]
116119
}
117120
...

articles/virtual-machines/linux/attach-disk-portal.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ Use `mount` to then mount the filesystem. The following example mounts the */dev
135135
```bash
136136
sudo mount /dev/sdc1 /datadrive
137137
```
138-
139138
To ensure that the drive is remounted automatically after a reboot, it must be added to the */etc/fstab* file. It's also highly recommended that the UUID (Universally Unique Identifier) is used in */etc/fstab* to refer to the drive rather than just the device name (such as, */dev/sdc1*). If the OS detects a disk error during boot, using the UUID avoids the incorrect disk being mounted to a given location. Remaining data disks would then be assigned those same device IDs. To find the UUID of the new drive, use the `blkid` utility:
140139

141140
```bash

articles/virtual-machines/linux/create-upload-ubuntu.md

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,27 @@ This article assumes that you've already installed an Ubuntu Linux operating sys
4545
Before editing `/etc/apt/sources.list`, it's recommended to make a backup:
4646

4747
```console
48-
# sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak
48+
sudo cp /etc/apt/sources.list /etc/apt/sources.list.bak
4949
```
5050

5151
Ubuntu 18.04 and Ubuntu 20.04:
5252

5353
```console
54-
# sudo sed -i 's/http:\/\/archive\.ubuntu\.com\/ubuntu\//http:\/\/azure\.archive\.ubuntu\.com\/ubuntu\//g' /etc/apt/sources.list
55-
# sudo sed -i 's/http:\/\/[a-z][a-z]\.archive\.ubuntu\.com\/ubuntu\//http:\/\/azure\.archive\.ubuntu\.com\/ubuntu\//g' /etc/apt/sources.list
56-
# sudo apt-get update
54+
sudo sed -i 's/http:\/\/archive\.ubuntu\.com\/ubuntu\//http:\/\/azure\.archive\.ubuntu\.com\/ubuntu\//g' /etc/apt/sources.list
55+
sudo sed -i 's/http:\/\/[a-z][a-z]\.archive\.ubuntu\.com\/ubuntu\//http:\/\/azure\.archive\.ubuntu\.com\/ubuntu\//g' /etc/apt/sources.list
56+
sudo apt-get update
5757
```
5858

5959
4. The Ubuntu Azure images are now using the [Azure-tailored kernel](https://ubuntu.com/blog/microsoft-and-canonical-increase-velocity-with-azure-tailored-kernel). Update the operating system to the latest Azure-tailored kernel and install Azure Linux tools (including Hyper-V dependencies) by running the following commands:
6060

6161
Ubuntu 18.04 and Ubuntu 20.04:
6262

6363
```console
64-
# sudo apt update
65-
# sudo apt install linux-azure linux-image-azure linux-headers-azure linux-tools-common linux-cloud-tools-common linux-tools-azure linux-cloud-tools-azure
64+
sudo apt update
65+
sudo apt install linux-azure linux-image-azure linux-headers-azure linux-tools-common linux-cloud-tools-common linux-tools-azure linux-cloud-tools-azure
6666
(recommended) # sudo apt full-upgrade
6767

68-
# sudo reboot
68+
sudo reboot
6969
```
7070

7171
5. Modify the kernel boot line for Grub to include additional kernel parameters for Azure. To do this open `/etc/default/grub` in a text editor, find the variable called `GRUB_CMDLINE_LINUX_DEFAULT` (or add it if needed) and edit it to include the following parameters:
@@ -81,8 +81,8 @@ This article assumes that you've already installed an Ubuntu Linux operating sys
8181
7. Install cloud-init (the provisioning agent) and the Azure Linux Agent (the guest extensions handler). Cloud-init uses `netplan` to configure the system network configuration (during provisioning and each subsequent boot) and `gdisk` to partition resource disks.
8282

8383
```console
84-
# sudo apt update
85-
# sudo apt install cloud-init gdisk netplan.io walinuxagent && systemctl stop walinuxagent
84+
sudo apt update
85+
sudo apt install cloud-init gdisk netplan.io walinuxagent && systemctl stop walinuxagent
8686
```
8787

8888
> [!Note]
@@ -91,19 +91,19 @@ This article assumes that you've already installed an Ubuntu Linux operating sys
9191
8. Remove cloud-init default configs and leftover `netplan` artifacts that may conflict with cloud-init provisioning on Azure:
9292

9393
```console
94-
# rm -f /etc/cloud/cloud.cfg.d/50-curtin-networking.cfg /etc/cloud/cloud.cfg.d/curtin-preserve-sources.cfg /etc/cloud/cloud.cfg.d/99-installer.cfg /etc/cloud/cloud.cfg.d/subiquity-disable-cloudinit-networking.cfg
95-
# rm -f /etc/cloud/ds-identify.cfg
96-
# rm -f /etc/netplan/*.yaml
94+
rm -f /etc/cloud/cloud.cfg.d/50-curtin-networking.cfg /etc/cloud/cloud.cfg.d/curtin-preserve-sources.cfg /etc/cloud/cloud.cfg.d/99-installer.cfg /etc/cloud/cloud.cfg.d/subiquity-disable-cloudinit-networking.cfg
95+
rm -f /etc/cloud/ds-identify.cfg
96+
rm -f /etc/netplan/*.yaml
9797
```
9898

9999
9. Configure cloud-init to provision the system using the Azure datasource:
100100

101101
```bash
102-
# cat > /etc/cloud/cloud.cfg.d/90_dpkg.cfg << EOF
102+
cat > /etc/cloud/cloud.cfg.d/90_dpkg.cfg << EOF
103103
datasource_list: [ Azure ]
104104
EOF
105105

106-
# cat > /etc/cloud/cloud.cfg.d/90-azure.cfg << EOF
106+
cat > /etc/cloud/cloud.cfg.d/90-azure.cfg << EOF
107107
system_info:
108108
package_mirrors:
109109
- arches: [i386, amd64]
@@ -120,7 +120,7 @@ This article assumes that you've already installed an Ubuntu Linux operating sys
120120
security: http://ports.ubuntu.com/ubuntu-ports
121121
EOF
122122

123-
# cat > /etc/cloud/cloud.cfg.d/10-azure-kvp.cfg << EOF
123+
cat > /etc/cloud/cloud.cfg.d/10-azure-kvp.cfg << EOF
124124
reporting:
125125
logging:
126126
type: log
@@ -150,11 +150,11 @@ This article assumes that you've already installed an Ubuntu Linux operating sys
150150
11. Clean cloud-init and Azure Linux agent runtime artifacts and logs:
151151

152152
```console
153-
# sudo cloud-init clean --logs --seed
154-
# sudo rm -rf /var/lib/cloud/
155-
# sudo systemctl stop walinuxagent.service
156-
# sudo rm -rf /var/lib/waagent/
157-
# sudo rm -f /var/log/waagent.log
153+
sudo cloud-init clean --logs --seed
154+
sudo rm -rf /var/lib/cloud/
155+
sudo systemctl stop walinuxagent.service
156+
sudo rm -rf /var/lib/waagent/
157+
sudo rm -f /var/log/waagent.log
158158
```
159159

160160
12. Run the following commands to deprovision the virtual machine and prepare it for provisioning on Azure:
@@ -166,10 +166,10 @@ This article assumes that you've already installed an Ubuntu Linux operating sys
166166
> Deprovisioning using the command above does not guarantee that the image is cleared of all sensitive information and is suitable for redistribution.
167167

168168
```console
169-
# sudo waagent -force -deprovision+user
170-
# rm -f ~/.bash_history
171-
# export HISTSIZE=0
172-
# logout
169+
sudo waagent -force -deprovision+user
170+
rm -f ~/.bash_history
171+
export HISTSIZE=0
172+
logout
173173
```
174174

175175
13. Click **Action -> Shut Down** in Hyper-V Manager.
@@ -182,31 +182,31 @@ This article assumes that you've already installed an Ubuntu Linux operating sys
182182
1. Change directory to the boot EFI directory:
183183
184184
```console
185-
# cd /boot/efi/EFI
185+
cd /boot/efi/EFI
186186
```
187187

188-
1. Copy the ubuntu directory to a new directory named boot:
188+
2. Copy the ubuntu directory to a new directory named boot:
189189
190190
```console
191-
# sudo cp -r ubuntu/ boot
191+
sudo cp -r ubuntu/ boot
192192
```
193193

194-
1. Change directory to the newly created boot directory:
194+
3. Change directory to the newly created boot directory:
195195

196196
```console
197-
# cd boot
197+
cd boot
198198
```
199199
200-
1. Rename the shimx64.efi file:
200+
4. Rename the shimx64.efi file:
201201

202202
```console
203-
# sudo mv shimx64.efi bootx64.efi
203+
sudo mv shimx64.efi bootx64.efi
204204
```
205205

206-
1. Rename the grub.cfg file to bootx64.cfg:
206+
5. Rename the grub.cfg file to bootx64.cfg:
207207

208208
```console
209-
# sudo mv grub.cfg bootx64.cfg
209+
sudo mv grub.cfg bootx64.cfg
210210
```
211211

212212
## Next steps

articles/virtual-network/network-security-groups-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ A network security group contains zero, or as many rules as desired, within Azur
2626

2727
|Property |Explanation |
2828
|---------|---------|
29-
|Name|A unique name within the network security group.|
29+
|Name|A unique name within the network security group. The name can be up to 80 characters long. It must begin with a word character, and it must end with a word character or with '_'. The name may contain word characters or '.', '-', '\_'.|
3030
|Priority | A number between 100 and 4096. Rules are processed in priority order, with lower numbers processed before higher numbers, because lower numbers have higher priority. Once traffic matches a rule, processing stops. As a result, any rules that exist with lower priorities (higher numbers) that have the same attributes as rules with higher priorities aren't processed.|
3131
|Source or destination| Any, or an individual IP address, classless inter-domain routing (CIDR) block (10.0.0.0/24, for example), service tag, or application security group. If you specify an address for an Azure resource, specify the private IP address assigned to the resource. Network security groups are processed after Azure translates a public IP address to a private IP address for inbound traffic, and before Azure translates a private IP address to a public IP address for outbound traffic. Fewer security rules are needed when you specify a range, a service tag, or application security group. The ability to specify multiple individual IP addresses and ranges (you can't specify multiple service tags or application groups) in a rule is referred to as [augmented security rules](#augmented-security-rules). Augmented security rules can only be created in network security groups created through the Resource Manager deployment model. You can't specify multiple IP addresses and IP address ranges in network security groups created through the classic deployment model.|
3232
|Protocol | TCP, UDP, ICMP, ESP, AH, or Any. The ESP and AH protocols aren't currently available via the Azure portal but can be used via ARM templates. |

articles/virtual-network/virtual-network-bandwidth-testing.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ Tip: When setting up this test for the first time, you might try a shorter test
3232
> [!NOTE]
3333
> The sender **and** receiver must specify **the same** test duration
3434
parameter (-t).
35+
>
36+
> The IP address in both Sender and Receiver commands is the Receiver's IP address.
37+
>
38+
> The -r and -s flags are no longer required for the receiver and sender parameters.
3539
3640
To test a single TCP stream for 10 seconds:
3741

includes/machine-learning-public-internet-access.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ You may also need to allow __outbound__ traffic to Visual Studio Code and non-Mi
6262
| **marketplace.visualstudio.com**</br>**vscode.blob.core.windows.net**</br>**\*.gallerycdn.vsassets.io** | Required to download and install VS Code extensions. These enable the remote connection to Compute Instances provided by the Azure ML extension for VS Code, see [Connect to an Azure Machine Learning compute instance in Visual Studio Code](../articles/machine-learning/how-to-set-up-vs-code-remote.md) for more information. |
6363
| **raw.githubusercontent.com/microsoft/vscode-tools-for-ai/master/azureml_remote_websocket_server/\*** | Used to retrieve websocket server bits, which are installed on the compute instance. The websocket server is used to transmit requests from Visual Studio Code client (desktop application) to Visual Studio Code server running on the compute instance.|
6464

65+
> [!NOTE]
66+
> When using the [Azure Machine Learning VS Code extension](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.vscode-ai) the remote compute instance will require an access to public repositories to install the packages required by the extension. If the compute instance requires a proxy to access these public repositories or the Internet, you will need to set and export the `HTTP_PROXY` and `HTTPS_PROXY` environment variables in the `~/.bashrc` file of the compute instance. This process can be automated at provisioning time by using a [custom script](/machine-learning/how-to-customize-compute-instance).
67+
6568
When using Azure Kubernetes Service (AKS) with Azure Machine Learning, allow the following traffic to the AKS VNet:
6669

6770
* General inbound/outbound requirements for AKS as described in the [Restrict egress traffic in Azure Kubernetes Service](../articles/aks/limit-egress-traffic.md) article.

0 commit comments

Comments
 (0)